diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml index 0e234a68..395c31a0 100644 --- a/charts/kube-prometheus-stack/Chart.yaml +++ b/charts/kube-prometheus-stack/Chart.yaml @@ -18,7 +18,7 @@ name: kube-prometheus-stack sources: - https://github.com/prometheus-community/helm-charts - https://github.com/prometheus-operator/kube-prometheus -version: 13.5.1 +version: 13.6.0 appVersion: 0.45.0 kubeVersion: ">=1.16.0-0" home: https://github.com/prometheus-operator/kube-prometheus diff --git a/charts/kube-prometheus-stack/templates/exporters/kube-state-metrics/serviceMonitor.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-state-metrics/serviceMonitor.yaml index f09de5d2..bc814faf 100644 --- a/charts/kube-prometheus-stack/templates/exporters/kube-state-metrics/serviceMonitor.yaml +++ b/charts/kube-prometheus-stack/templates/exporters/kube-state-metrics/serviceMonitor.yaml @@ -25,6 +25,10 @@ spec: {{- end }} selector: matchLabels: + {{- if .Values.kubeStateMetrics.serviceMonitor.selectorOverride }} + {{ toYaml .Values.kubeStateMetrics.serviceMonitor.selectorOverride }} + {{ else }} app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: "{{ $.Release.Name }}" + {{- end }} {{- end }} diff --git a/charts/kube-prometheus-stack/values.yaml b/charts/kube-prometheus-stack/values.yaml index f367e960..caa38b02 100644 --- a/charts/kube-prometheus-stack/values.yaml +++ b/charts/kube-prometheus-stack/values.yaml @@ -1151,6 +1151,9 @@ kubeStateMetrics: ## Scrape interval. If not set, the Prometheus default scrape interval is used. ## interval: "" + ## Override serviceMonitor selector + ## + selectorOverride: {} ## metric relabel configs to apply to samples before ingestion. ##