set app name in servicemonitor (#1294)

helm/exporter-coredns/Chart.yaml

@@ -1,4 +1,4 @@
 apiVersion: v1
 description: A Helm chart for coredns metrics
 name: exporter-coredns
-version: 0.0.2
+version: 0.0.3

helm/exporter-coredns/templates/servicemonitor.yaml

@@ -2,6 +2,7 @@ apiVersion: {{ template "prometheus-operator.apiVersion" . }}
 kind: ServiceMonitor
 metadata:
   labels:
+    app: {{ template "exporter-coredns.name" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     component: {{ .Values.selectorLabel }}
     heritage: "{{ .Release.Service }}"

helm/exporter-kube-controller-manager/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A Helm chart for Kubernetes
 name: exporter-kube-controller-manager
-version: 0.1.8
+version: 0.1.9
 maintainers:
   - name: Michael Goodness
     email: mgoodness@gmail.com

helm/exporter-kube-controller-manager/templates/servicemonitor.yaml

@@ -2,6 +2,7 @@ apiVersion: {{ template "prometheus-operator.apiVersion" . }}
 kind: ServiceMonitor
 metadata:
   labels:
+    app: {{ template "exporter-kube-controller-manager.name" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     component: kube-controller-manager
     heritage: "{{ .Release.Service }}"

helm/exporter-kube-dns/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A Helm chart singleton for kube-state-metrics
 name: exporter-kube-dns
-version: 0.1.6
+version: 0.1.7
 maintainers:
   - name: Michael Goodness
     email: mgoodness@gmail.com

helm/exporter-kube-dns/templates/servicemonitor.yaml

@@ -1,7 +1,8 @@
 apiVersion: {{ template "prometheus-operator.apiVersion" . }}
 kind: ServiceMonitor
 metadata:
-  labels:
+  labels:    
+    app: {{ template "exporter-kube-dns.name" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     component: kube-dns
     heritage: "{{ .Release.Service }}"

helm/exporter-kube-etcd/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A Helm chart for Kubernetes
 name: exporter-kube-etcd
-version: 0.1.10
+version: 0.1.11
 maintainers:
   - name: Michael Goodness
     email: mgoodness@gmail.com

helm/exporter-kube-etcd/templates/servicemonitor.yaml

@@ -2,6 +2,7 @@ apiVersion: {{ template "prometheus-operator.apiVersion" . }}
 kind: ServiceMonitor
 metadata:
   labels:
+    app: {{ template "exporter-kube-etcd.name" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     component: kube-etcd
     heritage: "{{ .Release.Service }}"

helm/exporter-kube-scheduler/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A Helm chart singleton for kube-state-metrics
 name: exporter-kube-scheduler
-version: 0.1.7
+version: 0.1.8
 maintainers:
   - name: Michael Goodness
     email: mgoodness@gmail.com

helm/exporter-kube-scheduler/templates/servicemonitor.yaml

@@ -2,6 +2,7 @@ apiVersion: {{ template "prometheus-operator.apiVersion" . }}
 kind: ServiceMonitor
 metadata:
   labels:
+    app: {{ template "exporter-kube-scheduler.name" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     component: kube-scheduler
     heritage: "{{ .Release.Service }}"

helm/exporter-kube-state/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A Helm chart singleton for kube-state-metrics
 name: exporter-kube-state
-version: 0.2.1
+version: 0.2.2
 maintainers:
   - name: Giancarlo Rubio
     email: gianrubio@gmail.com

helm/exporter-kube-state/templates/servicemonitor.yaml

@@ -2,6 +2,7 @@ apiVersion: {{ template "prometheus-operator.apiVersion" . }}
 kind: ServiceMonitor
 metadata:
   labels:
+    app: {{ template "exporter-kube-state.name" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     component: kube-state
     heritage: "{{ .Release.Service }}"

helm/exporter-kubelets/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A Helm chart for Kubernetes
 name: exporter-kubelets
-version: 0.2.8
+version: 0.2.9
 maintainers:
   - name: Michael Goodness
     email: mgoodness@gmail.com

helm/exporter-kubelets/templates/servicemonitor.yaml

@@ -2,6 +2,7 @@ apiVersion: {{ template "prometheus-operator.apiVersion" . }}
 kind: ServiceMonitor
 metadata:
   labels:
+    app: {{ template "exporter-kubelets.name" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     component: kubelets
     heritage: "{{ .Release.Service }}"

helm/exporter-kubernetes/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A Helm chart for Kubernetes
 name: exporter-kubernetes
-version: 0.1.8
+version: 0.1.9
 maintainers:
   - name: Giancarlo Rubio
     email: gianrubio@gmail.com

helm/exporter-kubernetes/templates/servicemonitor.yaml

@@ -2,6 +2,7 @@ apiVersion: {{ template "prometheus-operator.apiVersion" . }}
 kind: ServiceMonitor
 metadata:
   labels:
+    app: {{ template "exporter-kubernetes.name" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     component: kubelets
     heritage: "{{ .Release.Service }}"

helm/exporter-node/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A Helm chart for Kubernetes node exporter
 name: exporter-node
-version: 0.3.1
+version: 0.3.2
 maintainers:
   - name: Giancarlo Rubio
     email: gianrubio@gmail.com

helm/exporter-node/templates/servicemonitor.yaml

@@ -2,6 +2,7 @@ apiVersion: {{ template "prometheus-operator.apiVersion" . }}
 kind: ServiceMonitor
 metadata:
   labels:
+    app: {{ template "exporter-node.name" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     component: node-exporter
     heritage: "{{ .Release.Service }}"

helm/kube-prometheus/Chart.yaml

@@ -2,11 +2,9 @@ apiVersion: v1
 description: Manifests, dashboards, and alerting rules for end-to-end Kubernetes cluster monitoring.
 engine: gotpl
 maintainers:
-  - name: Michael Goodness
-    email: mgoodness@gmail.com
   - name: Giancarlo Rubio
     email: gianrubio@gmail.com
 name: kube-prometheus
 sources:
   - https://github.com/coreos/prometheus-operator
-version: 0.0.60
+version: 0.0.61

helm/kube-prometheus/requirements.yaml

@@ -6,54 +6,54 @@ dependencies:
     condition: deployAlertManager
 
   - name: prometheus
-    version: 0.0.34
+    version: 0.0.35
     #e2e-repository: file://../prometheus
     repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
 
   - name: exporter-coredns
-    version: 0.0.2
+    version: 0.0.3
     #e2e-repository: file://../exporter-coredns
     repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
     condition: deployCoreDNS
 
   - name: exporter-kube-controller-manager
-    version: 0.1.8
+    version: 0.1.9
     #e2e-repository: file://../exporter-kube-controller-manager
     repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
 
   - name: exporter-kube-dns
-    version: 0.1.6
+    version: 0.1.7
     #e2e-repository: file://../exporter-kube-dns
     repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
     condition: deployKubeDNS
 
   - name: exporter-kube-etcd
-    version: 0.1.10
+    version: 0.1.11
     #e2e-repository: file://../exporter-kube-etcd
     repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
 
   - name: exporter-kube-scheduler
-    version: 0.1.7
+    version: 0.1.8
     #e2e-repository: file://../exporter-kube-scheduler
     repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
 
   - name: exporter-kube-state
-    version: 0.2.1
+    version: 0.2.2
     #e2e-repository: file://../exporter-kube-state
     repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
 
   - name: exporter-kubelets
-    version: 0.2.8
+    version: 0.2.9
     #e2e-repository: file://../exporter-kubelets
     repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
 
   - name: exporter-kubernetes
-    version: 0.1.8
+    version: 0.1.9
     #e2e-repository: file://../exporter-kubernetes
     repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
 
   - name: exporter-node
-    version: 0.3.1
+    version: 0.3.2
     #e2e-repository: file://../exporter-node
     repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
     condition: deployExporterNode

helm/kube-prometheus/values.yaml

@@ -316,7 +316,8 @@ prometheus:
   ##
   serviceMonitorsSelector: 
     matchExpressions:
-    - {key: prometheus, operator: In, values: [kube-prometheus, prometheus-operator]}
+    - {key: app, operator: In, values: [alertmanager, exporter-coredns, exporter-node, exporter-kubernetes, exporter-kube-controller-manager,  exporter-kubelets, exporter-kube-scheduler,
+        exporter-kube-etcd, exporter-kube-dns, grafana, prometheus, prometheus-operator ]}
 
   ## ServiceMonitor CRDs to create & be scraped by the Prometheus instance.
   ## Ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/service-monitor.md

helm/prometheus/Chart.yaml

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