Improve download script and remove -x parameter

grafana · Oct 10, 2024 · 9cda7f8 · 9cda7f8
1 parent 350783e
commit 9cda7f8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/charts/grafana/templates/_config.tpl b/charts/grafana/templates/_config.tpl
@@ -81,7 +81,14 @@ download_dashboards.sh: |
 {{- range $provider, $dashboards := .Values.dashboards }}
   {{- range $key, $value := $dashboards }}
     {{- if (or (hasKey $value "gnetId") (hasKey $value "url")) }}
-  curl -skf \
+{{- if $value.url }}
+  echo "downloading: {{ $key }} dashboard"
+  echo "Source Url: {{ $value.url }}"
+{{- else }}
+  echo "downloading {{ $key }} dashboard"
+  echo "Source Url: https://grafana.com/api/dashboards/{{ $value.gnetId }}/revisions/{{- if $value.revision -}}{{ $value.revision }}{{- else -}}1{{- end -}}/download"
+{{- end }}
+  curl -skf --show-error \
   --connect-timeout 60 \
   --max-time 60 \
     {{- if not $value.b64content }}

diff --git a/charts/grafana/templates/_pod.tpl b/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 }}