Also need to check for extraMetricRelabelingRules

Signed-off-by: Pete Wall <[email protected]>
grafana · Jan 8, 2025 · 7327213 · 7327213
1 parent 3aade50
commit 7327213
Show file tree

Hide file tree

Showing 5 changed files with 174 additions and 3 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.extraMetricRelabelingRules }}
+{{- 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.extraMetricRelabelingRules }}
+{{- 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.extraMetricRelabelingRules }}
+{{- if or $metricAllowList $metricDenyList .Values.metrics.extraMetricRelabelingRules .Values.metrics.serviceMonitors.extraMetricRelabelingRules }}
   forward_to = [prometheus.relabel.servicemonitors.receiver]
 }