Merge branch 'master' into patch-1

helm/kube-prometheus/Chart.yaml

@@ -8,3 +8,4 @@ name: kube-prometheus
 sources:
   - https://github.com/coreos/prometheus-operator
 version: 0.0.78
+

helm/prometheus/Chart.yaml

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

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: {}