fixing PR review suggestions

Signed-off-by: Adam Chabin <[email protected]>
prometheus-community · Oct 16, 2023 · ae3c207 · ae3c207
1 parent 748d771
commit ae3c207
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/charts/prometheus/templates/_helpers.tpl b/charts/prometheus/templates/_helpers.tpl
@@ -234,3 +234,9 @@ Define prometheus.server.remoteRead producing a list of remoteRead configuration
 {{ toYaml $remoteReads }}
 {{- end -}}
 
+{{/*
+Define prometheus.server.global.externalLabels producing a list of externalLabels
+*/}}
+{{- define "prometheus.server.global.externalLabels" -}}
+{{ toYaml .Values.server.global.externalLabels }}
+{{- end -}}
diff --git a/charts/prometheus/templates/cm.yaml b/charts/prometheus/templates/cm.yaml
@@ -20,8 +20,9 @@ data:
 {{- if eq $key "prometheus.yml" }}
     global:
 {{ $root.Values.server.global | toYaml | trimSuffix "\n" | indent 6 }}
-{{- with $root.Values.server.externalLabels }}
-      external_labels: {{ toYaml . | nindent 8 }}
+{{- if $root.Values.server.global.externalLabels }}
+      external_labels:
+{{- include "prometheus.server.global.externalLabels" $root | nindent 8 }}
 {{- end }}
 {{- if $root.Values.server.remoteWrite }}
     remote_write:

diff --git a/charts/prometheus/values.yaml b/charts/prometheus/values.yaml
@@ -228,6 +228,9 @@ server:
     ## How frequently to evaluate rules
     ##
     evaluation_interval: 1m
+    ## https://prometheus.io/docs/prometheus/latest/configuration/configuration/
+    ##
+    externalLabels: {}
   ## https://prometheus.io/docs/prometheus/latest/configuration/configuration/#remote_write
   ##
   remoteWrite: []