From f5983cca58d00e0e379710b328841c070962cfb3 Mon Sep 17 00:00:00 2001 From: tom Date: Wed, 7 Feb 2024 15:52:23 +0100 Subject: [PATCH] conf(grafana): Add folderUid option TICKET: #2955 Signed-off-by: tom --- charts/grafana/Chart.yaml | 2 +- charts/grafana/README.md | 1 + charts/grafana/templates/_config.tpl | 1 + charts/grafana/values.yaml | 2 ++ 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index f4a6f85a1a..4e06406282 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.0.0 +version: 8.0.1 appVersion: 11.0.0 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/charts/grafana/README.md b/charts/grafana/README.md index 0ff07f297d..dde2a202bb 100644 --- a/charts/grafana/README.md +++ b/charts/grafana/README.md @@ -183,6 +183,7 @@ need to instead set `global.imageRegistry`. | `sidecar.dashboards.provider.name` | Unique name of the grafana provider | `sidecarProvider` | | `sidecar.dashboards.provider.orgid` | Id of the organisation, to which the dashboards should be added | `1` | | `sidecar.dashboards.provider.folder` | Logical folder in which grafana groups dashboards | `""` | +| `sidecar.dashboards.provider.folderUid` | Allows you to specify the static UID for the logical folder above | `""` | | `sidecar.dashboards.provider.disableDelete` | Activate to avoid the deletion of imported dashboards | `false` | | `sidecar.dashboards.provider.allowUiUpdates` | Allow updating provisioned dashboards from the UI | `false` | | `sidecar.dashboards.provider.type` | Provider type | `file` | diff --git a/charts/grafana/templates/_config.tpl b/charts/grafana/templates/_config.tpl index 19df19cd2a..b866217f2e 100644 --- a/charts/grafana/templates/_config.tpl +++ b/charts/grafana/templates/_config.tpl @@ -146,6 +146,7 @@ provider.yaml: |- orgId: {{ .Values.sidecar.dashboards.provider.orgid }} {{- if not .Values.sidecar.dashboards.provider.foldersFromFilesStructure }} folder: '{{ .Values.sidecar.dashboards.provider.folder }}' + folderUid: '{{ .Values.sidecar.dashboards.provider.folderUid }}' {{- end }} type: {{ .Values.sidecar.dashboards.provider.type }} disableDeletion: {{ .Values.sidecar.dashboards.provider.disableDelete }} diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml index a327a7a01e..bdc1cd2404 100644 --- a/charts/grafana/values.yaml +++ b/charts/grafana/values.yaml @@ -963,6 +963,8 @@ sidecar: orgid: 1 # folder in which the dashboards should be imported in grafana folder: '' + # folder UID. will be automatically generated if not specified + folderUid: '' # type of the provider type: file # disableDelete to activate a import-only behaviour