[kube-prometheus-stack]: fix to make sure that 'grafana.sidecar.datas…

…ources.name' is always a string Signed-off-by: Sebastian Gaiser <sebastiangaiser@users.noreply.github.com>
prometheus-community · Jul 1, 2024 · 5071dfa · 5071dfa
1 parent ab2f3e8
commit 5071dfa
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git 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: 61.1.0
+version: 61.1.1
 appVersion: v0.75.0
 kubeVersion: ">=1.19.0-0"
 home: https://github.com/prometheus-operator/kube-prometheus

diff --git a/charts/kube-prometheus-stack/ci/03-non-defaults-values.yaml b/charts/kube-prometheus-stack/ci/03-non-defaults-values.yaml
@@ -78,6 +78,12 @@ kubeProxy:
       matchLabels:
         k8s-app: kube-proxy
 
+grafana:
+  sidecar:
+    datasources:
+      alertmanager:
+        name: 0
+
 nodeExporter:
   enabled: true
   forceDeployDashboards: true

diff --git a/charts/kube-prometheus-stack/templates/grafana/configmaps-datasources.yaml b/charts/kube-prometheus-stack/templates/grafana/configmaps-datasources.yaml
@@ -22,7 +22,7 @@ data:
     datasources:
 {{- $scrapeInterval := .Values.grafana.sidecar.datasources.defaultDatasourceScrapeInterval | default .Values.prometheus.prometheusSpec.scrapeInterval | default "30s" }}
 {{- if .Values.grafana.sidecar.datasources.defaultDatasourceEnabled }}
-    - name: {{ .Values.grafana.sidecar.datasources.name }}
+    - name: "{{ .Values.grafana.sidecar.datasources.name }}"
       type: prometheus
       uid: {{ .Values.grafana.sidecar.datasources.uid }}
       {{- if .Values.grafana.sidecar.datasources.url }}
@@ -45,7 +45,7 @@ data:
 {{- end }}
 {{- if .Values.grafana.sidecar.datasources.createPrometheusReplicasDatasources }}
 {{- range until (int .Values.prometheus.prometheusSpec.replicas) }}
-    - name: {{ .Values.grafana.sidecar.datasources.name }}-{{ . }}
+    - name: "{{ $.Values.grafana.sidecar.datasources.name }}-{{ . }}"
       type: prometheus
       uid: {{ $.Values.grafana.sidecar.datasources.uid }}-replica-{{ . }}
       url: http://prometheus-{{ template "kube-prometheus-stack.prometheus.crname" $ }}-{{ . }}.prometheus-operated:9090/{{ trimPrefix "/" $.Values.prometheus.prometheusSpec.routePrefix }}
@@ -61,7 +61,7 @@ data:
 {{- end }}
 {{- end }}
 {{- if .Values.grafana.sidecar.datasources.alertmanager.enabled }}
-    - name: {{ .Values.grafana.sidecar.datasources.alertmanager.name }}
+    - name: "{{ .Values.grafana.sidecar.datasources.alertmanager.name }}"
       type: alertmanager
       uid: {{ .Values.grafana.sidecar.datasources.alertmanager.uid }}
       {{- if .Values.grafana.sidecar.datasources.alertmanager.url }}