Fix misnaming of relabeling and processing rules (#1068)

* Fix misnaming of relabeling and processing rules Signed-off-by: Pete Wall <[email protected]> * Also need to check for extraMetricRelabelingRules Signed-off-by: Pete Wall <[email protected]> --------- Signed-off-by: Pete Wall <[email protected]>
grafana · Jan 8, 2025 · 3ec6451 · 3ec6451
1 parent 255852f
commit 3ec6451
Show file tree

Hide file tree

Showing 9 changed files with 198 additions and 5 deletions.
diff --git a/charts/k8s-monitoring-v1/docs/examples/environment-variables/metrics.alloy b/charts/k8s-monitoring-v1/docs/examples/environment-variables/metrics.alloy
diff --git a/charts/k8s-monitoring-v1/docs/examples/environment-variables/output.yaml b/charts/k8s-monitoring-v1/docs/examples/environment-variables/output.yaml
diff --git a/charts/k8s-monitoring-v1/docs/examples/specific-namespace/metrics.alloy b/charts/k8s-monitoring-v1/docs/examples/specific-namespace/metrics.alloy
diff --git a/charts/k8s-monitoring-v1/docs/examples/specific-namespace/output.yaml b/charts/k8s-monitoring-v1/docs/examples/specific-namespace/output.yaml
diff --git a/charts/k8s-monitoring-v1/templates/alloy_config/_operator_objects.txt b/charts/k8s-monitoring-v1/templates/alloy_config/_operator_objects.txt
@@ -26,7 +26,7 @@ prometheus.operator.podmonitors "pod_monitors" {
 {{ .Values.metrics.podMonitors.extraRelabelingRules | indent 2 }}
 {{- end }}
 
-{{- if or $metricAllowList $metricDenyList .Values.metrics.podMonitors.extraMetricProcessingRules }}
+{{- if or $metricAllowList $metricDenyList .Values.metrics.extraMetricRelabelingRules .Values.metrics.podMonitors.extraMetricRelabelingRules }}
   forward_to = [prometheus.relabel.podmonitors.receiver]
 }
 
@@ -85,7 +85,7 @@ prometheus.operator.probes "probes" {
 {{ .Values.metrics.probes.extraRelabelingRules | indent 2 }}
 {{- end }}
 
-{{- if or $metricAllowList $metricDenyList .Values.metrics.probes.extraMetricProcessingRules }}
+{{- if or $metricAllowList $metricDenyList .Values.metrics.extraMetricRelabelingRules .Values.metrics.probes.extraMetricRelabelingRules }}
   forward_to = [prometheus.relabel.probes.receiver]
 }
 
@@ -144,7 +144,7 @@ prometheus.operator.servicemonitors "service_monitors" {
 {{ .Values.metrics.serviceMonitors.extraRelabelingRules | indent 2 }}
 {{- end }}
 
-{{- if or $metricAllowList $metricDenyList .Values.metrics.serviceMonitors.extraMetricProcessingRules }}
+{{- if or $metricAllowList $metricDenyList .Values.metrics.extraMetricRelabelingRules .Values.metrics.serviceMonitors.extraMetricRelabelingRules }}
   forward_to = [prometheus.relabel.servicemonitors.receiver]
 }
 

diff --git a/charts/k8s-monitoring/docs/examples/extra-rules/README.md b/charts/k8s-monitoring/docs/examples/extra-rules/README.md
@@ -48,7 +48,7 @@ destinations:
 clusterMetrics:
   enabled: true
   kube-state-metrics:
-    extraMetricRelabelingRules: |-
+    extraMetricProcessingRules: |-
       rule {
         source_labels = ["namespace"]
         regex = "production"

diff --git a/charts/k8s-monitoring/docs/examples/extra-rules/alloy-metrics.alloy b/charts/k8s-monitoring/docs/examples/extra-rules/alloy-metrics.alloy
diff --git a/charts/k8s-monitoring/docs/examples/extra-rules/output.yaml b/charts/k8s-monitoring/docs/examples/extra-rules/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/extra-rules/values.yaml b/charts/k8s-monitoring/docs/examples/extra-rules/values.yaml
@@ -28,7 +28,7 @@ destinations:
 clusterMetrics:
   enabled: true
   kube-state-metrics:
-    extraMetricRelabelingRules: |-
+    extraMetricProcessingRules: |-
       rule {
         source_labels = ["namespace"]
         regex = "production"