Fix Problem with General Folder and add second Grafana Stage to docker-compose

Author: Patrick-Eichhorn

docker-compose.yaml

@@ -1,15 +1,34 @@
-  grafana:
+version: '3'
+services:
+  # Grafana stage one
+  grafana_stage_one:
     image: grafana/grafana:8.1.2
-    container_name: grafana-vhv
+    container_name: grafana_stage_one
     environment:
-      - GF_PANELS_DISABLE_SANITIZE_HTML=TRUE
       - GF_SECURITY_ADMIN_PASSWORD=demo
       - GF_PATHS_PROVISIONING=/usr/share/grafana/custom/
       - GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS=novatec-dashboardsync-datasource
       - SSH_KNOWN_HOSTS=github.com
       - GF_ALLOWED_ORIGINS="http://localhost:3000"
     volumes:
-      - ${PLUGIN_REPO}:/var/lib/grafana/plugins
-      - ${GIT_SSH_KEY}:/usr/share/grafana/.GF_PANELS_DISABLE_SANITIZE_HTML
+      - ${PLUGIN_REPO}:/var/lib/grafana/plugins/
+      - ${GIT_SSH_KEY}:/usr/share/grafana/.ssh
     ports:
       - 3001:3000
+
+  # Grafana stage two
+  grafana_stage_two:
+    image: grafana/grafana:8.1.2
+    container_name: grafana_stage_two
+    environment:
+      - GF_SECURITY_ADMIN_PASSWORD=demo
+      - GF_PATHS_PROVISIONING=/usr/share/grafana/custom/
+      - GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS=novatec-dashboardsync-datasource
+      - SSH_KNOWN_HOSTS=github.com
+      - GF_ALLOWED_ORIGINS="http://localhost:3000"
+    volumes:
+      - ${PLUGIN_REPO}:/var/lib/grafana/plugins/
+      - ${GIT_SSH_KEY}:/usr/share/grafana/.ssh
+    ports:
+      - 3002:3000
+

pkg/plugin/git_api.go

@@ -154,6 +154,7 @@ func (gitApi GitApi) PullRepo(repository git.Repository) {
 		log.DefaultLogger.Error("worktree error" , "error", err)
 		return
 	} else {
+		log.DefaultLogger.Debug("Pulling from Repo")
 		err := w.Pull(&git.PullOptions{
 			RemoteName: "origin",
 			Auth: gitApi.authenticator,
@@ -186,30 +187,34 @@ func (gitApi GitApi) GetFileContent() map[string]map[string][]byte {
 	fileMap := make(map[string]map[string][]byte)
 
 	for _, dir := range dirMap {
+		// prepare fileMap for dir
+		fileMap[dir] = make(map[string][]byte)
+
 		// read current in memory filesystem to get files
 		files, err := gitApi.inMemoryFileSystem.ReadDir("./" + dir + "/")
 		if err != nil {
-			log.DefaultLogger.Error("inMemoryFileSystem error", "error", err)
+			log.DefaultLogger.Error("inMemoryFileSystem ReadDir error", "error", err)
 			return nil
 		}
 
 		for _, file := range files {
 
+			log.DefaultLogger.Debug("file", "name", file.Name())
+
 			if file.IsDir() {
 				continue
 			}
 
-			src, err := gitApi.inMemoryFileSystem.Open(file.Name())
+			src, err := gitApi.inMemoryFileSystem.Open("./" + dir + "/" + file.Name())
 
 			if err != nil {
-				log.DefaultLogger.Error("inMemoryFileSystem error", "error", err)
+				log.DefaultLogger.Error("inMemoryFileSystem Open error", "error", err)
 				return nil
 			}
 			byteFile, err := ioutil.ReadAll(src)
 			if err != nil {
 				log.DefaultLogger.Error("read error", "error", err)
 			} else {
-				fileMap[dir] = make(map[string][]byte)
 				fileMap[dir][file.Name()] = byteFile
 				src.Close()
 			}

pkg/plugin/grafana_api.go

@@ -51,7 +51,7 @@ func (grafanaApi GrafanaApi) UpdateDashboardObjectByID(dashboard sdk.Board, fold
 func (grafanaApi GrafanaApi) CreateFolder(folderName string) int {
 	folder := sdk.Folder{Title: folderName}
 	folder, err := grafanaApi.grafanaClient.CreateFolder(context.Background(), folder)
-	if err != nil {
+	if err != nil && folderName != "General" {
 		log.DefaultLogger.Error("get folders error", "error", err.Error())
 	}
 	return folder.ID
@@ -61,7 +61,7 @@ func (grafanaApi GrafanaApi) CreateFolder(folderName string) int {
 func (grafanaApi GrafanaApi) GetOrCreateFolderID(folderName string) int {
 	folders, err := grafanaApi.grafanaClient.GetAllFolders(context.Background())
 	if err != nil {
-		log.DefaultLogger.Error("get folders error", "error", err.Error())
+		log.DefaultLogger.Error("get all folders error", "error", err.Error())
 	}
 	for _, folder := range folders {
 		if folder.Title == folderName {
@@ -87,7 +87,7 @@ func (grafanaApi GrafanaApi) CreateDashboardObjects(fileMap map[string]map[strin
 			if err != nil {
 				log.DefaultLogger.Error("set dashboard error", "error", err.Error())
 			}
-			log.DefaultLogger.Info("Dashboard created", "name", dashboardName)
+			log.DefaultLogger.Debug("Dashboard created", "name", dashboardName)
 		}
 	}
 }

pkg/plugin/plugin.go

@@ -44,7 +44,7 @@ func (d *SampleDatasource) Dispose() {
 // datasource configuration page which allows users to verify that
 // a datasource is working as expected.
 func (d *SampleDatasource) CheckHealth(_ context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
-	log.DefaultLogger.Info("CheckHealth called", "request", req)
+	log.DefaultLogger.Debug("Backend called with following request", "request", req)
 
 	uiProperties := make(map[string]string)
 	_ = json.Unmarshal(req.PluginContext.DataSourceInstanceSettings.JSONData, &uiProperties)
@@ -82,12 +82,15 @@ func (d *SampleDatasource) CheckHealth(_ context.Context, req *backend.CheckHeal
 			return nil, err
 		}
 		gitApi.FetchRepo(*repository)
+		gitApi.PullRepo(*repository)
 		fileMap := gitApi.GetFileContent()
 		grafanaApi.CreateDashboardObjects(fileMap)
 		log.DefaultLogger.Info("Dashboards created")
 	}
 
 	if push == "true" {
+		log.DefaultLogger.Info("Push to git repo", "url", pushGitURL)
+
 		gitApi := NewGitApi(pushGitURL, privateKeyFilePath)
 		repository, err := gitApi.CloneRepo()
 		if err != nil {