From 51c7460ef0571fb10f244d596a53724b2a34d16f Mon Sep 17 00:00:00 2001 From: Giancarlo Rubio Date: Wed, 2 May 2018 13:24:02 +0200 Subject: [PATCH] set app name in servicemonitor (#1294) --- helm/exporter-coredns/Chart.yaml | 2 +- .../templates/servicemonitor.yaml | 1 + .../Chart.yaml | 2 +- .../templates/servicemonitor.yaml | 1 + helm/exporter-kube-dns/Chart.yaml | 2 +- .../templates/servicemonitor.yaml | 3 ++- helm/exporter-kube-etcd/Chart.yaml | 2 +- .../templates/servicemonitor.yaml | 1 + helm/exporter-kube-scheduler/Chart.yaml | 2 +- .../templates/servicemonitor.yaml | 1 + helm/exporter-kube-state/Chart.yaml | 2 +- .../templates/servicemonitor.yaml | 1 + helm/exporter-kubelets/Chart.yaml | 2 +- .../templates/servicemonitor.yaml | 1 + helm/exporter-kubernetes/Chart.yaml | 2 +- .../templates/servicemonitor.yaml | 1 + helm/exporter-node/Chart.yaml | 2 +- .../templates/servicemonitor.yaml | 1 + helm/kube-prometheus/Chart.yaml | 4 +--- helm/kube-prometheus/requirements.yaml | 20 +++++++++---------- helm/kube-prometheus/values.yaml | 3 ++- helm/prometheus/Chart.yaml | 2 +- 22 files changed, 33 insertions(+), 25 deletions(-) diff --git a/helm/exporter-coredns/Chart.yaml b/helm/exporter-coredns/Chart.yaml index 7c4c3fdc9..870d6621d 100644 --- a/helm/exporter-coredns/Chart.yaml +++ b/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 diff --git a/helm/exporter-coredns/templates/servicemonitor.yaml b/helm/exporter-coredns/templates/servicemonitor.yaml index fb187b142..6684d91ae 100644 --- a/helm/exporter-coredns/templates/servicemonitor.yaml +++ b/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 }}" diff --git a/helm/exporter-kube-controller-manager/Chart.yaml b/helm/exporter-kube-controller-manager/Chart.yaml index f3fd87907..9bbca96ba 100644 --- a/helm/exporter-kube-controller-manager/Chart.yaml +++ b/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 diff --git a/helm/exporter-kube-controller-manager/templates/servicemonitor.yaml b/helm/exporter-kube-controller-manager/templates/servicemonitor.yaml index 12cf4a69b..8670ee5fe 100644 --- a/helm/exporter-kube-controller-manager/templates/servicemonitor.yaml +++ b/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 }}" diff --git a/helm/exporter-kube-dns/Chart.yaml b/helm/exporter-kube-dns/Chart.yaml index d0bf6d028..93c154e1a 100644 --- a/helm/exporter-kube-dns/Chart.yaml +++ b/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 diff --git a/helm/exporter-kube-dns/templates/servicemonitor.yaml b/helm/exporter-kube-dns/templates/servicemonitor.yaml index a57932cae..8d4d59735 100644 --- a/helm/exporter-kube-dns/templates/servicemonitor.yaml +++ b/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 }}" diff --git a/helm/exporter-kube-etcd/Chart.yaml b/helm/exporter-kube-etcd/Chart.yaml index f7d59c747..56595754b 100755 --- a/helm/exporter-kube-etcd/Chart.yaml +++ b/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 diff --git a/helm/exporter-kube-etcd/templates/servicemonitor.yaml b/helm/exporter-kube-etcd/templates/servicemonitor.yaml index e23d47d76..c19db2378 100644 --- a/helm/exporter-kube-etcd/templates/servicemonitor.yaml +++ b/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 }}" diff --git a/helm/exporter-kube-scheduler/Chart.yaml b/helm/exporter-kube-scheduler/Chart.yaml index 4ed884e5a..c46902d13 100644 --- a/helm/exporter-kube-scheduler/Chart.yaml +++ b/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 diff --git a/helm/exporter-kube-scheduler/templates/servicemonitor.yaml b/helm/exporter-kube-scheduler/templates/servicemonitor.yaml index c183c4359..ec72b2974 100644 --- a/helm/exporter-kube-scheduler/templates/servicemonitor.yaml +++ b/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 }}" diff --git a/helm/exporter-kube-state/Chart.yaml b/helm/exporter-kube-state/Chart.yaml index 8232fc146..d531012bb 100644 --- a/helm/exporter-kube-state/Chart.yaml +++ b/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 diff --git a/helm/exporter-kube-state/templates/servicemonitor.yaml b/helm/exporter-kube-state/templates/servicemonitor.yaml index f6bcae85b..a744b82c1 100644 --- a/helm/exporter-kube-state/templates/servicemonitor.yaml +++ b/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 }}" diff --git a/helm/exporter-kubelets/Chart.yaml b/helm/exporter-kubelets/Chart.yaml index 8ac7a18c2..d80e8f58d 100755 --- a/helm/exporter-kubelets/Chart.yaml +++ b/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 diff --git a/helm/exporter-kubelets/templates/servicemonitor.yaml b/helm/exporter-kubelets/templates/servicemonitor.yaml index 675c6af0f..3153ab85b 100644 --- a/helm/exporter-kubelets/templates/servicemonitor.yaml +++ b/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 }}" diff --git a/helm/exporter-kubernetes/Chart.yaml b/helm/exporter-kubernetes/Chart.yaml index af3b336cc..4881cfcfb 100755 --- a/helm/exporter-kubernetes/Chart.yaml +++ b/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 diff --git a/helm/exporter-kubernetes/templates/servicemonitor.yaml b/helm/exporter-kubernetes/templates/servicemonitor.yaml index 7cb7b6240..82d560e8a 100644 --- a/helm/exporter-kubernetes/templates/servicemonitor.yaml +++ b/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 }}" diff --git a/helm/exporter-node/Chart.yaml b/helm/exporter-node/Chart.yaml index ec70b97ae..a234d43fe 100755 --- a/helm/exporter-node/Chart.yaml +++ b/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 diff --git a/helm/exporter-node/templates/servicemonitor.yaml b/helm/exporter-node/templates/servicemonitor.yaml index 3f885dac7..fa545e5b3 100644 --- a/helm/exporter-node/templates/servicemonitor.yaml +++ b/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 }}" diff --git a/helm/kube-prometheus/Chart.yaml b/helm/kube-prometheus/Chart.yaml index 4088d64c3..a7d3cca0b 100644 --- a/helm/kube-prometheus/Chart.yaml +++ b/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 diff --git a/helm/kube-prometheus/requirements.yaml b/helm/kube-prometheus/requirements.yaml index 6988e4566..a9d1ce060 100644 --- a/helm/kube-prometheus/requirements.yaml +++ b/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 diff --git a/helm/kube-prometheus/values.yaml b/helm/kube-prometheus/values.yaml index 4abbea64b..a4e5edc3d 100644 --- a/helm/kube-prometheus/values.yaml +++ b/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 diff --git a/helm/prometheus/Chart.yaml b/helm/prometheus/Chart.yaml index b96d2468b..de80cd2c0 100755 --- a/helm/prometheus/Chart.yaml +++ b/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