diff --git a/stable/prometheus-operator/Chart.yaml b/stable/prometheus-operator/Chart.yaml index 82f52d4e6f..398fdac99f 100644 --- a/stable/prometheus-operator/Chart.yaml +++ b/stable/prometheus-operator/Chart.yaml @@ -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: diff --git a/stable/prometheus-operator/README.md b/stable/prometheus-operator/README.md index b954afdbd1..e303a103ed 100644 --- a/stable/prometheus-operator/README.md +++ b/stable/prometheus-operator/README.md @@ -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` | diff --git a/stable/prometheus-operator/ci/test-values.yaml b/stable/prometheus-operator/ci/test-values.yaml index 84d3090c86..865103e143 100644 --- a/stable/prometheus-operator/ci/test-values.yaml +++ b/stable/prometheus-operator/ci/test-values.yaml @@ -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: diff --git a/stable/prometheus-operator/templates/exporters/kube-state-metrics/serviceMonitor.yaml b/stable/prometheus-operator/templates/exporters/kube-state-metrics/serviceMonitor.yaml index c1a15e6f2a..bf6d562eaf 100644 --- a/stable/prometheus-operator/templates/exporters/kube-state-metrics/serviceMonitor.yaml +++ b/stable/prometheus-operator/templates/exporters/kube-state-metrics/serviceMonitor.yaml @@ -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 diff --git a/stable/prometheus-operator/values.yaml b/stable/prometheus-operator/values.yaml index 3c4f5e67d0..4bf6392d7d 100644 --- a/stable/prometheus-operator/values.yaml +++ b/stable/prometheus-operator/values.yaml @@ -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: