feat: Harvest grafana import should support nested Grafana folders

Thanks to @IvanZenger for reporting Fixes: #3412
NetApp · Jan 9, 2025 · 51b2dbf · 51b2dbf
1 parent 4832f74
commit 51b2dbf
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/cmd/tools/grafana/grafana.go b/cmd/tools/grafana/grafana.go
@@ -1147,7 +1147,13 @@ func checkVersion(inputVersion string) bool {
 
 func checkFolder(folder *Folder) error {
 
-	result, status, code, err := sendRequestArray(opts, "GET", "/api/folders?limit=1000", nil)
+	q := "/api/folders?limit=1000"
+
+	if folder.parentUID != "" {
+		q += "&parentUid=" + folder.parentUID
+	}
+
+	result, status, code, err := sendRequestArray(opts, "GET", q, nil)
 
 	if err != nil {
 		return err
@@ -1227,11 +1233,11 @@ func createServerFolders(folder *Folder) error {
 			if err := createServerFolder(curFolder); err != nil {
 				return err
 			}
-			folder.name = f
-			folder.id = curFolder.id
 		}
 
 		parentUID = curFolder.uid
+		folder.name = f
+		folder.id = curFolder.id
 	}
 
 	return nil