From 2a43e9ff731a46b8601476e0490f80e391e2a021 Mon Sep 17 00:00:00 2001 From: Ricardo Medeiros <45370285+ricardomedeirosdacostajunior@users.noreply.github.com> Date: Mon, 30 Dec 2019 18:37:39 -0300 Subject: [PATCH] [stable/stackdriver-exporter] - Add prometheus rule additionalLabels in servicemonitor.yaml (#19802) * fix(stable/stackdriver-exporter): add prometheusRule additionalLabels Signed-off-by: Ricardo Medeiros * chore(stable/stackdriver-exporter): change version from 1.2.1 to 1.2.2 Signed-off-by: Ricardo Medeiros * doc(stable/stackdriver-exporter): add serviceMonitor.additonalLabels in stable/stackdriver-exporter/README.md Signed-off-by: Ricardo Medeiros * fix(stable/stackdriver-exporter): add additionalLabes in servicemonitor Signed-off-by: Ricardo Medeiros * fix(stable/stackdriver-export): fix typo at servicemonitor.yaml Signed-off-by: Ricardo Medeiros --- stable/stackdriver-exporter/Chart.yaml | 2 +- stable/stackdriver-exporter/README.md | 2 ++ stable/stackdriver-exporter/templates/servicemonitor.yaml | 3 +++ stable/stackdriver-exporter/values.yaml | 2 ++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/stable/stackdriver-exporter/Chart.yaml b/stable/stackdriver-exporter/Chart.yaml index c867586cec..e99b8a9cc9 100644 --- a/stable/stackdriver-exporter/Chart.yaml +++ b/stable/stackdriver-exporter/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: Stackdriver exporter for Prometheus name: stackdriver-exporter -version: 1.2.1 +version: 1.2.2 appVersion: 0.6.0 home: https://www.stackdriver.com/ sources: diff --git a/stable/stackdriver-exporter/README.md b/stable/stackdriver-exporter/README.md index 43b5097c6b..698839f067 100644 --- a/stable/stackdriver-exporter/README.md +++ b/stable/stackdriver-exporter/README.md @@ -87,6 +87,8 @@ Parameter | Description `tolerations` | Node taints to tolerate (requires Kubernetes >=1.6) | `[]` `serviceMonitor.enabled` | if `true`, creates a Prometheus Operator ServiceMonitor | `false` `serviceMonitor.namespace` | Namespace where you want to create the ServiceMonitor | `monitoring` +`serviceMonitor.additionalLabels` | Labels used by Prometheus Operator to discover your Service Monitor. Set according to your Prometheus setup | `{}` +`monitoring` `serviceMonitor.interval` | How frequently to scrape metrics (not set: fall back to Prometheus' default) | `nil` `serviceMonitor.honorLabels` | if `true`, label conflicts are resolved by keeping label values from the scraped data | `true` diff --git a/stable/stackdriver-exporter/templates/servicemonitor.yaml b/stable/stackdriver-exporter/templates/servicemonitor.yaml index 664f745c9c..e7718a18dd 100644 --- a/stable/stackdriver-exporter/templates/servicemonitor.yaml +++ b/stable/stackdriver-exporter/templates/servicemonitor.yaml @@ -11,6 +11,9 @@ metadata: app: {{ template "stackdriver-exporter.name" . }} release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" + {{- if .Values.serviceMonitor.additionalLabels }} +{{ toYaml .Values.serviceMonitor.additionalLabels | indent 4 }} + {{- end }} spec: endpoints: - port: http diff --git a/stable/stackdriver-exporter/values.yaml b/stable/stackdriver-exporter/values.yaml index 75d6d2619b..668ba02e9c 100644 --- a/stable/stackdriver-exporter/values.yaml +++ b/stable/stackdriver-exporter/values.yaml @@ -88,6 +88,8 @@ serviceAccount: serviceMonitor: enabled: false namespace: monitoring + # additionalLabels is the set of additional labels to add to the ServiceMonitor + additionalLabels: {} # fallback to the prometheus default unless specified # interval: 10s ## Defaults to what's used if you follow CoreOS [Prometheus Install Instructions](https://github.com/helm/charts/tree/master/stable/prometheus-operator#tldr)