Merge pull request docker-mailserver#110 from cfis/issue_103

Enable adding customer labels to ServiceMonitor. docker-mailserver#103
geek-cookbook · May 4, 2024 · 6e9c4d3 · 6e9c4d3
2 parents 736490e + f958f2b
commit 6e9c4d3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/charts/docker-mailserver/Chart.yaml b/charts/docker-mailserver/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "13.3.1"
 description: A fullstack but simple mailserver (smtp, imap, antispam, antivirus, ssl...) using Docker.
 name: docker-mailserver
-version: 3.0.9
+version: 3.0.10
 sources:
 - https://github.com/docker-mailserver/docker-mailserver-helm
 maintainers:

diff --git a/charts/docker-mailserver/templates/servicemonitor.yaml b/charts/docker-mailserver/templates/servicemonitor.yaml
@@ -8,6 +8,9 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     heritage: "{{ .Release.Service }}"
     release: "{{ .Release.Name }}"
+{{- if .Values.metrics.serviceMonitor.labels }}
+{{ toYaml .Values.metrics.serviceMonitor.labels | indent 4 }}
+{{ end }}    
   name: {{ template "dockermailserver.fullname" . }}
 spec:
   endpoints:

diff --git a/charts/docker-mailserver/values.yaml b/charts/docker-mailserver/values.yaml
@@ -419,6 +419,8 @@ metrics:
   serviceMonitor:
     enabled: false
     scrapeInterval: 15s
+    ## Optionally add additional labels to the deployment
+    labels: {}  
 
 ## ConfigMaps (and Secrets) are used to copy docker-mailserver configuration files 
 ## into running containers. This chart automatically sets up any config files that