Merge pull request #116 from scalyr/DSET-3658-cross-team-support

DSET-3658 Cross-team query support

Author: dlobue

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.1.2
+
+- Cross-team query support.
+
 ## 3.1.1
 
 - Bugfix around use of query options (max data points & interval)

README.md

@@ -116,6 +116,16 @@ dashboard using Scalyr data.
 
      ![PowerQuery](https://raw.githubusercontent.com/scalyr/scalyr-grafana-datasource-plugin/master/src/img/PowerQuery.png)
 
+7. **Cross Team Search** - The AccountEmails field is used to specify which
+   teams the query should be run against. Works the same as
+   [Cross Team Search](https://app.scalyr.com/help/graphs#crossTeam) in the
+   DataSet app. More information on teams can be found
+   [here](https://app.scalyr.com/help/teams). Note that the owner of the Log
+   Read API key used to setup the DataSet Datasource must be a member of all
+   teams being queried.
+
+     ![CrossTeamQuery](https://raw.githubusercontent.com/scalyr/scalyr-grafana-datasource-plugin/master/src/img/CrossTeamQuery.png)
+
 You’ve successfully installed, configured and created a graph in Grafana using
 Dataset data!
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sentinelone-dataset-datasource",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "Scalyr Observability Platform",
   "scripts": {
     "build": "webpack -c ./.config/webpack/webpack.config.ts --env production",

pkg/plugin/client.go

@@ -57,7 +57,7 @@ func NewDataSetClient(dataSetUrl string, apiKey string) DataSetClient {
 }
 
 func (d *dataSetClient) newRequest(method, url string, body io.Reader) (*http.Request, error) {
-	const VERSION = "3.1.1"
+	const VERSION = "3.1.2"
 
 	if err := d.rateLimiter.Wait(context.Background()); err != nil {
 		log.DefaultLogger.Error("error applying rate limiter", "err", err)

pkg/plugin/plugin.go

@@ -57,11 +57,12 @@ func (d *DataSetDatasource) QueryData(ctx context.Context, req *backend.QueryDat
 }
 
 type queryModel struct {
-	Expression          string  `json:"expression"`
-	QueryType           string  `json:"queryType"`
-	Format              string  `json:"format"`
-	BreakDownFacetValue *string `json:"breakDownFacetValue"`
-	Label               *string `json:"label"`
+	Expression          string   `json:"expression"`
+	QueryType           string   `json:"queryType"`
+	Format              string   `json:"format"`
+	BreakDownFacetValue *string  `json:"breakDownFacetValue"`
+	Label               *string  `json:"label"`
+	AccountEmails       []string `json:"accountEmails"`
 }
 
 func (d *DataSetDatasource) query(ctx context.Context, query backend.DataQuery) backend.DataResponse {
@@ -117,6 +118,10 @@ func (d *DataSetDatasource) query(ctx context.Context, query backend.DataQuery)
 		}
 	}
 
+	if qm.AccountEmails != nil && len(qm.AccountEmails) > 0 {
+		request.AccountEmails = qm.AccountEmails
+	}
+
 	var result *LRQResult
 	result, response.Error = d.dataSetClient.DoLRQRequest(ctx, request)
 	if response.Error != nil {

src/QueryEditor.tsx

@@ -1,6 +1,6 @@
 import { defaults } from 'lodash';
-import React, { ChangeEvent, ReactElement } from 'react';
-import { ActionMeta, InlineField, InlineFieldRow, Input, Select, TextArea } from '@grafana/ui';
+import React, { ChangeEvent, ReactElement, useState } from 'react';
+import { ActionMeta, InlineField, InlineFieldRow, Input, Select, MultiSelect, TextArea } from '@grafana/ui';
 import { QueryEditorProps, SelectableValue } from '@grafana/data';
 import { DataSource } from './datasource';
 import { defaultQuery, MyDataSourceOptions, MyQuery, queryTypes } from './types';
@@ -12,6 +12,8 @@ export function QueryEditor(props: Props): ReactElement {
   const { datasource } = props;
   const { loading, topFacets } = useFacetsQuery(datasource);
   const query = defaults(props.query, defaultQuery);
+  const [ accountEmails, setAccountEmails ] = useState<Array<SelectableValue<string>>>(
+    (query.accountEmails || []).map(v => ({label: v, value: v})));
 
   const onExpressionChange = (event: ChangeEvent<HTMLInputElement>) => {
     const { onChange, query } = props;
@@ -37,6 +39,13 @@ export function QueryEditor(props: Props): ReactElement {
     onChange({ ...query, label: event.target.value });
   };
 
+  const onAccountEmailsChange = (values: Array<SelectableValue<string>>, actionMeta: ActionMeta) => {
+    const { onChange, query, onRunQuery } = props;
+    setAccountEmails(values);
+    onChange({ ...query, accountEmails: values.length > 0 ? values.map((v) => {return v.value;}) : null });
+    onRunQuery();
+  };
+
   const onBlur = async () => {
     const { onRunQuery } = props;
     onRunQuery();
@@ -65,7 +74,7 @@ export function QueryEditor(props: Props): ReactElement {
         </InlineField>
       </InlineFieldRow>
       <InlineFieldRow>
-        {query.queryType === 'Standard' && topFacets.length > 0 && (
+        {query.queryType === 'Standard' && (
           <InlineField label="Breakdown" grow>
             <Select
               options={topFacets}
@@ -85,6 +94,16 @@ export function QueryEditor(props: Props): ReactElement {
           <Input type="text" value={query.label || ''} onChange={onLabelChange} />
         </InlineField>
       </InlineFieldRow>
+      <InlineFieldRow>
+        <InlineField label="AccountEmails" grow>
+          <MultiSelect
+            value={accountEmails}
+            allowCustomValue
+            isClearable
+            onChange={onAccountEmailsChange}
+          />
+        </InlineField>
+      </InlineFieldRow>
     </>
   );
 }

src/img/CrossTeamQuery.png

@@ -43,7 +43,7 @@
         "path": "img/DatasetConfig.png"
       }
     ],
-    "version": "3.1.1",
+    "version": "3.1.2",
     "updated": "2023-03-31"
   },
   "dependencies": {

src/plugin.json

@@ -5,6 +5,7 @@ export interface MyQuery extends DataQuery {
   queryType: any;
   breakDownFacetValue: string | undefined | null;
   label: string | undefined | null;
+  accountEmails: Array<string | undefined> | undefined | null;
 }
 
 export const defaultQuery: Partial<MyQuery> = {