Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[grafana] Improve dashboards download script #3350

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
+15 −3
Open

[grafana] Improve dashboards download script #3350

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b18764b
Improve download script and remove -x parameter
xinity Oct 10, 2024
c30fe28
Chart version bump
xinity Oct 10, 2024
050e5c2
Update _config.tpl
xinity Oct 11, 2024
1e21e06
tentative moving $value.url to helper
xinity Oct 11, 2024
d5043b0
Improve helper function
xinity Oct 14, 2024
a9ce21e
fix Chart versionning
xinity Oct 14, 2024
116bfab
Update Grafana to version 11.2.2
terop Oct 13, 2024
169ca4e
Bump actions/checkout
charleskorn Oct 13, 2024
6a03b1b
Bump actions/setup-python
charleskorn Oct 13, 2024
97da95f
Bump azure/setup-helm
charleskorn Oct 13, 2024
ad0fad1
Remove use of deprecated `::set-output`
charleskorn Oct 13, 2024
1dbea94
Bump Python version to one available in Ubuntu 24.04 runners
charleskorn Oct 13, 2024
419c997
fix _config.tpl
xinity Oct 15, 2024
850d017
fix typo in _config.tpl
xinity Oct 15, 2024
fcd1043
Merge branch 'main' into feature/improve-grafana-download-dashboards
xinity Oct 15, 2024
68fafde
Update charts/grafana/templates/_helpers.tpl
xinity Oct 15, 2024
20e2bb5
Merge branch 'main' into feature/improve-grafana-download-dashboards
xinity Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/grafana/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: grafana
version: 8.5.2
version: 8.5.3
appVersion: 11.2.1
kubeVersion: "^1.8.0-0"
description: The leading tool for querying and visualizing time series and metrics.
Expand Down
9 changes: 8 additions & 1 deletion charts/grafana/templates/_config.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess, if someone changes the URL logic below, this may get forgotten. Not sure, if it make sense to move the Source URL logic to a dedicated template helper.

WDYT?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jkroepke i assume that if the logic is changed then lines 120 and below will also be changed right ? :

helm-charts/charts/grafana/templates/_config.tpl

Line 120 in c30fe28

{{- if $value.url }}

not sure for now it worth it to move it into a helper template even though it would better in the future :)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe @zanhsieh has an opinion here.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@xinity @jkroepke
I would prefer

  1. Move source url to the _helper.tpl
  2. Set default revision as 1 as well set default source url.
  3. Move echo "downloading: {{ $key }} dashboard" out of if since both conditions output that string.

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 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/grafana/templates/_pod.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
Loading