[stable/elasticsearch-exporter] Add options to set relabel configurat…

…ion for metrics (helm#21636) * Add options to set relabel configuration for metrics Signed-off-by: ricoberger <mail@ricoberger.de> * Use consistent indentation Signed-off-by: ricoberger <mail@ricoberger.de>
yoninl2 · May 4, 2020 · e76ba35 · e76ba35
1 parent c7f3a08
commit e76ba35
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/stable/elasticsearch-exporter/Chart.yaml b/stable/elasticsearch-exporter/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Elasticsearch stats exporter for Prometheus
 name: elasticsearch-exporter
-version: 3.2.0
+version: 3.3.0
 kubeVersion: ">=1.10.0-0"
 appVersion: 1.1.0
 home: https://github.com/justwatchcom/elasticsearch_exporter

diff --git a/stable/elasticsearch-exporter/README.md b/stable/elasticsearch-exporter/README.md
@@ -100,6 +100,7 @@ Parameter | Description | Default
 `serviceMonitor.interval` | Interval at which metrics should be scraped | `10s`
 `serviceMonitor.scrapeTimeout` | Timeout after which the scrape is ended | `10s`
 `serviceMonitor.scheme` | Scheme to use for scraping | `http`
+`serviceMonitor.relabelings` | Relabel configuration for the metrics | `[]`
 `prometheusRule.enabled` | If true, a PrometheusRule CRD is created for a prometheus operator | `false`
 `prometheusRule.namespace` | If set, the PrometheusRule will be installed in a different namespace  | `""`
 `prometheusRule.labels` | Labels for prometheus operator | `{}`

diff --git a/stable/elasticsearch-exporter/templates/servicemonitor.yaml b/stable/elasticsearch-exporter/templates/servicemonitor.yaml
@@ -25,6 +25,10 @@ spec:
     port: {{ .Values.service.metricsPort.name }}
     path: {{ .Values.web.path }}
     scheme: {{ .Values.serviceMonitor.scheme }}
+    {{- if .Values.serviceMonitor.relabelings }}
+    relabelings:
+    {{- toYaml .Values.serviceMonitor.relabelings | nindent 4 }}
+    {{- end }}
   jobLabel: "{{ .Release.Name }}"
   selector:
     matchLabels:

diff --git a/stable/elasticsearch-exporter/values.yaml b/stable/elasticsearch-exporter/values.yaml
@@ -166,6 +166,7 @@ serviceMonitor:
   interval: 10s
   scrapeTimeout: 10s
   scheme: http
+  relabelings: []
 
 prometheusRule:
   ## If true, a PrometheusRule CRD is created for a prometheus operator