prepare for plugin signing

Author: witalisoft

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
-## 1.0.0 (Unreleased)
+## 2.0.0
+
+The plugin is compliant with Grafana Signing Requirements.
+
+## 1.0.12
 
 Initial release.

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "netdata-datasource",
-  "version": "1.0.12",
+  "name": "netdatacloud-netdata-datasource",
+  "version": "2.0.0",
   "description": "netdata datasource plugin",
   "scripts": {
     "build": "grafana-toolkit plugin:build",
@@ -13,9 +13,9 @@
   "author": "netdata",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@grafana/data": "latest",
-    "@grafana/toolkit": "latest",
-    "@grafana/ui": "latest",
+    "@grafana/data": "8.5.5",
+    "@grafana/toolkit": "8.5.5",
+    "@grafana/ui": "8.5.5",
     "@testing-library/jest-dom": "5.4.0",
     "@testing-library/react": "^10.0.2",
     "@testing-library/react-hooks": "^8.0.1",

src/QueryEditor.tsx

@@ -154,7 +154,7 @@ const QueryEditor: React.FC<Props> = ({ datasource, query, onChange, onRunQuery
     setSelectedAggreagations(Aggreagations[0]);
 
     fetchRooms(v.value || '');
-    onChange({ spaceId: v.value } as MyQuery);
+    onChange({ ...query, spaceId: v.value });
     onRunQuery();
   };
 
@@ -173,7 +173,7 @@ const QueryEditor: React.FC<Props> = ({ datasource, query, onChange, onRunQuery
 
     fetchContexts(selectedSpace?.value || '', v.value || '');
     fetchNodes(selectedSpace?.value || '', v.value || '');
-    onChange({ spaceId: spaceId, roomId: v.value } as MyQuery);
+    onChange({ ...query, spaceId: spaceId, roomId: v.value });
     onRunQuery();
   };
 
@@ -190,7 +190,6 @@ const QueryEditor: React.FC<Props> = ({ datasource, query, onChange, onRunQuery
 
     fetchDimensions({ spaceId, roomId, contextId: v.value, nodeIDs: selectedNodes?.map((n: any) => n.value) || [] });
     onChange({ ...query, contextId: v.value });
-    onChange({ spaceId, roomId, contextId: v.value } as MyQuery);
     onRunQuery();
   };
 
@@ -207,7 +206,7 @@ const QueryEditor: React.FC<Props> = ({ datasource, query, onChange, onRunQuery
 
     fetchDimensions({ spaceId, roomId, contextId, nodeIDs: data });
     setSelectedNodes(data);
-    onChange({ spaceId, roomId, contextId, nodes: data } as MyQuery);
+    onChange({ ...query, spaceId, roomId, contextId, nodes: data } as MyQuery);
     onRunQuery();
   };
 

src/datasource.ts

@@ -7,8 +7,10 @@ import {
   FieldType,
 } from '@grafana/data';
 import { useGetChartData } from 'shared/hooks/useGetChartData';
+import { Get } from 'shared/utils/request';
 import { MyQuery, MyDataSourceOptions } from './shared/types';
 import PubSub from 'pubsub-js';
+
 export class DataSource extends DataSourceApi<MyQuery, MyDataSourceOptions> {
   baseUrl: string;
 
@@ -80,10 +82,32 @@ export class DataSource extends DataSourceApi<MyQuery, MyDataSourceOptions> {
   }
 
   async testDatasource() {
-    // Implement a health check for your data source.
-    return {
-      status: 'success',
-      message: 'Success',
-    };
+    const defaultErrorMessage = 'Cannot connect to API';
+
+    try {
+      const response = await Get({ path: '/v2/accounts/me', baseUrl: this.baseUrl });
+
+      if (response.status === 200 && response?.data?.id !== '00000000-0000-0000-0000-000000000000') {
+        return {
+          status: 'success',
+          message: 'Success',
+        };
+      } else {
+        return {
+          status: 'error',
+          message:
+            response.status === 401 || response?.data?.id !== '00000000-0000-0000-0000-000000000000'
+              ? 'Invalid token. Please validate the token defined on the datasource.'
+              : response.statusText
+              ? response.statusText
+              : defaultErrorMessage,
+        };
+      }
+    } catch (err) {
+      return {
+        status: 'error',
+        message: defaultErrorMessage,
+      };
+    }
   }
 }

src/img/screenshot.png

@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/grafana/grafana/master/docs/sources/developers/plugins/plugin.schema.json",
   "name": "netdata",
   "type": "datasource",
-  "id": "netdata-datasource",
+  "id": "netdatacloud-netdata-datasource",
   "metrics": true,
   "info": {
     "description": "netdata datasource plugin",
@@ -25,7 +25,12 @@
         "url": "https://github.com/grafana/grafana-starter-datasource/blob/master/LICENSE"
       }
     ],
-    "screenshots": [],
+    "screenshots": [
+      {
+        "name": "main",
+        "path": "img/screenshot.png"
+      }
+    ],
     "version": "%VERSION%",
     "updated": "%TODAY%"
   },

src/plugin.json

@@ -1098,7 +1098,7 @@
   resolved "https://registry.yarnpkg.com/@grafana/aws-sdk/-/aws-sdk-0.0.35.tgz#ef1a1294decdb859f04f170f33cf45277703bb87"
   integrity sha512-EUi4hF0NQ7c9+XfUvRfrCkxPVkzRFv4VdSMlUOyyg7FynKq4Do9HF+4gR30Krt0ct6zmloPIx2AAIHL5898g7A==
 
-"@grafana/data@8.5.5", "@grafana/data@latest":
+"@grafana/data@8.5.5":
   version "8.5.5"
   resolved "https://registry.yarnpkg.com/@grafana/data/-/data-8.5.5.tgz#64f72bc81a02ee32faf07e574aaacf828b3fa519"
   integrity sha512-K/TZQ5DCT8lTDCuMiVaJqUpdiziUJK3ggHGcyB0RZV5fneq8VpiySIuZyii2/b2tBNKz0cRVS+LoI3DerlsH+g==
@@ -1194,7 +1194,7 @@
     tiny-invariant "^1.0.1"
     tiny-warning "^0.0.3"
 
-"@grafana/toolkit@latest":
+"@grafana/toolkit@8.5.5":
   version "8.5.5"
   resolved "https://registry.yarnpkg.com/@grafana/toolkit/-/toolkit-8.5.5.tgz#2204bd18de0d05f72a19ada13aae8594a16657a1"
   integrity sha512-6N9lN+S1OXH3O4I73PScH2RmW1l/gvzq3tSFZPAyWHTz/QlZDbEGuS1yMMsmmFfr4FE9iOiGqT7Emp9uvVngKg==
@@ -1282,7 +1282,7 @@
   resolved "https://registry.yarnpkg.com/@grafana/tsconfig/-/tsconfig-1.2.0-rc1.tgz#10973c978ec95b0ea637511254b5f478bce04de7"
   integrity sha512-+SgQeBQ1pT6D/E3/dEdADqTrlgdIGuexUZ8EU+8KxQFKUeFeU7/3z/ayI2q/wpJ/Kr6WxBBNlrST6aOKia19Ag==
 
-"@grafana/ui@8.5.5", "@grafana/ui@latest":
+"@grafana/ui@8.5.5":
   version "8.5.5"
   resolved "https://registry.yarnpkg.com/@grafana/ui/-/ui-8.5.5.tgz#4382234529b6c01035b084b01f949134562bc0ef"
   integrity sha512-z79v79B8i6z5cVN7BvZIWQZIEbiyxGoCYl4CM+fSx79+rN2+8hbwzCW7IZttL+Auak0Y7fKqSvWXzwvZ21KnsQ==