Skip to content
This repository has been archived by the owner on Feb 22, 2022. It is now read-only.

[stable/elasticsearch-exporter] Add ServiceMonitor metricRelabeling #23291

Merged
merged 1 commit into from
Jul 22, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stable/elasticsearch-exporter/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
description: Elasticsearch stats exporter for Prometheus
name: elasticsearch-exporter
version: 3.5.0
version: 3.6.0
kubeVersion: ">=1.10.0-0"
appVersion: 1.1.0
home: https://github.com/justwatchcom/elasticsearch_exporter
Expand Down
1 change: 1 addition & 0 deletions stable/elasticsearch-exporter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ Parameter | Description | Default
`serviceMonitor.scheme` | Scheme to use for scraping | `http`
`serviceMonitor.relabelings` | Relabel configuration for the metrics | `[]`
`serviceMonitor.targetLabels` | Set of labels to transfer on the Kubernetes Service onto the target. | `[]`
`serviceMonitor.metricRelabelings` | MetricRelabelConfigs to apply to samples before ingestion. | `[]`
`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 | `{}`
Expand Down
4 changes: 4 additions & 0 deletions stable/elasticsearch-exporter/templates/servicemonitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ spec:
relabelings:
{{- toYaml .Values.serviceMonitor.relabelings | nindent 4 }}
{{- end }}
{{- if .Values.serviceMonitor.metricRelabelings }}
metricRelabelings:
{{ toYaml .Values.serviceMonitor.metricRelabelings | nindent 4 }}
{{- end }}
jobLabel: "{{ .Release.Name }}"
selector:
matchLabels:
Expand Down
1 change: 1 addition & 0 deletions stable/elasticsearch-exporter/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ serviceMonitor:
scheme: http
relabelings: []
targetLabels: []
metricRelabelings: []

prometheusRule:
## If true, a PrometheusRule CRD is created for a prometheus operator
Expand Down