Use the release label instead of the app.kubernetes.io/instance label (…

…#696) * Use the release label instead of the app.kubernetes.io/instance label for ksm, nodeexporter, and windowsexporter Signed-off-by: Pete Wall <[email protected]> * Remove the release name check for alloy and opencost. Signed-off-by: Pete Wall <[email protected]> --------- Signed-off-by: Pete Wall <[email protected]>
grafana · Aug 15, 2024 · 648af90 · 648af90
1 parent 76649c1
commit 648af90
Show file tree

Hide file tree

Showing 59 changed files with 410 additions and 940 deletions.
diff --git a/charts/k8s-monitoring/Makefile b/charts/k8s-monitoring/Makefile
@@ -23,12 +23,15 @@ values.schema.json: values.yaml schema-mods/enums-and-types.json schema-mods/req
 			| del(.properties["kube-state-metrics"].properties.autosharding) \
 			| del(.properties["kube-state-metrics"].properties.nodeSelector) \
 			| del(.properties["kube-state-metrics"].properties.prometheusScrape) \
+			| del(.properties["kube-state-metrics"].properties.releaseLabel) \
 			| del(.properties["kube-state-metrics"].properties.updateStrategy) \
 			| del(.properties["prometheus-node-exporter"].properties.nodeSelector) \
 			| del(.properties["prometheus-node-exporter"].properties.podAnnotations) \
+			| del(.properties["prometheus-node-exporter"].properties.releaseLabel) \
 			| del(.properties["prometheus-node-exporter"].properties.service) \
 			| del(.properties["prometheus-windows-exporter"].properties.config) \
 			| del(.properties["prometheus-windows-exporter"].properties.podAnnotations) \
+			| del(.properties["prometheus-windows-exporter"].properties.releaseLabel) \
 			| del(.properties.logs.properties.pod_logs.properties.labels.properties) \
 			| del(.properties.opencost.properties.opencost)' values.schema.generated.json) \
 		schema-mods/enums-and-types.json \

diff --git a/charts/k8s-monitoring/templates/alloy_config/_alloy.alloy.txt b/charts/k8s-monitoring/templates/alloy_config/_alloy.alloy.txt
@@ -18,11 +18,6 @@ up
 // Grafana Alloy
 discovery.relabel "alloy" {
   targets = discovery.kubernetes.pods.targets
-  rule {
-    source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_instance"]
-    regex = "{{ .Release.Name }}"
-    action = "keep"
-  }
   {{- range $k, $v := .Values.metrics.alloy.labelMatchers }}
   rule {
     source_labels = ["__meta_kubernetes_pod_label_{{ include "escape_label" $k }}"]

diff --git a/charts/k8s-monitoring/templates/alloy_config/_kube_state_metrics.alloy.txt b/charts/k8s-monitoring/templates/alloy_config/_kube_state_metrics.alloy.txt
@@ -13,7 +13,7 @@ discovery.relabel "kube_state_metrics" {
   targets = discovery.kubernetes.services.targets
 {{- if (index .Values "kube-state-metrics").enabled }}
   rule {
-    source_labels = ["__meta_kubernetes_service_label_app_kubernetes_io_instance"]
+    source_labels = ["__meta_kubernetes_service_label_release"]
     regex = "{{ .Release.Name }}"
     action = "keep"
   }

diff --git a/charts/k8s-monitoring/templates/alloy_config/_node_exporter.alloy.txt b/charts/k8s-monitoring/templates/alloy_config/_node_exporter.alloy.txt
@@ -20,7 +20,7 @@ discovery.relabel "node_exporter" {
   targets = discovery.kubernetes.pods.targets
 {{- if (index .Values "prometheus-node-exporter").enabled }}
   rule {
-    source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_instance"]
+    source_labels = ["__meta_kubernetes_pod_label_release"]
     regex = "{{ .Release.Name }}"
     action = "keep"
   }

diff --git a/charts/k8s-monitoring/templates/alloy_config/_opencost.txt b/charts/k8s-monitoring/templates/alloy_config/_opencost.txt
@@ -11,11 +11,6 @@
 // OpenCost
 discovery.relabel "opencost" {
   targets = discovery.kubernetes.services.targets
-  rule {
-    source_labels = ["__meta_kubernetes_service_label_app_kubernetes_io_instance"]
-    regex = "{{ .Release.Name }}"
-    action = "keep"
-  }
   {{- range $k, $v := .Values.metrics.cost.labelMatchers }}
   rule {
     source_labels = ["__meta_kubernetes_service_label_{{ include "escape_label" $k }}"]

diff --git a/charts/k8s-monitoring/templates/alloy_config/_windows_exporter.alloy.txt b/charts/k8s-monitoring/templates/alloy_config/_windows_exporter.alloy.txt
@@ -13,7 +13,7 @@ discovery.relabel "windows_exporter" {
   targets = discovery.kubernetes.pods.targets
 {{- if (index .Values "prometheus-windows-exporter").enabled }}
   rule {
-    source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_instance"]
+    source_labels = ["__meta_kubernetes_pod_label_release"]
     regex = "{{ .Release.Name }}"
     action = "keep"
   }

diff --git a/charts/k8s-monitoring/values.yaml b/charts/k8s-monitoring/values.yaml
@@ -2019,10 +2019,14 @@ kube-state-metrics:
   # do not want to scrape metrics from Kube State Metrics.
   # @section -- Deployment: [Kube State Metrics](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-state-metrics)
   enabled: true
+
   # @ignored
   nodeSelector:
     kubernetes.io/os: linux
 
+  # @ignored - Enable the release label
+  releaseLabel: true
+
   # @ignored - Disable autosharding
   autosharding:
     enabled: false
@@ -2060,6 +2064,9 @@ prometheus-node-exporter:
                 operator: NotIn
                 values: [fargate]
 
+  # @ignored - Enable the release label
+  releaseLabel: true
+
   # @ignored - Set annotation to override the job label
   podAnnotations:
     k8s.grafana.com/logs.job: integrations/node_exporter
@@ -2088,6 +2095,9 @@ prometheus-windows-exporter:
       service:
         services-where: "Name='containerd' or Name='kubelet'"
 
+  # @ignored - Enable the release label
+  releaseLabel: true
+
   # @ignored - Set annotation to override the job label
   podAnnotations:
     k8s.grafana.com/logs.job: integrations/windows_exporter

diff --git a/examples/alloy-autoscaling-and-storage/metrics.alloy b/examples/alloy-autoscaling-and-storage/metrics.alloy
diff --git a/examples/alloy-autoscaling-and-storage/output.yaml b/examples/alloy-autoscaling-and-storage/output.yaml
diff --git a/examples/application-observability/metrics.alloy b/examples/application-observability/metrics.alloy