Add labels for ServiceMonitor K8S objects

Signed-off-by: csahithi <[email protected]>
ovn-org · Jun 1, 2024 · ce6445d · ce6445d
1 parent 3680c6f
commit ce6445d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/helm/ovn-kubernetes/templates/ovnkube-monitor.yaml b/helm/ovn-kubernetes/templates/ovnkube-monitor.yaml
@@ -6,6 +6,9 @@ kind: ServiceMonitor
 metadata:
   labels:
     k8s-app: ovnkube-master
+    {{- with .Values.monitoring.commonServiceMonitorSelectorLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
   name: monitor-ovnkube-master
   namespace: ovn-kubernetes
 spec:
@@ -47,6 +50,9 @@ kind: ServiceMonitor
 metadata:
   labels:
     k8s-app: ovnkube-node
+    {{- with .Values.monitoring.commonServiceMonitorSelectorLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
   name: monitor-ovnkube-node
   namespace: ovn-kubernetes
 spec:
@@ -104,6 +110,9 @@ kind: ServiceMonitor
 metadata:
   labels:
     k8s-app: ovnkube-cluster-manager
+    {{- with .Values.monitoring.commonServiceMonitorSelectorLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
   name: monitor-ovnkube-cluster-manager
   namespace: ovn-kubernetes
 spec:

diff --git a/helm/ovn-kubernetes/values.yaml b/helm/ovn-kubernetes/values.yaml
@@ -147,3 +147,12 @@ global:
 ovnkube-identity:
     # -- number of ovnube-identity pods, co-located with kube-apiserver process, so need to be the same number of control plane nodes
     replicas: 1
+
+# -- prometheus monitoring related fields
+monitoring:
+  # -- specify the labels for serviceMonitors to be selected for target discovery.
+  # Prometheus operator defines what namespaces and what servicemonitors within these
+  # namespaces must be selected for target discovery. The fields defined below helps
+  # in defining that.
+  commonServiceMonitorSelectorLabels:
+    release: kube-prometheus-stack