Added folder logic for push task

Author: Patrick-Eichhorn

pkg/plugin/git_api.go

@@ -110,7 +110,7 @@ func (gitApi GitApi) AddFileWithContent(fileName string, fileContent string) {
 }
 
 // CommitWorktree commits all changes in the filesystem
-func (gitApi GitApi) CommitWorktree(repository git.Repository) {
+func (gitApi GitApi) CommitWorktree(repository git.Repository, tag string) {
 	// get worktree and commit
 	w, err := repository.Worktree()
 	if err != nil {
@@ -121,8 +121,7 @@ func (gitApi GitApi) CommitWorktree(repository git.Repository) {
 		wStatus, _ := w.Status()
 		log.DefaultLogger.Debug("worktree status" , "status", wStatus)
 
-		// TODO get tag from frontend
-		_, err := w.Commit("Dashboards synced with tag " + "<tag>", &git.CommitOptions{
+		_, err := w.Commit("Dashboards synced with tag <" + tag + ">", &git.CommitOptions{
 			Author: (*object2.Signature)(&object.Signature{
 				Name:  "grafana-dashboard-sync-plugin",
 				When:  time.Now(),
@@ -178,7 +177,7 @@ func (gitApi GitApi) GetFileContent() map[string][]byte {
 	fileMap := make(map[string][]byte)
 
 	for _, file := range files {
-		log.DefaultLogger.Info("File name", "name", file.Name())
+		log.DefaultLogger.Debug("File name", "name", file.Name())
 		if file.IsDir() {
 			continue
 		}

pkg/plugin/grafana_api.go

@@ -39,9 +39,10 @@ func (grafanaApi GrafanaApi) GetDashboardObjectByID(uid string) (sdk.Board, sdk.
 }
 
 // UpdateDashboardObjectByID update the Dashboard with the given dashboard object
-func (grafanaApi GrafanaApi) UpdateDashboardObjectByID(dashboard sdk.Board) (sdk.StatusMessage, error) {
+func (grafanaApi GrafanaApi) UpdateDashboardObjectByID(dashboard sdk.Board, folderId int) (sdk.StatusMessage, error) {
 	statusMessage, err := grafanaApi.grafanaClient.SetDashboard(context.Background() ,dashboard, sdk.SetDashboardParams{
 			Overwrite: false,
+			FolderID: folderId,
 		})
 	return statusMessage, err
 }

pkg/plugin/plugin.go

@@ -94,23 +94,30 @@ func (d *SampleDatasource) CheckHealth(_ context.Context, req *backend.CheckHeal
 		}
 		for _, dashboard := range dashboards {
 			// get raw Json
-			dashboardJson, _, err := grafanaApi.GetRawDashboardByID(dashboard.UID)
+			dashboardJson, boardProperties, err := grafanaApi.GetRawDashboardByID(dashboard.UID)
 			if err != nil {
 				log.DefaultLogger.Error("get raw dashboard", "error", err.Error())
 			}
+
+			// get folder name and id, needed for update processes and git folder structure
+			folderName := boardProperties.FolderTitle
+			folderId := boardProperties.FolderID
+
 			// get dashboard Object TODO: Verify if raw Json manipulation is faster
 			dashboardObject, _, err := grafanaApi.GetDashboardObjectByID(dashboard.UID)
 			if err != nil {
 				log.DefaultLogger.Error("get dashboard", "error", err.Error())
 			}
+
 			// delete Tag from dashboard
 			dashboardWithDeletedTag := grafanaApi.DeleteTagFromDashboardObjectByID(dashboardObject, dashboardTag)
+
 			// update dashboard with deleted Tag
-			_, err = grafanaApi.UpdateDashboardObjectByID(dashboardWithDeletedTag)
+			_, err = grafanaApi.UpdateDashboardObjectByID(dashboardWithDeletedTag, folderId)
 			if err != nil {
 				log.DefaultLogger.Error("update dashboard", "error", err.Error())
 			}
-			log.DefaultLogger.Info("Dashboard preparation successfully ")
+			log.DefaultLogger.Debug("Dashboard preparation successfully ")
 
 			// Todo: If dashboard found, else skip git workflow
 			gitApi := NewGitApi(pushGitURL, privateKeyFilePath)
@@ -119,9 +126,11 @@ func (d *SampleDatasource) CheckHealth(_ context.Context, req *backend.CheckHeal
 				return nil, err
 			}
 			gitApi.FetchRepo(*repository)
-			gitApi.AddFileWithContent(dashboardObject.Title+".json", string(dashboardJson))
-			gitApi.CommitWorktree(*repository)
+			gitApi.AddFileWithContent(folderName+"/"+dashboardObject.Title+".json", string(dashboardJson))
+			gitApi.CommitWorktree(*repository, dashboardTag)
 			gitApi.PushRepo(*repository)
+
+			log.DefaultLogger.Info("Dashboard pushed successfully ")
 		}
 	}