From 60611c56eb1c62734cca371bcf9c323dd65d29df Mon Sep 17 00:00:00 2001 From: "grafana-delivery-bot[bot]" <132647405+grafana-delivery-bot[bot]@users.noreply.github.com> Date: Tue, 7 May 2024 22:57:39 +0300 Subject: [PATCH] [v11.0.x] Provisioning: Look up provisioned folders by UID when possible (#87468) Provisioning: Look up provisioned folders by UID when possible (#87465) look up provisioned folders by uid when possible (cherry picked from commit 1884b03511f20068dc60c38d6262120350766792) Co-authored-by: Dan Cech --- pkg/services/provisioning/dashboards/file_reader.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkg/services/provisioning/dashboards/file_reader.go b/pkg/services/provisioning/dashboards/file_reader.go index e80aefe1a9d..9f66aa6cd18 100644 --- a/pkg/services/provisioning/dashboards/file_reader.go +++ b/pkg/services/provisioning/dashboards/file_reader.go @@ -339,10 +339,16 @@ func (fr *FileReader) getOrCreateFolder(ctx context.Context, cfg *config, servic metrics.MFolderIDsServiceCount.WithLabelValues(metrics.Provisioning).Inc() cmd := &dashboards.GetDashboardQuery{ - Title: &folderName, FolderID: util.Pointer(int64(0)), // nolint:staticcheck OrgID: cfg.OrgID, } + + if cfg.FolderUID != "" { + cmd.UID = cfg.FolderUID + } else { + cmd.Title = &folderName + } + result, err := fr.dashboardStore.GetDashboard(ctx, cmd) if err != nil && !errors.Is(err, dashboards.ErrDashboardNotFound) {