[grafana] Improve dashboards download script

charts/grafana/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: grafana
-version: 8.5.5
+version: 8.5.6
 appVersion: 11.2.2
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.

charts/grafana/templates/_config.tpl

@@ -81,7 +81,9 @@ download_dashboards.sh: |
 {{- range $provider, $dashboards := .Values.dashboards }}
   {{- range $key, $value := $dashboards }}
     {{- if (or (hasKey $value "gnetId") (hasKey $value "url")) }}
-  curl -skf \
+  echo "downloading: {{ $key }} dashboard"
+  echo "Source Url: {{ include "grafana.url" . }}  
+  curl -skf --show-error \
   --connect-timeout 60 \
   --max-time 60 \
     {{- if not $value.b64content }}

charts/grafana/templates/_helpers.tpl

@@ -224,6 +224,16 @@ Formats imagePullSecrets. Input is (dict "root" . "imagePullSecrets" .{specific
 {{- $secretFound}}
 {{- end -}}
 
+
+{{/*
+Define the source URL 
+*/}}
+{{- define "grafana.url" -}}
+{{- $this_revision := hasKey . "revision" | ternary .revision 1 }}
+{{- $this_url := hasKey . "url" | ternary .url (printf "https://grafana.com/api/dashboards/%s/revisions/%s/download" .gnetId $this_revision) }}                                      
+{{- print $this_url }}
+{{- end }}
+
 {{/*
     Checks whether the user is attempting to store secrets in plaintext
     in the grafana.ini configmap

charts/grafana/templates/_pod.tpl

@@ -66,7 +66,7 @@ initContainers:
     {{- end }}
     imagePullPolicy: {{ .Values.downloadDashboardsImage.pullPolicy }}
     command: ["/bin/sh"]
-    args: [ "-c", "mkdir -p /var/lib/grafana/dashboards/default && /bin/sh -x /etc/grafana/download_dashboards.sh" ]
+    args: [ "-c", "mkdir -p /var/lib/grafana/dashboards/default && /bin/sh /etc/grafana/download_dashboards.sh" ]
     {{- with .Values.downloadDashboards.resources }}
     resources:
       {{- toYaml . | nindent 6 }}