Merge pull request #286 from kyverno/service-monitor-ns-selector

Service monitor ns selector

charts/policy-reporter/Chart.lock

@@ -1,12 +1,12 @@
 dependencies:
 - name: monitoring
   repository: ""
-  version: 2.7.0
+  version: 2.7.1
 - name: ui
   repository: ""
   version: 2.9.1
 - name: kyvernoPlugin
   repository: ""
   version: 1.5.3
-digest: sha256:bae39e68d05f60a4c1338840a57f5dba58fbc0f5784f8c203737a08915bdcf1d
-generated: "2023-03-21T11:08:08.645234+01:00"
+digest: sha256:a544e6830bd35b726565c36c68f153cab2c3d84f3ab20edfb8c986cbb0c985a7
+generated: "2023-03-31T09:18:09.401914+02:00"

charts/policy-reporter/Chart.yaml

@@ -18,7 +18,7 @@ maintainers:
 dependencies:
   - name: monitoring
     condition: monitoring.enabled
-    version: "2.7.0"
+    version: "2.7.1"
   - name: ui
     condition: ui.enabled
     version: "2.9.1"

charts/policy-reporter/charts/monitoring/Chart.yaml

@@ -3,5 +3,5 @@ name: monitoring
 description: Policy Reporter Monitoring with predefined ServiceMonitor and Grafana Dashboards
 
 type: application
-version: 2.7.0
+version: 2.7.1
 appVersion: 0.0.0

charts/policy-reporter/charts/monitoring/templates/kyverno-servicemonitor.yaml

@@ -17,6 +17,10 @@ spec:
   selector:
     matchLabels:
         {{- include "kyvernoplugin.selectorLabels" . | nindent 8 }}
+  {{- with .Values.kyverno.serviceMonitor.namespaceSelector }}
+  namespaceSelector:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   endpoints:
   - port: rest
     honorLabels: {{ .Values.kyverno.serviceMonitor.honorLabels }}

charts/policy-reporter/charts/monitoring/templates/servicemonitor.yaml

@@ -16,6 +16,10 @@ spec:
   selector:
     matchLabels:
         {{- include "policyreporter.selectorLabels" . | nindent 8 }}
+  {{- with .Values.serviceMonitor.namespaceSelector }}
+  namespaceSelector:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   endpoints:
   - port: http
     honorLabels: {{ .Values.serviceMonitor.honorLabels }}

charts/policy-reporter/charts/monitoring/values.yaml

@@ -18,6 +18,8 @@ serviceMonitor:
   relabelings: []
   # see serviceMonitor.relabelings
   metricRelabelings: []
+  # optional namespaceSelector
+  namespaceSelector: {}
 
 kyverno:
   serviceMonitor:
@@ -27,6 +29,8 @@ kyverno:
     relabelings: []
     # see serviceMonitor.relabelings
     metricRelabelings: []
+    # optional namespaceSelector
+    namespaceSelector: {}
 
 grafana:
   # namespace for configMap of grafana dashboards