(simatec) Fix Grafana Backup & Restore

Author: simatec

README.md

@@ -63,6 +63,7 @@ When you allow iobroker GmbH to collect diagnostic data, then also your installa
 ## Changelog
 ### **WORK IN PROGRESS**
 * (simatec) Translation updated
+* (simatec) Fix Grafana Backup & Restore
 
 ### 3.3.2 (2025-06-19)
 * (simatec) Base Topic for z2m Remote Backup added

lib/restore/grafana.js

@@ -57,11 +57,16 @@ async function postData(options, log, tmpDir) {
                         baseURL: `${protocol}://${host}:${port}`,
                         url: '/api/datasources',
                         data: dataSourceFile,
-                        headers: { 'Content-Type': 'application/json' },
+                        headers: {
+                            'Content-Type': 'application/json',
+                            Authorization: `Bearer ${apiKey}`
+                        },
+                        /*
                         auth: {
                             username: username,
                             password: pass,
                         },
+                        */
                         httpsAgent: new https.Agent({
                             rejectUnauthorized: signedCertificates,
                         }),
@@ -94,8 +99,7 @@ async function postData(options, log, tmpDir) {
                             data: folderJson,
                             headers: {
                                 'Content-Type': 'application/json',
-                                // eslint-disable-next-line quote-props
-                                'Authorization': `Bearer ${apiKey}`
+                                Authorization: `Bearer ${apiKey}`
                             },
                             httpsAgent: new https.Agent({
                                 rejectUnauthorized: signedCertificates,
@@ -135,8 +139,7 @@ async function postData(options, log, tmpDir) {
                         baseURL: `${protocol}://${host}:${port}`,
                         headers: {
                             'Content-Type': 'application/json',
-                            // eslint-disable-next-line quote-props
-                            'Authorization': `Bearer ${apiKey}`
+                            Authorization: `Bearer ${apiKey}`
                         },
                         httpsAgent: new https.Agent({
                             rejectUnauthorized: signedCertificates,

lib/scripts/36-grafana.js

@@ -42,10 +42,13 @@ async function getData(options, log, dashboardDir, folderDir, datasourceDir, das
                 const dataSourcesRequest = await axios({
                     method: 'get',
                     url: `${options.protocol}://${options.host}:${options.port}/api/datasources`,
+                    headers: { Authorization: `Bearer ${options.apiKey}` },
+                    /*
                     auth: {
                         username: options.username,
                         password: options.pass,
                     },
+                    */
                     responseType: 'json',
                     httpsAgent: new https.Agent({
                         rejectUnauthorized: options.signedCertificates,
@@ -67,8 +70,7 @@ async function getData(options, log, dashboardDir, folderDir, datasourceDir, das
                 const dashBoardsRequest = await axios({
                     method: 'get',
                     url: `${options.protocol}://${options.host}:${options.port}/api/search`,
-                    // eslint-disable-next-line quote-props
-                    headers: { 'Authorization': `Bearer ${options.apiKey}` },
+                    headers: { Authorization: `Bearer ${options.apiKey}` },
                     responseType: 'json',
                     httpsAgent: new https.Agent({
                         rejectUnauthorized: options.signedCertificates,
@@ -94,8 +96,7 @@ async function getData(options, log, dashboardDir, folderDir, datasourceDir, das
                         dashBoardRequest = await axios({
                             method: 'get',
                             url: `${options.protocol}://${options.host}:${options.port}/api/dashboards/uid/${dashBoardData[0]}`,
-                            // eslint-disable-next-line quote-props
-                            headers: { 'Authorization': `Bearer ${options.apiKey}` },
+                            headers: { Authorization: `Bearer ${options.apiKey}` },
                             responseType: 'json',
                             httpsAgent: new https.Agent({
                                 rejectUnauthorized: options.signedCertificates
@@ -155,8 +156,7 @@ async function getData(options, log, dashboardDir, folderDir, datasourceDir, das
                 const foldersRequest = await axios({
                     method: 'get',
                     url: `${options.protocol}://${options.host}:${options.port}/api/folders`,
-                    // eslint-disable-next-line quote-props
-                    headers: { 'Authorization': `Bearer ${options.apiKey}` },
+                    headers: { Authorization: `Bearer ${options.apiKey}` },
                     responseType: 'json',
                     httpsAgent: new https.Agent({
                         rejectUnauthorized: options.signedCertificates,