Merge pull request #239 from sergeunity/service-monitor-in-option

Service monitor in option
spotahome · Feb 13, 2020 · cc5f180 · cc5f180
2 parents a569fb3 + f04d47b
commit cc5f180
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/charts/redisoperator/Chart.yaml b/charts/redisoperator/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v1
 description: A Helm chart for the Spotahome Redis Operator
 name: redisoperator
-version: 3.0.0
+version: 3.1.0
diff --git a/charts/redisoperator/templates/monitoring.yaml b/charts/redisoperator/templates/monitoring.yaml
@@ -6,6 +6,10 @@ metadata:
   labels:
     prometheus: {{ .Values.monitoring.prometheus.name }}
 {{ include "helm-labels" . | indent 4 }}
+{{- if .Values.monitoring.serviceAnnotations }}
+  annotations:
+{{ toYaml .Values.monitoring.serviceAnnotations | indent 4 }}
+{{- end }}
 spec:
   ports:
     - port: 9710
@@ -16,7 +20,8 @@ spec:
 {{ include "common-labels" . | indent 4 }}
 
 ---
-apiVersion: monitoring.coreos.com/v1
+{{- if .Values.monitoring.serviceMonitor -}}
+apiVersion: monitoring.coreos.com/v1 
 kind: ServiceMonitor
 metadata:
   name: {{ template "name" . }}
@@ -34,4 +39,5 @@ spec:
   endpoints:
   - port: metrics
     interval: 15s
+{{- end -}}
 {{- end -}}
diff --git a/charts/redisoperator/values.yaml b/charts/redisoperator/values.yaml
@@ -16,5 +16,7 @@ rbac:
   imagePullSecrets: []
 monitoring:
   enabled: false
+  serviceMonitor: false
+  serviceAnnotations: {}
   prometheus:
     name: unknown