Make buildin prom compatible with mergeMetrics feature

streamnative · Nov 21, 2024 · 9e4b6ed · 9e4b6ed
1 parent a2ca2d8
commit 9e4b6ed
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/charts/sn-platform-slim/templates/prometheus/prometheus-configmap.yaml b/charts/sn-platform-slim/templates/prometheus/prometheus-configmap.yaml
@@ -53,7 +53,7 @@ data:
             - {{ template "pulsar.namespace" . }}
 {{- end }}
 {{- if .Values.istio.enabled }}
-{{- if .Values.istio.migration }} 
+{{- if or .Values.istio.migration .Values.istio.mergeMetrics }}
       scheme: http
       enable_http2: false
 {{- else }}

diff --git a/charts/sn-platform-slim/values.yaml b/charts/sn-platform-slim/values.yaml
@@ -2144,7 +2144,7 @@ istio:
   migration: false
   # istio labels used to inject sidecars if it's not `sidecar.istio.io/inject: "true"`
   labels: {}
-  # If you're using the prometheus in this chart, please keep mergeMetrics disabled.
+  # mergeMetrics should be enabled if you want to scrape pulsar metrics from an external prometheus not running on Istio
   mergeMetrics: false
   gateway:
     # gateway selector if it's not `istio: ingressgateway`

diff --git a/charts/sn-platform/templates/prometheus/prometheus-configmap.yaml b/charts/sn-platform/templates/prometheus/prometheus-configmap.yaml
@@ -53,7 +53,7 @@ data:
             - {{ template "pulsar.namespace" . }}
 {{- end }}
 {{- if .Values.istio.enabled }}
-{{- if .Values.istio.migration }} 
+{{- if or .Values.istio.migration .Values.istio.mergeMetrics }}
       scheme: http
       enable_http2: false
 {{- else }}

diff --git a/charts/sn-platform/values.yaml b/charts/sn-platform/values.yaml
@@ -2509,7 +2509,7 @@ istio:
   migration: false
   # istio labels used to inject sidecars if it's not `sidecar.istio.io/inject: "true"`
   labels: {}
-  # If you're using the prometheus in this chart, please keep mergeMetrics disabled.
+  # mergeMetrics should be enabled if you want to scrape pulsar metrics from an external prometheus not running on Istio
   mergeMetrics: false
   gateway:
     # gateway selector if it's not `istio: ingressgateway`