Do not set the namespaces list for ServiceMonitors, PodMonitors, or P…

…robes if the list is empty. (#393) Should cause no functional difference, but it's clearer this way. Signed-off-by: Pete Wall <pete.wall@grafana.com>
grafana · Mar 4, 2024 · 7320c89 · 7320c89
1 parent af885fd
commit 7320c89
Show file tree

Hide file tree

Showing 39 changed files with 6 additions and 171 deletions.
diff --git a/charts/k8s-monitoring/templates/agent_config/_prometheus_operator_objects.txt b/charts/k8s-monitoring/templates/agent_config/_prometheus_operator_objects.txt
@@ -1,7 +1,9 @@
 {{ define "agent.config.pod_monitors" }}
 // Prometheus Operator PodMonitor objects
 prometheus.operator.podmonitors "pod_monitors" {
+{{- if .Values.metrics.podMonitors.namespaces }}
   namespaces = {{ .Values.metrics.podMonitors.namespaces | toJson }}
+{{- end }}
   forward_to = [prometheus.relabel.podmonitors.receiver]
 {{- if .Values.metrics.podMonitors.selector }}
   selector {
@@ -29,7 +31,9 @@ prometheus.relabel "podmonitors" {
 {{ define "agent.config.probes" }}
 // Prometheus Operator Probe objects
 prometheus.operator.probes "probes" {
+{{- if .Values.metrics.probes.namespaces }}
   namespaces = {{ .Values.metrics.probes.namespaces | toJson }}
+{{- end }}
   forward_to = [prometheus.relabel.probes.receiver]
 {{- if .Values.metrics.probes.selector }}
   selector {
@@ -58,7 +62,9 @@ prometheus.relabel "probes" {
 {{ define "agent.config.service_monitors" }}
 // Prometheus Operator ServiceMonitor objects
 prometheus.operator.servicemonitors "service_monitors" {
+{{- if .Values.metrics.serviceMonitors.namespaces }}
   namespaces = {{ .Values.metrics.serviceMonitors.namespaces | toJson }}
+{{- end }}
   forward_to = [prometheus.relabel.servicemonitors.receiver]
 {{- if .Values.metrics.serviceMonitors.selector }}
   selector {

diff --git a/examples/cluster-with-pvc/metrics.river b/examples/cluster-with-pvc/metrics.river
diff --git a/examples/cluster-with-pvc/output.yaml b/examples/cluster-with-pvc/output.yaml
diff --git a/examples/control-plane-metrics/metrics.river b/examples/control-plane-metrics/metrics.river
diff --git a/examples/control-plane-metrics/output.yaml b/examples/control-plane-metrics/output.yaml
diff --git a/examples/custom-config/metrics.river b/examples/custom-config/metrics.river
diff --git a/examples/custom-config/output.yaml b/examples/custom-config/output.yaml
diff --git a/examples/custom-metrics-tuning/metrics.river b/examples/custom-metrics-tuning/metrics.river
diff --git a/examples/custom-metrics-tuning/output.yaml b/examples/custom-metrics-tuning/output.yaml
diff --git a/examples/default-values/metrics.river b/examples/default-values/metrics.river
diff --git a/examples/default-values/output.yaml b/examples/default-values/output.yaml