[stable/stackdriver-exporter] - Add prometheus rule additionalLabels in servicemonitor.yaml (#19802)

* fix(stable/stackdriver-exporter): add prometheusRule additionalLabels

Signed-off-by: Ricardo Medeiros <ricardo.costa@treasy.com.br>

* chore(stable/stackdriver-exporter): change version from 1.2.1 to 1.2.2

Signed-off-by: Ricardo Medeiros <ricardo.costa@treasy.com.br>

* doc(stable/stackdriver-exporter): add serviceMonitor.additonalLabels in stable/stackdriver-exporter/README.md

Signed-off-by: Ricardo Medeiros <ricardo.costa@treasy.com.br>

* fix(stable/stackdriver-exporter): add additionalLabes in servicemonitor

Signed-off-by: Ricardo Medeiros <ricardo.costa@treasy.com.br>

* fix(stable/stackdriver-export): fix typo at servicemonitor.yaml

Signed-off-by: Ricardo Medeiros <ricardo.costa@treasy.com.br>

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:

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`
 

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

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)