Add servicemonitor additional labels and podmonitor (#2541)

Co-authored-by: shaunak_deshmukh <shaunak@infracloud.io>

charts/fission-all/templates/buildermgr/podmonitor.yaml

@@ -0,0 +1,23 @@
+{{- if .Values.podMonitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  name: buildermgr-monitor
+  {{- if .Values.podMonitor.namespace }}
+  namespace: {{ .Values.podMonitor.namespace }}
+  {{- end }}
+  {{- with .Values.podMonitor.additionalPodMonitorLabels }}
+  labels:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  namespaceSelector:
+    matchNames:
+      - {{ .Release.Namespace }}
+  selector:
+    matchLabels:
+      svc: buildermgr
+  podMetricsEndpoints:
+  - port: "metrics"
+    path: "/metrics"
+{{- end -}}

charts/fission-all/templates/controller/servicemonitor.yaml

@@ -6,6 +6,10 @@ metadata:
   {{- if .Values.serviceMonitor.namespace }}
   namespace: {{ .Values.serviceMonitor.namespace }}
   {{- end }}
+  {{- with .Values.serviceMonitor.additionalServiceMonitorLabels }}
+  labels:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   namespaceSelector:
     matchNames:

charts/fission-all/templates/executor/servicemonitor.yaml

@@ -6,6 +6,10 @@ metadata:
   {{- if .Values.serviceMonitor.namespace }}
   namespace: {{ .Values.serviceMonitor.namespace }}
   {{- end }}
+  {{- with .Values.serviceMonitor.additionalServiceMonitorLabels }}
+  labels:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   namespaceSelector:
     matchNames:

charts/fission-all/templates/mqt-fission-kafka/deployment.yaml

@@ -33,6 +33,9 @@ spec:
         imagePullPolicy: {{ .Values.pullPolicy }}
         command: ["/fission-bundle"]
         args: ["--mqt", "--routerUrl", "http://router.{{ .Release.Namespace }}"]
+        ports:
+          - containerPort: 8080
+            name: metrics
         env:
         - name: MESSAGE_QUEUE_TYPE
           value: kafka

charts/fission-all/templates/mqt-fission-kafka/podmonitor.yaml

@@ -0,0 +1,23 @@
+{{- if .Values.podMonitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  name: mqt-fission-kafka-monitor
+  {{- if .Values.podMonitor.namespace }}
+  namespace: {{ .Values.podMonitor.namespace }}
+  {{- end }}
+  {{- with .Values.podMonitor.additionalPodMonitorLabels }}
+  labels:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  namespaceSelector:
+    matchNames:
+      - {{ .Release.Namespace }}
+  selector:
+    matchLabels:
+      svc: mqtrigger
+  podMetricsEndpoints:
+  - port: "metrics"
+    path: "/metrics"
+{{- end -}}

charts/fission-all/templates/router/servicemonitor.yaml

@@ -6,6 +6,10 @@ metadata:
   {{- if .Values.serviceMonitor.namespace }}
   namespace: {{ .Values.serviceMonitor.namespace }}
   {{- end }}
+  {{- with .Values.serviceMonitor.additionalServiceMonitorLabels }}
+  labels:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   namespaceSelector:
     matchNames:

charts/fission-all/templates/storagesvc/servicemonitor.yaml

@@ -5,7 +5,11 @@ metadata:
   name: storagesvc-monitor
   {{- if .Values.serviceMonitor.namespace }}
   namespace: {{ .Values.serviceMonitor.namespace }}
-  {{- end }}  
+  {{- end }}
+  {{- with .Values.serviceMonitor.additionalServiceMonitorLabels }}
+  labels:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   namespaceSelector:
     matchNames:

charts/fission-all/values.yaml

@@ -452,11 +452,33 @@ kafka:
   ##
   # version: "0.11.2.0"
 
+# The following components expose Prometheus metrics and have servicemonitors in this chart (disabled by default)
+# Controller, router, executor, storage svc
 serviceMonitor:
   enabled: false
   ##namespace in which you want to deploy servicemonitor
   ##
   namespace: ""
+  ## Map of additional lables to add to the ServiceMonitor resources
+  #  to allow selecting sepcific ServiceMonitors
+  #  in case of multiple prometheus deployments
+  additionalServiceMonitorLabels: {}
+  #  release: "monitoring"
+  #  key: "value"
+
+# The following components expose Prometheus metrics and have podmonitors in this chart (disabled by default)
+# 
+podMonitor:
+  enabled: false
+  ##namespace in which you want to deploy podmonitor
+  ##
+  namespace: ""
+  ## Map of additional lables to add to the PodMonitor resources
+  #  to allow selecting sepcific PodMonitor
+  #  in case of multiple prometheus deployments
+  additionalPodMonitorLabels: {}
+  #  release: "monitoring"
+  #  key: "value"
 
 ## Persist data to a persistent volume.
 ##