From 075658dba808b5b016de3d20053ec4e5571ba329 Mon Sep 17 00:00:00 2001 From: zhifanggao <110591357+zhifanggao@users.noreply.github.com> Date: Wed, 6 Nov 2024 16:57:46 +0800 Subject: [PATCH] [kube-prometheus-stack] Add more informations to selector of additionalPodMonitors and additionalServiceMonitors (#4974) * add more information to selector of additionalPodMonitors and additionalServiceMonitors Signed-off-by: zhifanggao <28681649@qq.com> * remove space Signed-off-by: gaozf --------- Signed-off-by: zhifanggao <28681649@qq.com> Signed-off-by: gaozf Co-authored-by: gaozf --- charts/kube-prometheus-stack/Chart.yaml | 2 +- charts/kube-prometheus-stack/values.yaml | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml index 9aa757a0d1d9..cf62bcc87146 100644 --- a/charts/kube-prometheus-stack/Chart.yaml +++ b/charts/kube-prometheus-stack/Chart.yaml @@ -23,7 +23,7 @@ name: kube-prometheus-stack sources: - https://github.com/prometheus-community/helm-charts - https://github.com/prometheus-operator/kube-prometheus -version: 65.8.0 +version: 65.8.1 appVersion: v0.77.2 kubeVersion: ">=1.19.0-0" home: https://github.com/prometheus-operator/kube-prometheus diff --git a/charts/kube-prometheus-stack/values.yaml b/charts/kube-prometheus-stack/values.yaml index 0b728f2fe541..5a0e3d9c00c4 100644 --- a/charts/kube-prometheus-stack/values.yaml +++ b/charts/kube-prometheus-stack/values.yaml @@ -4301,6 +4301,18 @@ prometheus: ## Label selector for services to which this ServiceMonitor applies ## # selector: {} + ## Example which selects all services to be monitored + ## with label "monitoredby" with values any of "example-service-1" or "example-service-2" + # matchExpressions: + # - key: "monitoredby" + # operator: In + # values: + # - example-service-1 + # - example-service-2 + + ## label selector for services + ## + # matchLabels: {} ## Namespaces from which services are selected ## @@ -4401,6 +4413,18 @@ prometheus: ## Label selector for pods to which this PodMonitor applies ## # selector: {} + ## Example which selects all Pods to be monitored + ## with label "monitoredby" with values any of "example-pod-1" or "example-pod-2" + # matchExpressions: + # - key: "monitoredby" + # operator: In + # values: + # - example-pod-1 + # - example-pod-2 + + ## label selector for pods + ## + # matchLabels: {} ## PodTargetLabels transfers labels on the Kubernetes Pod onto the target. ##