(simatec) Grafana Folder added to Restore

Author: simatec

lib/restore/grafana.js

@@ -11,8 +11,10 @@ async function postData(options, log, tmpDir) {
 
         const dashboardDir = path.join(tmpDir, 'dashboards').replace(/\\/g, '/');
         const datasourceDir = path.join(tmpDir, 'datasource').replace(/\\/g, '/');
+        const folderDir = path.join(tmpDir, 'folder').replace(/\\/g, '/');
         const dashBoards = await fsAsync.readdir(dashboardDir);
         const dataSources = await fsAsync.readdir(datasourceDir);
+        const folders = await fsAsync.readdir(folderDir);
 
         const host = options.host ? options.host : options.grafana.host;
         const port = options.port ? options.port : options.grafana.port;
@@ -74,6 +76,52 @@ async function postData(options, log, tmpDir) {
                 log.debug(`Grafana datasource restore not possible: ${err}`);
             }
 
+            // restore folders
+            try {
+                await Promise.all(folders.map(async (folderFile) => {
+                    const folderPath = path.join(folderDir, folderFile).replace(/\\/g, '/');
+                    const folderJson = JSON.parse(await fsAsync.readFile(folderPath, 'utf8'));
+                    const folderTitle = folderJson.title;
+                    const folderUid = folderJson.uid;
+
+                    log.debug(`Try to restore folder: ${folderTitle} (${folderUid})`);
+
+                    await axios({
+                        method: 'POST',
+                        baseURL: `${protocol}://${host}:${port}`,
+                        url: '/api/folders',
+                        data: folderJson,
+                        headers: {
+                            'Content-Type': 'application/json',
+                            // eslint-disable-next-line quote-props
+                            'Authorization': `Bearer ${apiKey}`
+                        },
+                        httpsAgent: new https.Agent({
+                            rejectUnauthorized: signedCertificates,
+                        }),
+                    }).then(result => {
+                        log.debug(`Folder "${folderTitle}" restored: ${JSON.stringify(result.data)}`);
+                    }).catch(err => {
+                        const message = err.response?.data?.message || err.message;
+                        log.debug(`Cannot restore folder "${folderTitle}": ${message}`);
+                    });
+
+                }));
+            } catch (err) {
+                log.debug(`Grafana folder restore not possible: ${err}`);
+            }
+
+            const folderMapPath = path.join(folderDir, 'dashboard_folder_map.json').replace(/\\/g, '/');
+            let dashboardFolderMap = {};
+
+            try {
+                const mapData = await fsAsync.readFile(folderMapPath, 'utf8');
+                dashboardFolderMap = JSON.parse(mapData);
+                log.debug(`Loaded dashboard-folder mapping with ${Object.keys(dashboardFolderMap).length} entries`);
+            } catch (err) {
+                log.debug(`No dashboard-folder mapping found or invalid: ${err}`);
+            }
+
             // post Dashboards
             try {
                 await Promise.all(dashBoards.map(async (dashBoard) => {
@@ -94,7 +142,14 @@ async function postData(options, log, tmpDir) {
                         }),
                     };
 
-                    await axios.post('/api/dashboards/db', dashBoardFile, apiOptions)
+                    let dashJson = JSON.parse(dashBoardFile);
+                    const folderUid = dashboardFolderMap[dashBoardName];
+
+                    if (folderUid && folderUid !== 'general') {
+                        dashJson.folderUid = folderUid;
+                    }
+
+                    await axios.post('/api/dashboards/db', dashJson, apiOptions)
                         .then(result =>
                             log.debug(`dashboard restore for "${dashBoardName}" finish: ${JSON.stringify(result.data)}`))
                         .catch(err =>