diff --git a/README.md b/README.md index 65e23bea7..79018dd1e 100644 --- a/README.md +++ b/README.md @@ -16,10 +16,10 @@ ## Maintainers -| Name | Email | URL | -| ---- | ------ |-----| -| petewall | | | -| skl | | | +| Name | Email | URL | +|----------|----------------------------|-----| +| petewall | | | +| skl | | | ## Usage @@ -33,6 +33,14 @@ helm repo add grafana https://grafana.github.io/helm-charts See the [Chart Documentation](https://github.com/grafana/k8s-monitoring-helm/blob/main/charts/k8s-monitoring-v1/README.md) for chart install instructions. +## Office Hours + +We hold office hours roughly monthly. Meeting times and recordings will be posted here: + +| Date | Topic | Link | +|------------|----------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------| +| 2024-10-11 | Upcoming 2.0 version | [Recording](https://grafana.zoom.us/rec/share/ZF00DnBBu7X68T5WDEeA6PUsiKF7D6bfi3KBVJTFZMiYnSVPp3gm7t_v-VAm-48y.htONt-nVrmpfFTsG) Passcode: U&2T37Gb | + ## Contributing See our [Contributing Guide](./CONTRIBUTING.md) for more information. diff --git a/charts/k8s-monitoring-v1/docs/HelmTests.md b/charts/k8s-monitoring-v1/docs/HelmTests.md index bf20837eb..e83ecfe5d 100644 --- a/charts/k8s-monitoring-v1/docs/HelmTests.md +++ b/charts/k8s-monitoring-v1/docs/HelmTests.md @@ -31,7 +31,7 @@ These queries are added by default and are used if their respective metric sourc | | `up` | `metrics.enabled: true` | | Grafana Alloy | `alloy_build_info{cluster=""}` | `metrics.enabled: true`
`metrics.alloy.enabled: true` | | Kubelet | `kubernetes_build_info{cluster=""}` | `metrics.enabled: true`
`metrics.kubelet.enabled: true` | -| Kubelet Resource | `node_cpu_usage_seconds_total{cluster=""} | `metrics.enabled: true`
`metrics.kubeletResource.enabled: true` | +| Kubelet Resource | `node_cpu_usage_seconds_total{cluster=""}` | `metrics.enabled: true`
`metrics.kubeletResource.enabled: true` | | cAdvisor | `machine_memory_bytes{cluster=""}` | `metrics.enabled: true`
`metrics.cadvisor.enabled: true` | | kube-state-metrics | `kube_node_info{cluster=""}` | `metrics.enabled: true`
`metrics.kube-state-metrics.enabled: true` | | Node Exporter | `node_exporter_build_info{cluster=""}` | `metrics.enabled: true`
`metrics.node-exporter.enabled: true` |