Chore/minimize metrics (#11)

* chore: add regex to minimize controller manager metrics * add regexes for rkeScheduler and rkeProxy * chore: bump chart version * chore: formatting Signed-off-by: Bruno Bressi <[email protected]> * fix: grafana label for self monitoring added The grafana metrics were not being scraped because of the missing label Signed-off-by: Bruno Bressi <[email protected]> * chore: rc status rollback Reverted to rc status again to test grafana smon Signed-off-by: Bruno Bressi <[email protected]> * chore: bumped prometheus chart Signed-off-by: Bruno Bressi <[email protected]> * chore: rc3 Signed-off-by: Bruno Bressi <[email protected]> * fix: added missing prometheus label This common label is expected to be present in general in the prometheus components of the caas-cluster-monitoring stack and so it should also be part of the kube-prometheus stack, so that serviceMonitors and other objects can be picked out-of-the-box Signed-off-by: Bruno Bressi <[email protected]> * chore: rc4 Signed-off-by: Bruno Bressi <[email protected]> * chore: bumped prometheus chart Signed-off-by: Bruno Bressi <[email protected]> * chore: removed common labels They are not passed down to prometheus pods Signed-off-by: Bruno Bressi <[email protected]> * chore: bumped to rc5 Signed-off-by: Bruno Bressi <[email protected]> * chore: release 0.0.12 Signed-off-by: Bruno Bressi <[email protected]> --------- Signed-off-by: Bruno Bressi <[email protected]> Co-authored-by: Bruno Bressi <[email protected]>
caas-team · Sep 10, 2024 · c2e07b4 · c2e07b4
1 parent c1dd3f7
commit c2e07b4
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 11 deletions.
diff --git a/Chart.yaml b/Chart.yaml
@@ -3,7 +3,7 @@ annotations:
   catalog.cattle.io/display-name: CaaS Cluster Monitoring V3
 name: caas-cluster-monitoring
 description: A Helm chart for Rancher Cluster Monitoring V3
-version: "0.0.11"
+version: "0.0.12"
 appVersion: "58.4.0"
 icon: https://raw.githubusercontent.com/caas-team/caas-project-monitoring/main/logo.png
 keywords:

diff --git a/README.md b/README.md
@@ -231,6 +231,7 @@ available config parameters:
 | `kube-prometheus-stack.grafana.serviceAccount.name` | string | `"rancher-monitoring"` |  |
 | `kube-prometheus-stack.grafana.serviceMonitor.enabled` | bool | `true` |  |
 | `kube-prometheus-stack.grafana.serviceMonitor.interval` | string | `"30s"` |  |
+| `kube-prometheus-stack.grafana.serviceMonitor.labels.release` | string | `"rancher-monitoring"` |  |
 | `kube-prometheus-stack.grafana.serviceMonitor.path` | string | `"/metrics"` |  |
 | `kube-prometheus-stack.grafana.serviceMonitor.scheme` | string | `"http"` |  |
 | `kube-prometheus-stack.grafana.serviceMonitor.scrapeTimeout` | string | `"30s"` |  |
@@ -480,6 +481,9 @@ available config parameters:
 | `rkeControllerManager.kubeVersionOverrides[0].values.clients.https.useServiceAccountCredentials` | bool | `false` |  |
 | `rkeControllerManager.kubeVersionOverrides[0].values.metricsPort` | int | `10252` |  |
 | `rkeControllerManager.metricsPort` | int | `10257` |  |
+| `rkeControllerManager.serviceMonitor.endpoints[0].honorLabels` | bool | `true` |  |
+| `rkeControllerManager.serviceMonitor.endpoints[0].metricRelabelings` | list | `[{"action":"keep","regex":"process_(start_time_seconds|cpu_seconds_total|resident_memory_bytes)|storage_operation_duration_seconds_(bucket|count)|rest_client_(request_duration_seconds_bucket|requests_total)|workqueue_(queue_duration_seconds_bucket|depth|adds_total)|up|go_goroutines","sourceLabels":["__name__"]}]` | are needed, they should be added to this regex. |
+| `rkeControllerManager.serviceMonitor.endpoints[0].port` | string | `"metrics"` |  |
 
 ### rkeEtcd
 
@@ -535,6 +539,9 @@ available config parameters:
 | `rkeProxy.component` | string | `"kube-proxy"` |  |
 | `rkeProxy.enabled` | bool | `true` |  |
 | `rkeProxy.metricsPort` | int | `10249` |  |
+| `rkeProxy.serviceMonitor.endpoints[0].honorLabels` | bool | `true` |  |
+| `rkeProxy.serviceMonitor.endpoints[0].metricRelabelings` | list | `[{"action":"keep","regex":"process_(start_time_seconds|cpu_seconds_total|resident_memory_bytes)|rest_client_(request_duration_seconds_bucket|requests_total)|workqueue_(queue_duration_seconds_bucket|depth|adds_total)|up|go_goroutines","sourceLabels":["__name__"]}]` | are needed, they should be added to this regex. |
+| `rkeProxy.serviceMonitor.endpoints[0].port` | string | `"metrics"` |  |
 
 ### rkeScheduler
 
@@ -561,6 +568,9 @@ available config parameters:
 | `rkeScheduler.kubeVersionOverrides[0].values.clients.https.useServiceAccountCredentials` | bool | `false` |  |
 | `rkeScheduler.kubeVersionOverrides[0].values.metricsPort` | int | `10251` |  |
 | `rkeScheduler.metricsPort` | int | `10259` |  |
+| `rkeScheduler.serviceMonitor.endpoints[0].honorLabels` | bool | `true` |  |
+| `rkeScheduler.serviceMonitor.endpoints[0].metricRelabelings` | list | `[{"action":"keep","regex":"process_(start_time_seconds|cpu_seconds_total|resident_memory_bytes)|rest_client_(request_duration_seconds_bucket|requests_total)|workqueue_(queue_duration_seconds_bucket|depth|adds_total)|up|go_goroutines","sourceLabels":["__name__"]}]` | are needed, they should be added to this regex. |
+| `rkeScheduler.serviceMonitor.endpoints[0].port` | string | `"metrics"` |  |
 
 ### hardenedKubelet
 

diff --git a/charts/hardenedKubelet/README.md b/charts/hardenedKubelet/README.md
@@ -61,4 +61,4 @@ Sets up a deployment of the PushProx proxy and a DaemonSet of PushProx clients.
 | serviceMonitor.endpoints[0].port | string | `"metrics"` |  |
 
 ----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1)
+Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)
diff --git a/charts/kube-prometheus-stack-58.4.0.tgz b/charts/kube-prometheus-stack-58.4.0.tgz
diff --git a/charts/rkeControllerManager/README.md b/charts/rkeControllerManager/README.md
@@ -61,4 +61,4 @@ Sets up a deployment of the PushProx proxy and a DaemonSet of PushProx clients.
 | serviceMonitor.endpoints[0].port | string | `"metrics"` |  |
 
 ----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1)
+Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)
diff --git a/charts/rkeEtcd/README.md b/charts/rkeEtcd/README.md
@@ -61,4 +61,4 @@ Sets up a deployment of the PushProx proxy and a DaemonSet of PushProx clients.
 | serviceMonitor.endpoints[0].port | string | `"metrics"` |  |
 
 ----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1)
+Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)
diff --git a/charts/rkeIngressNginx/README.md b/charts/rkeIngressNginx/README.md
@@ -61,4 +61,4 @@ Sets up a deployment of the PushProx proxy and a DaemonSet of PushProx clients.
 | serviceMonitor.endpoints[0].port | string | `"metrics"` |  |
 
 ----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1)
+Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)
diff --git a/charts/rkeProxy/README.md b/charts/rkeProxy/README.md
@@ -61,4 +61,4 @@ Sets up a deployment of the PushProx proxy and a DaemonSet of PushProx clients.
 | serviceMonitor.endpoints[0].port | string | `"metrics"` |  |
 
 ----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1)
+Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)
diff --git a/charts/rkeScheduler/README.md b/charts/rkeScheduler/README.md
@@ -61,4 +61,4 @@ Sets up a deployment of the PushProx proxy and a DaemonSet of PushProx clients.
 | serviceMonitor.endpoints[0].port | string | `"metrics"` |  |
 
 ----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1)
+Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)
diff --git a/values.yaml b/values.yaml