From 52d8f900a6b65696f828686ce90e23e5b3422b89 Mon Sep 17 00:00:00 2001 From: nanori Date: Sat, 11 May 2024 15:42:54 +0200 Subject: [PATCH 1/6] Patch https://github.com/grafana/helm-charts/issues/2343 Add tpl for host in grafana.ini Signed-off-by: Nanori --- charts/grafana/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml index a327a7a01e..4dcb0af7de 100644 --- a/charts/grafana/values.yaml +++ b/charts/grafana/values.yaml @@ -782,7 +782,7 @@ grafana.ini: grafana_net: url: https://grafana.net server: - domain: "{{ if (and .Values.ingress.enabled .Values.ingress.hosts) }}{{ .Values.ingress.hosts | first }}{{ else }}''{{ end }}" + domain: "{{ if (and .Values.ingress.enabled .Values.ingress.hosts) }}{{ tpl (.Values.ingress.hosts | first) . }}{{ else }}''{{ end }}" ## grafana Authentication can be enabled with the following values on grafana.ini # server: # The full public facing url you use in browser, used for redirects and emails From 4454bbd9dd5697d849eb357530a613804213e325 Mon Sep 17 00:00:00 2001 From: MH Date: Sun, 12 May 2024 23:35:14 +0800 Subject: [PATCH 2/6] Update Chart.yaml Signed-off-by: MH --- charts/grafana/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index f9b619ef6c..01dec108b1 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 7.3.11 +version: 7.3.12 appVersion: 10.4.1 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. From 6b2e33a3d5bf029eb3dc6b87880141ddcb5b409b Mon Sep 17 00:00:00 2001 From: MH Date: Tue, 30 Jul 2024 08:36:12 +0800 Subject: [PATCH 3/6] Update Chart.yaml Signed-off-by: MH --- charts/grafana/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index 6dad6e875d..e4b88d1e78 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.4.0 +version: 8.3.8 appVersion: 11.1.0 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. From 0962967d7a263bfcff80eb1b841e6e9d91143e7b Mon Sep 17 00:00:00 2001 From: MH Date: Sat, 10 Aug 2024 10:41:09 +0800 Subject: [PATCH 4/6] Create with-nondefault-values.yaml Signed-off-by: MH --- charts/grafana/ci/with-nondefault-values.yaml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 charts/grafana/ci/with-nondefault-values.yaml diff --git a/charts/grafana/ci/with-nondefault-values.yaml b/charts/grafana/ci/with-nondefault-values.yaml new file mode 100644 index 0000000000..2dbad20b27 --- /dev/null +++ b/charts/grafana/ci/with-nondefault-values.yaml @@ -0,0 +1,6 @@ +global: + environment: prod +ingress: + enabled: true + hosts: + - monitoring-{{ .Values.global.environment }}.example.com From 2ceb9e3630d3eb3e513152842fa51c2e25d04371 Mon Sep 17 00:00:00 2001 From: MH Date: Sat, 10 Aug 2024 10:41:45 +0800 Subject: [PATCH 5/6] Update Chart.yaml Signed-off-by: MH --- charts/grafana/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index 08d84f3db2..1a418dc5ea 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.4.3 +version: 8.4.4 appVersion: 11.1.3 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. From 450d4c92b61b14b99618e7bfff196163ef3e68ec Mon Sep 17 00:00:00 2001 From: MH Date: Sat, 10 Aug 2024 10:44:34 +0800 Subject: [PATCH 6/6] Update with-nondefault-values.yaml Signed-off-by: MH --- charts/grafana/ci/with-nondefault-values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/grafana/ci/with-nondefault-values.yaml b/charts/grafana/ci/with-nondefault-values.yaml index 2dbad20b27..fb5c179409 100644 --- a/charts/grafana/ci/with-nondefault-values.yaml +++ b/charts/grafana/ci/with-nondefault-values.yaml @@ -3,4 +3,4 @@ global: ingress: enabled: true hosts: - - monitoring-{{ .Values.global.environment }}.example.com + - monitoring-{{ .Values.global.environment }}.example.com