From 10be91cb872e09f116b7297dc8c0fa2dc89a8193 Mon Sep 17 00:00:00 2001 From: Guangning E Date: Fri, 26 Sep 2025 16:22:27 +0800 Subject: [PATCH 1/4] Support custom scrape configs --- .../templates/prometheus/prometheus-configmap.yaml | 6 ++++++ .../templates/prometheus/pulsar-operators-rbac.yaml | 1 + charts/sn-platform-slim/values.yaml | 1 + .../templates/prometheus/prometheus-configmap.yaml | 6 ++++++ .../templates/prometheus/pulsar-operators-rbac.yaml | 1 + charts/sn-platform/values.yaml | 2 ++ 6 files changed, 17 insertions(+) diff --git a/charts/sn-platform-slim/templates/prometheus/prometheus-configmap.yaml b/charts/sn-platform-slim/templates/prometheus/prometheus-configmap.yaml index 36443c15c..eb1fbfdcb 100644 --- a/charts/sn-platform-slim/templates/prometheus/prometheus-configmap.yaml +++ b/charts/sn-platform-slim/templates/prometheus/prometheus-configmap.yaml @@ -31,6 +31,11 @@ data: path_prefix: {{ template "pulsar.control_center_path.alertmanager" . }}/ {{- end }} scrape_configs: +{{- if .Values.prometheus.customScrapeConfigs -}} +{{- with .Values.prometheus.customScrapeConfigs }} +{{ toYaml . | indent 6 }} +{{- end }} +{{- else }} - job_name: 'prometheus' static_configs: - targets: @@ -154,6 +159,7 @@ data: {{- with .Values.prometheus.extraCustomArgs }} {{ toYaml . | indent 4 }} {{- end }} +{{- end }} {{- end }} rules.yml: | {{- if .Values.monitoring.alert_manager -}} diff --git a/charts/sn-platform-slim/templates/prometheus/pulsar-operators-rbac.yaml b/charts/sn-platform-slim/templates/prometheus/pulsar-operators-rbac.yaml index 8381bd3be..6b23e899e 100644 --- a/charts/sn-platform-slim/templates/prometheus/pulsar-operators-rbac.yaml +++ b/charts/sn-platform-slim/templates/prometheus/pulsar-operators-rbac.yaml @@ -15,6 +15,7 @@ rules: resources: - nodes - nodes/proxy + - nodes/metrics - services - endpoints - pods diff --git a/charts/sn-platform-slim/values.yaml b/charts/sn-platform-slim/values.yaml index 1cf60f616..72c982afd 100644 --- a/charts/sn-platform-slim/values.yaml +++ b/charts/sn-platform-slim/values.yaml @@ -1824,6 +1824,7 @@ prometheus: customRelabelConfigs: [] extraScrapeConfigs: [] extraCustomArgs: {} + customScrpaConfigs: [] ## Prometheus service ## templates/prometheus-service.yaml diff --git a/charts/sn-platform/templates/prometheus/prometheus-configmap.yaml b/charts/sn-platform/templates/prometheus/prometheus-configmap.yaml index 36443c15c..89f4d0543 100644 --- a/charts/sn-platform/templates/prometheus/prometheus-configmap.yaml +++ b/charts/sn-platform/templates/prometheus/prometheus-configmap.yaml @@ -31,6 +31,11 @@ data: path_prefix: {{ template "pulsar.control_center_path.alertmanager" . }}/ {{- end }} scrape_configs: +{{- if .Values.prometheus.customScrapeConfigs -}} +{{- with .Values.prometheus.customScrapeConfigs }} +{{ toYaml . | indent 4 }} +{{- end }} +{{- else }} - job_name: 'prometheus' static_configs: - targets: @@ -154,6 +159,7 @@ data: {{- with .Values.prometheus.extraCustomArgs }} {{ toYaml . | indent 4 }} {{- end }} +{{- end }} {{- end }} rules.yml: | {{- if .Values.monitoring.alert_manager -}} diff --git a/charts/sn-platform/templates/prometheus/pulsar-operators-rbac.yaml b/charts/sn-platform/templates/prometheus/pulsar-operators-rbac.yaml index 8381bd3be..6b23e899e 100644 --- a/charts/sn-platform/templates/prometheus/pulsar-operators-rbac.yaml +++ b/charts/sn-platform/templates/prometheus/pulsar-operators-rbac.yaml @@ -15,6 +15,7 @@ rules: resources: - nodes - nodes/proxy + - nodes/metrics - services - endpoints - pods diff --git a/charts/sn-platform/values.yaml b/charts/sn-platform/values.yaml index 9646aecce..9e30b2f79 100644 --- a/charts/sn-platform/values.yaml +++ b/charts/sn-platform/values.yaml @@ -1905,6 +1905,8 @@ prometheus: customRelabelConfigs: [] extraScrapeConfigs: [] extraCustomArgs: {} + # A advanced configuration to add custom scrape configs. + customScrapeConfigs: [] ## Prometheus service ## templates/prometheus-service.yaml From 5c5db4cea024fd1a3534c730ba8f8ecdec06a064 Mon Sep 17 00:00:00 2001 From: Guangning E Date: Fri, 26 Sep 2025 16:23:28 +0800 Subject: [PATCH 2/4] Support custom scrape configs --- .../templates/prometheus/prometheus-configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/sn-platform-slim/templates/prometheus/prometheus-configmap.yaml b/charts/sn-platform-slim/templates/prometheus/prometheus-configmap.yaml index eb1fbfdcb..89f4d0543 100644 --- a/charts/sn-platform-slim/templates/prometheus/prometheus-configmap.yaml +++ b/charts/sn-platform-slim/templates/prometheus/prometheus-configmap.yaml @@ -33,7 +33,7 @@ data: scrape_configs: {{- if .Values.prometheus.customScrapeConfigs -}} {{- with .Values.prometheus.customScrapeConfigs }} -{{ toYaml . | indent 6 }} +{{ toYaml . | indent 4 }} {{- end }} {{- else }} - job_name: 'prometheus' From 1fe0f19c0601c5311773312f90134b5ce3cbb111 Mon Sep 17 00:00:00 2001 From: Guangning E Date: Mon, 12 Jan 2026 19:53:55 +0800 Subject: [PATCH 3/4] Support disable kubenetes node and cadvisor scrape --- .../templates/prometheus/prometheus-configmap.yaml | 4 +++- charts/sn-platform-slim/values.yaml | 4 ++++ .../templates/prometheus/prometheus-configmap.yaml | 4 +++- charts/sn-platform/values.yaml | 4 ++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/charts/sn-platform-slim/templates/prometheus/prometheus-configmap.yaml b/charts/sn-platform-slim/templates/prometheus/prometheus-configmap.yaml index 89f4d0543..1d0dd5cc1 100644 --- a/charts/sn-platform-slim/templates/prometheus/prometheus-configmap.yaml +++ b/charts/sn-platform-slim/templates/prometheus/prometheus-configmap.yaml @@ -112,7 +112,7 @@ data: {{ toYaml . | indent 6 }} {{- end }} {{- end }} -{{- if .Values.prometheus.serviceAccount.clusterRole }} +{{- if and .Values.prometheus.serviceAccount.clusterRole (ne (default true .Values.prometheus.scrape.kubernetesNodes) false) }} - job_name: 'kubernetes-nodes' scheme: https kubernetes_sd_configs: @@ -131,6 +131,8 @@ data: regex: (.+) target_label: __metrics_path__ replacement: /api/v1/nodes/${1}/proxy/metrics +{{- end }} +{{- if and .Values.prometheus.serviceAccount.clusterRole (ne (default true .Values.prometheus.scrape.kubernetesCadvisor) false) }} - job_name: 'kubernetes-cadvisor' scheme: https kubernetes_sd_configs: diff --git a/charts/sn-platform-slim/values.yaml b/charts/sn-platform-slim/values.yaml index c77b6cf4c..8ffd58964 100644 --- a/charts/sn-platform-slim/values.yaml +++ b/charts/sn-platform-slim/values.yaml @@ -1951,6 +1951,10 @@ prometheus: node_exporter: true proxy: true zookeeper: true + # Enable scraping of kubernetes nodes metrics + kubernetesNodes: true + # Enable scraping of kubernetes cadvisor metrics + kubernetesCadvisor: true # nodeSelector: # cloud.google.com/gke-nodepool: default-pool labels: {} diff --git a/charts/sn-platform/templates/prometheus/prometheus-configmap.yaml b/charts/sn-platform/templates/prometheus/prometheus-configmap.yaml index 89f4d0543..1d0dd5cc1 100644 --- a/charts/sn-platform/templates/prometheus/prometheus-configmap.yaml +++ b/charts/sn-platform/templates/prometheus/prometheus-configmap.yaml @@ -112,7 +112,7 @@ data: {{ toYaml . | indent 6 }} {{- end }} {{- end }} -{{- if .Values.prometheus.serviceAccount.clusterRole }} +{{- if and .Values.prometheus.serviceAccount.clusterRole (ne (default true .Values.prometheus.scrape.kubernetesNodes) false) }} - job_name: 'kubernetes-nodes' scheme: https kubernetes_sd_configs: @@ -131,6 +131,8 @@ data: regex: (.+) target_label: __metrics_path__ replacement: /api/v1/nodes/${1}/proxy/metrics +{{- end }} +{{- if and .Values.prometheus.serviceAccount.clusterRole (ne (default true .Values.prometheus.scrape.kubernetesCadvisor) false) }} - job_name: 'kubernetes-cadvisor' scheme: https kubernetes_sd_configs: diff --git a/charts/sn-platform/values.yaml b/charts/sn-platform/values.yaml index 22d4e2d5b..dec55a308 100644 --- a/charts/sn-platform/values.yaml +++ b/charts/sn-platform/values.yaml @@ -2032,6 +2032,10 @@ prometheus: proxy: true zookeeper: true vault: true + # Enable scraping of kubernetes nodes metrics + kubernetesNodes: true + # Enable scraping of kubernetes cadvisor metrics + kubernetesCadvisor: true # nodeSelector: # cloud.google.com/gke-nodepool: default-pool labels: {} From 6b20aa301acd7558d64fb531da617fc3a6695010 Mon Sep 17 00:00:00 2001 From: Guangning E Date: Mon, 12 Jan 2026 20:49:43 +0800 Subject: [PATCH 4/4] Fixed --- .../templates/prometheus/prometheus-configmap.yaml | 4 ++-- .../templates/prometheus/prometheus-configmap.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/sn-platform-slim/templates/prometheus/prometheus-configmap.yaml b/charts/sn-platform-slim/templates/prometheus/prometheus-configmap.yaml index 1d0dd5cc1..030dd3add 100644 --- a/charts/sn-platform-slim/templates/prometheus/prometheus-configmap.yaml +++ b/charts/sn-platform-slim/templates/prometheus/prometheus-configmap.yaml @@ -112,7 +112,7 @@ data: {{ toYaml . | indent 6 }} {{- end }} {{- end }} -{{- if and .Values.prometheus.serviceAccount.clusterRole (ne (default true .Values.prometheus.scrape.kubernetesNodes) false) }} +{{- if and .Values.prometheus.serviceAccount.clusterRole (or (not (hasKey .Values.prometheus.scrape "kubernetesNodes")) (eq .Values.prometheus.scrape.kubernetesNodes true)) }} - job_name: 'kubernetes-nodes' scheme: https kubernetes_sd_configs: @@ -132,7 +132,7 @@ data: target_label: __metrics_path__ replacement: /api/v1/nodes/${1}/proxy/metrics {{- end }} -{{- if and .Values.prometheus.serviceAccount.clusterRole (ne (default true .Values.prometheus.scrape.kubernetesCadvisor) false) }} +{{- if and .Values.prometheus.serviceAccount.clusterRole (or (not (hasKey .Values.prometheus.scrape "kubernetesCadvisor")) (eq .Values.prometheus.scrape.kubernetesCadvisor true)) }} - job_name: 'kubernetes-cadvisor' scheme: https kubernetes_sd_configs: diff --git a/charts/sn-platform/templates/prometheus/prometheus-configmap.yaml b/charts/sn-platform/templates/prometheus/prometheus-configmap.yaml index 1d0dd5cc1..030dd3add 100644 --- a/charts/sn-platform/templates/prometheus/prometheus-configmap.yaml +++ b/charts/sn-platform/templates/prometheus/prometheus-configmap.yaml @@ -112,7 +112,7 @@ data: {{ toYaml . | indent 6 }} {{- end }} {{- end }} -{{- if and .Values.prometheus.serviceAccount.clusterRole (ne (default true .Values.prometheus.scrape.kubernetesNodes) false) }} +{{- if and .Values.prometheus.serviceAccount.clusterRole (or (not (hasKey .Values.prometheus.scrape "kubernetesNodes")) (eq .Values.prometheus.scrape.kubernetesNodes true)) }} - job_name: 'kubernetes-nodes' scheme: https kubernetes_sd_configs: @@ -132,7 +132,7 @@ data: target_label: __metrics_path__ replacement: /api/v1/nodes/${1}/proxy/metrics {{- end }} -{{- if and .Values.prometheus.serviceAccount.clusterRole (ne (default true .Values.prometheus.scrape.kubernetesCadvisor) false) }} +{{- if and .Values.prometheus.serviceAccount.clusterRole (or (not (hasKey .Values.prometheus.scrape "kubernetesCadvisor")) (eq .Values.prometheus.scrape.kubernetesCadvisor true)) }} - job_name: 'kubernetes-cadvisor' scheme: https kubernetes_sd_configs: