From 10be91cb872e09f116b7297dc8c0fa2dc89a8193 Mon Sep 17 00:00:00 2001
From: Guangning E <guangning@streamnative.io>
Date: Fri, 26 Sep 2025 16:22:27 +0800
Subject: [PATCH 1/2] 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 <guangning@streamnative.io>
Date: Fri, 26 Sep 2025 16:23:28 +0800
Subject: [PATCH 2/2] 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'