fix(servicemonitors): [azure-metrics-exporter] namespaceSelector (#56)

Co-authored-by: David Griffiths (OSV) <david.griffiths.osv@fedex.com>
Co-authored-by: Markus Blaschke <mblaschke82@gmail.com>

Author: 3 people

charts/azure-metrics-exporter/Chart.yaml

@@ -3,7 +3,7 @@ name: azure-metrics-exporter
 type: application
 description: A Helm chart for azure-metrics-exporter
 home: https://github.com/webdevops/azure-metrics-exporter
-version: 1.2.3
+version: 1.2.4
 # renovate: image=webdevops/azure-metrics-exporter
 appVersion: 24.9.0
 keywords:

charts/azure-metrics-exporter/templates/prometheus/servicemonitor.metricprobe.yaml

@@ -20,6 +20,13 @@ spec:
   {{ include "servicemonitor.scrapeLimits" $monitorDefaults | indent 2 }}
   selector:
     matchLabels: {{- include "azure-metrics-exporter.selectorLabels" $root | nindent 6 }}
+  {{- if .Values.prometheus.monitor.namespaceSelector }}
+  namespaceSelector: {{ toYaml .Values.prometheus.monitor.namespaceSelector | nindent 4 }}
+  {{- else }}
+  namespaceSelector:
+    matchNames:
+      - {{ template "azure-metrics-exporter.namespace" . }}
+  {{- end }} 
   endpoints:
     - port: {{ $root.Values.service.portName }}
       scheme: {{ (default $monitorDefaults.scheme .scheme) }}

charts/azure-metrics-exporter/templates/prometheus/servicemonitor.yaml

@@ -16,6 +16,13 @@ metadata:
 spec:
   jobLabel: {{ default "app.kubernetes.io/name" .Values.prometheus.monitor.jobLabel }}
   {{ include "servicemonitor.scrapeLimits" .Values.prometheus.monitor | indent 2 }}
+  {{- if .Values.prometheus.monitor.namespaceSelector }}
+  namespaceSelector: {{ toYaml .Values.prometheus.monitor.namespaceSelector | nindent 4 }}
+  {{- else }}
+  namespaceSelector:
+    matchNames:
+    - {{ template "azure-metrics-exporter.namespace" . }}
+  {{- end }}
   selector:
     matchLabels: {{- include "azure-metrics-exporter.selectorLabels" . | nindent 6 }}
   endpoints:

charts/azure-metrics-exporter/values.yaml

@@ -173,6 +173,8 @@ prometheus:
     ##
     labelValueLengthLimit: 0
 
+    namespaceSelector: {}
+
   ## azure metrics probe scrapes
   metricProbes:
     jobLabel: ""