diff --git a/charts/enterprise/prometheus/Chart.yaml b/charts/enterprise/prometheus/Chart.yaml index 6898b9109f6..4f302f1f15d 100644 --- a/charts/enterprise/prometheus/Chart.yaml +++ b/charts/enterprise/prometheus/Chart.yaml @@ -29,7 +29,7 @@ sources: - https://github.com/prometheus-community/helm-charts - https://github.com/prometheus-operator/kube-prometheus type: application -version: 9.0.31 +version: 9.1.0 annotations: truecharts.org/catagories: | - metrics diff --git a/charts/enterprise/prometheus/templates/prometheus/_prometheus.tpl b/charts/enterprise/prometheus/templates/prometheus/_prometheus.tpl index b0578f2d4a7..2410c614c4b 100644 --- a/charts/enterprise/prometheus/templates/prometheus/_prometheus.tpl +++ b/charts/enterprise/prometheus/templates/prometheus/_prometheus.tpl @@ -25,6 +25,11 @@ spec: {{- else }} probeSelector: {} {{- end }} + {{- if .Values.prometheus.scrapeConfigSelector }} + scrapeConfigSelector: {{- include "tc.v1.common.tplvalues.render" (dict "value" .Values.prometheus.scrapeConfigSelector "context" $) | nindent 4 }} + {{- else }} + scrapeConfigSelector: {} + {{- end }} alerting: alertmanagers: {{- if .Values.prometheus.alertingEndpoints }} @@ -113,6 +118,11 @@ spec: {{- else }} probeNamespaceSelector: {} {{- end }} + {{- if .Values.prometheus.scrapeConfigNamespaceSelector }} + scrapeConfigNamespaceSelector: {{- include "tc.v1.common.tplvalues.render" (dict "value" .Values.prometheus.scrapeConfigNamespaceSelector "context" $) | nindent 4 }} + {{- else }} + scrapeConfigNamespaceSelector: {} + {{- end }} {{- if .Values.prometheus.remoteRead }} remoteRead: {{- include "tc.v1.common.tplvalues.render" (dict "value" .Values.prometheus.remoteRead "context" $) | nindent 4 }} {{- end }} diff --git a/charts/enterprise/prometheus/values.yaml b/charts/enterprise/prometheus/values.yaml index 19c03750063..cdb9ec7d1aa 100644 --- a/charts/enterprise/prometheus/values.yaml +++ b/charts/enterprise/prometheus/values.yaml @@ -515,6 +515,14 @@ prometheus: ## See https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#namespaceselector for usage ## probeNamespaceSelector: {} + ## @param prometheus.scrapeConfigSelector The scrapeConfigs to be selected for target discovery. + ## If {}, select all scrapeConfigs + ## + scrapeConfigSelector: {} + ## @param prometheus.scrapeConfigNamespaceSelector Namespaces to be selected for scrapeConfig discovery. + ## If {}, select all namespaces. + ## If nil, select own namespace. + scrapeConfigNamespaceSelector: {} ## @param prometheus.retention Metrics retention days ## retention: 31d