Helm: Allow label customization for servicemonitor (#113)

eg. ``` yaml serviceMonitor: additionalLabels: release: kube-prometheus-stack ``` Co-authored-by: Martin Helmich <[email protected]>
mittwald · Jan 5, 2022 · 51d20ba · 51d20ba
1 parent 2152476
commit 51d20ba
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/chart/templates/servicemonitor.yaml b/chart/templates/servicemonitor.yaml
@@ -1,16 +1,24 @@
-{{- if .Values.serviceMonitor -}}
+{{- if .Values.serviceMonitor.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ include "kube-httpcache.fullname" . }}
   labels:
     {{- include "kube-httpcache.labels" . | nindent 4 }}
+    {{- if .Values.serviceMonitor.additionalLabels }}
+{{ toYaml .Values.serviceMonitor.additionalLabels | indent 4 }}
+    {{- end }}
 spec:
   selector:
     matchLabels:
       {{- include "kube-httpcache.selectorLabels" . | nindent 6 }}
   endpoints:
   - port: metrics
     path: /metrics
-    interval: 10s
+    {{- if .Values.serviceMonitor.interval }}
+    interval: {{ .Values.serviceMonitor.interval }}
+    {{- end }}
+    {{- if .Values.serviceMonitor.scrapeTimeout }}
+    scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
+    {{- end }}
 {{- end}}
diff --git a/chart/values.yaml b/chart/values.yaml
@@ -65,7 +65,15 @@ rbac:
   enabled: true
 
 # create a prometheus operator ServiceMonitor
-serviceMonitor: false
+serviceMonitor:
+  enabled: false
+
+  additionalLabels: {}
+  ## Scrape interval. If not set, the Prometheus default scrape interval is used.
+  interval: 10s
+  ## Scrape Timeout. If not set, the Prometheus default scrape timeout is used.
+  scrapeTimeout: ""
+
 
 podSecurityPolicy:
   enabled: false