Merge pull request #1414 from gianrubio/helm-serviceMonitor

[helm] Add serviceMonitorNamespaceSelector to prometheus helm chart

helm/kube-prometheus/Chart.yaml

@@ -7,4 +7,4 @@ maintainers:
 name: kube-prometheus
 sources:
   - https://github.com/coreos/prometheus-operator
-version: 0.0.75
+version: 0.0.76

helm/kube-prometheus/requirements.yaml

@@ -6,7 +6,7 @@ dependencies:
     condition: deployAlertManager
 
   - name: prometheus
-    version: 0.0.40
+    version: 0.0.41
     #e2e-repository: file://../prometheus
     repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
 

helm/prometheus/Chart.yaml

@@ -7,4 +7,4 @@ maintainers:
 name: prometheus
 sources:
   - https://github.com/coreos/prometheus-operator
-version: 0.0.40
+version: 0.0.41

helm/prometheus/templates/prometheus.yaml

@@ -68,6 +68,10 @@ spec:
     matchLabels:
       prometheus: {{ .Values.prometheusLabelValue }}
 {{- end }}
+{{- if .Values.serviceMonitorNamespaceSelector }}
+  serviceMonitorNamespaceSelector:
+{{ toYaml .Values.serviceMonitorNamespaceSelector | indent 4 }}
+{{- end }}
 {{- if .Values.remoteRead }}
   remoteRead:
 {{ toYaml .Values.remoteRead | indent 4 }}

helm/prometheus/values.yaml

@@ -339,3 +339,4 @@ additionalScrapeConfigs: []
 #   - targets:
 #     - "localhost:9090"
 
+serviceMonitorNamespaceSelector: {}