[stable/prometheus-operator] Allow metricRelabelings in default kube-state-metrics exporter (#12960)

* [stable/prometheus-operator] metricRelabelings in kube-state exporter

Signed-off-by: Marcos Estevez <marcos.stvz@gmail.com>

* Adding kubeStateMetrics.serviceMonitor.metricRelabelings to ci

Signed-off-by: Marcos Estevez <marcos.stvz@gmail.com>
This commit is contained in:
Marcos Estévez Martínez
2019-04-11 05:22:11 -07:00
committed by Kubernetes Prow Robot
parent b22774e2f2
commit 9c12247662
5 changed files with 20 additions and 1 deletions
+1 -1
View File
@@ -9,7 +9,7 @@ name: prometheus-operator
sources:
- https://github.com/coreos/prometheus-operator
- https://coreos.com/operators/prometheus
version: 5.0.10
version: 5.0.11
appVersion: 0.29.0
home: https://github.com/coreos/prometheus-operator
keywords:
+1
View File
@@ -358,6 +358,7 @@ The following tables list the configurable parameters of the prometheus-operator
| `kubeScheduler.serviceMonitor.interval` | Scrape interval. If not set, the Prometheus default scrape interval is used | `nil` |
| `kubeStateMetrics.enabled` | Deploy the `kube-state-metrics` chart and configure a servicemonitor to scrape | `true` |
| `kubeStateMetrics.serviceMonitor.interval` | Scrape interval. If not set, the Prometheus default scrape interval is used | `nil` |
| `kubeStateMetrics.serviceMonitor.metricRelabelings` | Metric relablings for the `kube-state-metrics` ServiceMonitor | `[]` |
| `kube-state-metrics.rbac.create` | Create RBAC components in kube-state-metrics. See `global.rbac.create` | `true` |
| `kube-state-metrics.podSecurityPolicy.enabled` | Create pod security policy resource for kube-state-metrics. | `true` |
| `nodeExporter.enabled` | Deploy the `prometheus-node-exporter` and scrape it | `true` |
@@ -590,6 +590,13 @@ kubeStateMetrics:
##
interval: ""
## metric relabel configs to apply to samples before ingestion.
##
metricRelabelings: []
# - action: keep
# regex: 'kube_(daemonset|deployment|pod|namespace|node|statefulset).+'
# sourceLabels: [__name__]
## Configuration for kube-state-metrics subchart
##
kube-state-metrics:
@@ -14,6 +14,10 @@ spec:
interval: {{ .Values.kubeStateMetrics.serviceMonitor.interval }}
{{- end }}
honorLabels: true
{{- if .Values.kubeStateMetrics.serviceMonitor.metricRelabelings }}
metricRelabelings:
{{ toYaml .Values.kubeStateMetrics.serviceMonitor.metricRelabelings | indent 4 }}
{{- end }}
selector:
matchLabels:
app: kube-state-metrics
+7
View File
@@ -590,6 +590,13 @@ kubeStateMetrics:
##
interval: ""
## metric relabel configs to apply to samples before ingestion.
##
metricRelabelings: []
# - action: keep
# regex: 'kube_(daemonset|deployment|pod|namespace|node|statefulset).+'
# sourceLabels: [__name__]
## Configuration for kube-state-metrics subchart
##
kube-state-metrics: