Merge pull request #49 from netdata/fix/data-params

Fix group by params.

Author: novykh

package.json

@@ -1,6 +1,6 @@
 {
   "name": "netdatacloud-netdata-datasource",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "description": "netdata datasource plugin",
   "scripts": {
     "build": "webpack -c ./.config/webpack/webpack.config.ts --env production",

src/datasource.ts

@@ -25,7 +25,20 @@ export class DataSource extends DataSourceApi<MyQuery, MyDataSourceOptions> {
     const to = range!.to.valueOf();
 
     const promises = options.targets.map(
-      ({ spaceId, roomId, contextId, nodes, groupBy, method, refId, dimensions, filterBy, filterValue, hide }) => {
+      ({
+        spaceId,
+        roomId,
+        contextId,
+        nodes,
+        groupBy,
+        method,
+        refId,
+        dimensions,
+        filterBy,
+        filterValue,
+        group,
+        hide,
+      }) => {
         if (hide) {
           return null;
         }
@@ -48,6 +61,7 @@ export class DataSource extends DataSourceApi<MyQuery, MyDataSourceOptions> {
           nodes,
           contextId,
           groupBy,
+          group,
           filterBy,
           filterValue,
           method,

src/shared/hooks/useGetChartData.ts

@@ -36,16 +36,16 @@ export const useGetChartData = async ({
 
   switch (groupBy) {
     case 'node':
-      metrics = [{ aggregation: method, groupBy: ['node'], group_by_label: [] }];
+      metrics = [{ aggregation: method, group_by: ['node'], group_by_label: [] }];
       break;
     case 'dimension':
       metrics = [{ group_by: ['dimension'], group_by_label: [], aggregation: method }];
       break;
     case 'instance':
-      metrics = [{ aggregation: method, groupBy: ['instance'], group_by_label: [] }];
+      metrics = [{ aggregation: method, group_by: ['instance'], group_by_label: [] }];
       break;
     default:
-      metrics = [{ aggregation: method, groupBy: ['label'], group_by_label: [groupBy] }];
+      metrics = [{ aggregation: method, group_by: ['label'], group_by_label: [groupBy] }];
       break;
   }