Merge pull request #28 from netdata/agent-v2-update

Agent v2 updates

Author: witalisoft

.github/workflows/ci.yml

@@ -17,16 +17,16 @@ on:
         default: 'false'
         type: choice
         options:
-        - 'true'
-        - 'false'
+          - 'true'
+          - 'false'
       ENV:
         required: true
         default: 'testing'
         type: choice
         options:
-        - testing
-        - staging
-        - production
+          - testing
+          - staging
+          - production
 
 env:
   BRANCH: ${{ github.event.inputs.BRANCH || github.ref }}
@@ -44,7 +44,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/[email protected]
         with:
-          node-version: "14.x"
+          node-version: '14.x'
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
@@ -84,7 +84,7 @@ jobs:
           zip "netdata-datasource-${{ steps.build_environment.outputs.BUILD_VERSION }}.zip" netdata-datasource -r
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: netdata-datasource-${{ steps.build_environment.outputs.BUILD_VERSION }}.zip
           path: ./netdata-datasource-${{ steps.build_environment.outputs.BUILD_VERSION }}.zip

.github/workflows/release.yml

@@ -3,7 +3,7 @@ name: Release
 on:
   push:
     tags:
-      - "v*.*.*"
+      - 'v*.*.*'
 
 jobs:
   release:
@@ -17,7 +17,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/[email protected]
         with:
-          node-version: "14.x"
+          node-version: '14.x'
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
@@ -64,7 +64,7 @@ jobs:
           export GRAFANA_PLUGIN_TYPE=$(cat dist/plugin.json | jq -r .type)
           export GRAFANA_PLUGIN_ARTIFACT=${GRAFANA_PLUGIN_ID}-${GRAFANA_PLUGIN_VERSION}.zip
           export GRAFANA_PLUGIN_ARTIFACT_CHECKSUM=${GRAFANA_PLUGIN_ARTIFACT}.md5
-          
+
           echo "plugin-id=${GRAFANA_PLUGIN_ID}" >> $GITHUB_OUTPUT
           echo "plugin-version=${GRAFANA_PLUGIN_VERSION}" >> $GITHUB_OUTPUT
           echo "plugin-type=${GRAFANA_PLUGIN_TYPE}" >> $GITHUB_OUTPUT
@@ -91,7 +91,7 @@ jobs:
           echo "checksum=$(cat './${{ steps.metadata.outputs.archive-checksum }}' | cut -d' ' -f1)" >> $GITHUB_OUTPUT
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.metadata.outputs.archive }}
           path: ./${{ steps.metadata.outputs.archive }}

.prettierrc.js

@@ -1,3 +1,3 @@
 module.exports = {
-  ...require("./node_modules/@grafana/toolkit/src/config/prettier.plugin.config.json"),
+  ...require('./node_modules/@grafana/toolkit/src/config/prettier.plugin.config.json'),
 };

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright {yyyy} {name of copyright owner}
+   Copyright 2025 Netdata
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "netdatacloud-netdata-datasource",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "description": "netdata datasource plugin",
   "scripts": {
     "build": "grafana-toolkit plugin:build",

src/QueryEditor.tsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useState } from 'react';
 import { Input, LegacyForms, Select } from '@grafana/ui';
 import { QueryEditorProps, SelectableValue } from '@grafana/data';
 import { DataSource } from './datasource';
@@ -9,16 +9,21 @@ import { useFetchRooms } from 'shared/hooks/useFetchRooms';
 import { useFetchContexts } from 'shared/hooks/useFetchContexts';
 import { useFetchNodes } from 'shared/hooks/useFetchNodes';
 import { Aggreagations, GroupByList, Methods } from 'shared/constants';
-import { useFetchDimensions } from 'shared/hooks/useFetchDimensions';
 import { Dropdown } from 'shared/types/dropdown.interface';
+import { getDimensions, getFilters, getGroupingByList, defaultFilter } from 'shared/utils/transformations';
 import PubSub from 'pubsub-js';
 
 type Props = QueryEditorProps<DataSource, MyQuery, MyDataSourceOptions>;
 
 const { FormField } = LegacyForms;
 
-const QueryEditor: React.FC<Props> = ({ datasource, query, onChange, onRunQuery }) => {
+const QueryEditor: React.FC<Props> = ({ datasource, query, range, onChange, onRunQuery }) => {
   const { baseUrl } = datasource;
+  const from = range!.from.valueOf();
+  const to = range!.to.valueOf();
+  const after = Math.floor(from / 1000);
+  const before = Math.floor(to / 1000);
+
   const [selectedSpace, setSelectedSpace] = React.useState<Dropdown>();
   const [selectedRoom, setSelectedRoom] = React.useState<Dropdown>();
   const [selectedFilter, setSelectedFilter] = React.useState<Dropdown>();
@@ -42,16 +47,26 @@ const QueryEditor: React.FC<Props> = ({ datasource, query, onChange, onRunQuery
   const { rooms, fetchRooms } = useFetchRooms(baseUrl);
   const { nodes, fetchNodes } = useFetchNodes(baseUrl);
   const { contexts, fetchContexts } = useFetchContexts(baseUrl);
-  const { allDimensions, groupingByList, filters, units, fetchDimensions } = useFetchDimensions(baseUrl);
+  const [allDimensions, setAllDimensions] = useState([]);
+  const [units, setUnits] = useState('');
+  const [filters, setFilters] = useState<any>(defaultFilter);
+  const [groupingByList, setGroupingByList] = useState<Dropdown[]>(GroupByList);
 
   const filterList = React.useMemo(() => Object.keys(filters).map((s) => ({ label: s, value: s })), [filters]);
   const nodeList = React.useMemo(() => nodes?.map((c: any) => ({ label: c.name, value: c.id })), [nodes]);
 
   const { spaceId, roomId, nodes: allNodes, dimensions, groupBy, contextId, filterBy, filterValue } = query;
 
   const mySubscriber = (msg: any, data: any) => {
-    setTotalNodes(data.data.nodes.length);
-    setTotalInstances(data.data.nodes.reduce((acc: number, node: any) => acc + node.chartIDs.length, 0));
+    const { summary, view } = data?.data || {};
+    const { nodes = [], instances = [], labels = [] } = summary || {};
+    const { dimensions, units } = view || {};
+    setFilters(getFilters(labels));
+    setGroupingByList(getGroupingByList(labels));
+    setAllDimensions(getDimensions(dimensions));
+    setUnits(units);
+    setTotalNodes(nodes.length);
+    setTotalInstances(instances.length);
   };
 
   const isGroupFunctionAvailable = React.useCallback(() => {
@@ -88,9 +103,9 @@ const QueryEditor: React.FC<Props> = ({ datasource, query, onChange, onRunQuery
       const room = rooms.find((r) => r.value === roomId);
       setSelectedRoom({ label: room?.label, value: room?.value });
       fetchNodes(spaceId || '', roomId);
-      fetchContexts(spaceId || '', roomId);
+      fetchContexts(spaceId || '', roomId, after, before);
     }
-  }, [roomId, rooms, fetchContexts, fetchNodes, spaceId]);
+  }, [roomId, rooms, fetchContexts, fetchNodes, spaceId, after, before]);
 
   React.useEffect(() => {
     // eslint-disable-line
@@ -115,8 +130,6 @@ const QueryEditor: React.FC<Props> = ({ datasource, query, onChange, onRunQuery
           filteredNodes.push({ label: currentNode?.name, value: currentNode?.id });
         });
       }
-
-      fetchDimensions({ spaceId, roomId, contextId, nodeIDs: filteredNodes.map((n: any) => n.value) });
     }
   }, [contextId]); // eslint-disable-line
 
@@ -171,7 +184,7 @@ const QueryEditor: React.FC<Props> = ({ datasource, query, onChange, onRunQuery
     setSelectedMethod(Methods[0]);
     setSelectedAggregations(Aggreagations[0]);
 
-    fetchContexts(selectedSpace?.value || '', v.value || '');
+    fetchContexts(selectedSpace?.value || '', v.value || '', after, before);
     fetchNodes(selectedSpace?.value || '', v.value || '');
     onChange({ ...query, spaceId: spaceId, roomId: v.value });
     onRunQuery();
@@ -188,7 +201,6 @@ const QueryEditor: React.FC<Props> = ({ datasource, query, onChange, onRunQuery
     setSelectedMethod(Methods[0]);
     setSelectedAggregations(Aggreagations[0]);
 
-    fetchDimensions({ spaceId, roomId, contextId: v.value, nodeIDs: selectedNodes?.map((n: any) => n.value) || [] });
     onChange({ ...query, contextId: v.value });
     onRunQuery();
   };
@@ -204,7 +216,6 @@ const QueryEditor: React.FC<Props> = ({ datasource, query, onChange, onRunQuery
     setSelectedMethod(Methods[0]);
     setSelectedAggregations(Aggreagations[0]);
 
-    fetchDimensions({ spaceId, roomId, contextId, nodeIDs: data });
     setSelectedNodes(data);
     onChange({ ...query, spaceId, roomId, contextId, nodes: data } as MyQuery);
     onRunQuery();
@@ -225,13 +236,13 @@ const QueryEditor: React.FC<Props> = ({ datasource, query, onChange, onRunQuery
 
   const onFilterByChange = (v: SelectableValue<string>) => {
     setSelectedFilter(v);
+    setSelectedFilterValue({});
 
     if (v.value === 'No filter') {
-      setSelectedFilterValue({});
       onChange({ ...query, filterBy: undefined, filterValue: undefined });
       onRunQuery();
     } else {
-      setFilterByValues(filters[v?.value || ''].map((v) => ({ label: v, value: v })));
+      setFilterByValues(filters[v?.value || ''].map((v: string) => ({ label: v, value: v })));
     }
   };
 

src/datasource.ts

@@ -61,16 +61,19 @@ export class DataSource extends DataSourceApi<MyQuery, MyDataSourceOptions> {
             const frame = new MutableDataFrame({
               refId,
               fields: response.data.result.labels.map((id: string, i: number) => {
-                const node = response.data.nodes.find((n: any) => n.id === id);
+                const node = response.data.summary.nodes.find((n: any) => n.mg === id);
                 return {
-                  name: node?.name || id,
+                  name: node?.nm || id,
                   type: i === 0 ? FieldType.time : FieldType.number,
                 };
               }),
             });
 
+            const valueIndex = response.data.result.point.value;
+
             response.data.result.data.forEach((point: any) => {
-              frame.appendRow([...point]);
+              const [timestamp, ...rest] = point;
+              frame.appendRow([timestamp, ...rest.map((r: any[]) => r[valueIndex])]);
             });
 
             return frame;

src/shared/hooks/useFetchContexts.test.ts

@@ -15,7 +15,7 @@ describe('useFetchContexts', () => {
 
     const { result, waitFor } = renderHook(() => hooks.useFetchContexts(baseUrl));
 
-    await result.current.fetchContexts('spaceId', 'roomId');
+    await result.current.fetchContexts('spaceId', 'roomId', -900, 0);
 
     await waitFor(() => result.current.contexts.length > 0);
 

src/shared/hooks/useFetchContexts.ts

@@ -1,22 +1,40 @@
 import { Dropdown } from './../types/dropdown.interface';
 import React from 'react';
-import { Get } from 'shared/utils/request';
+import { Post } from 'shared/utils/request';
 
-export const getContexts = async (spaceId: string, roomId: string, baseUrl: string) => {
-  const response = await Get({ path: `/v2/spaces/${spaceId}/rooms/${roomId}/contexts`, baseUrl });
-  return response?.data?.results as string[];
+export const getContexts = async (spaceId: string, roomId: string, after: number, before: number, baseUrl: string) => {
+  const response = await Post({
+    path: `/v3/spaces/${spaceId}/rooms/${roomId}/contexts`,
+    baseUrl,
+    data: {
+      scope: {
+        contexts: ['*'],
+        nodes: [],
+      },
+      selectors: {
+        contexts: [],
+        nodes: [],
+      },
+      window: {
+        after,
+        before,
+      },
+    },
+  });
+  const { contexts = {} } = response?.data || {};
+  return Object.keys(contexts) as string[];
 };
 
 export const useFetchContexts = (baseUrl: string) => {
   const [isError, setIsError] = React.useState(false);
   const [contexts, setContexts] = React.useState<Dropdown[]>([]);
 
   const fetchContexts = React.useCallback(
-    async (spaceId: string, roomId: string) => {
+    async (spaceId: string, roomId: string, after: number, before: number) => {
       setIsError(false);
 
       try {
-        const result = await getContexts(spaceId, roomId, baseUrl);
+        const result = await getContexts(spaceId, roomId, after, before, baseUrl);
         setContexts(result.map((c) => ({ label: c, value: c })));
       } catch (error) {
         setIsError(true);