Merge pull request #107 from scalyr/gh-105

Gh 105

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - Update yarn dependency @grafana/toolkit to 8.5.0
 - Set a custom user-agent to support tracking
+- Added user-specified label support (Issue #105)
 
 ## 3.0.4
 

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "sentinelone-scalyr-grafana-datasource-plugin",
+  "name": "sentinelone-dataset-datasource",
   "version": "3.0.5",
   "description": "Scalyr Observability Platform",
   "scripts": {

pkg/plugin/plugin.go

@@ -74,6 +74,7 @@ type queryModel struct {
 	QueryType           string  `json:"queryType"`
 	Format              string  `json:"format"`
 	BreakDownFacetValue *string `json:"breakDownFacetValue"`
+	Label               *string `json:"label"`
 }
 
 func (d *DataSetDatasource) query(_ context.Context, pCtx backend.PluginContext, query backend.DataQuery) backend.DataResponse {
@@ -137,11 +138,11 @@ func (d *DataSetDatasource) query(_ context.Context, pCtx backend.PluginContext,
 	if qm.QueryType == "Power Query" {
 		return displayPQData(result, response)
 	} else {
-		return displayPlotData(result, response)
+		return displayPlotData(qm.Label, result, response)
 	}
 }
 
-func displayPlotData(result *LRQResult, response backend.DataResponse) backend.DataResponse {
+func displayPlotData(label *string, result *LRQResult, response backend.DataResponse) backend.DataResponse {
 	resultData := PlotResultData{}
 
 	response.Error = json.Unmarshal(result.Data, &resultData)
@@ -161,9 +162,18 @@ func displayPlotData(result *LRQResult, response backend.DataResponse) backend.D
 				data.NewField("time", nil, make([]time.Time, len(resultData.XAxis))),
 			)
 		}
+
+		var panelLabel string;
+		if plot.Label != "" { // Breakdown facet
+			panelLabel = plot.Label;
+		} else if label != nil && *label != "" { // User-specified label
+			panelLabel = *label;
+		}
+
 		frame.Fields = append(frame.Fields,
-			data.NewField("", map[string]string{"app": plot.Label}, make([]float64, len(resultData.XAxis))),
+			data.NewField("", map[string]string{"app": panelLabel}, make([]float64, len(resultData.XAxis))),
 		)
+
 		for pIdx, point := range plot.Samples {
 			if i == 0 {
 				sec := resultData.XAxis[pIdx] / 1000

src/QueryEditor.tsx

@@ -32,6 +32,11 @@ export function QueryEditor(props: Props): ReactElement {
     onRunQuery();
   };
 
+  const onLabelChange = (event: ChangeEvent<HTMLInputElement>) => {
+    const { onChange, query } = props;
+    onChange({ ...query, label: event.target.value });
+  };
+
   const onBlur = async () => {
     const { onRunQuery } = props;
     onRunQuery();
@@ -75,6 +80,11 @@ export function QueryEditor(props: Props): ReactElement {
           </InlineField>
         )}
       </InlineFieldRow>
+      <InlineFieldRow>
+        <InlineField label="Label" grow>
+          <Input type="text" value={query.label || ''} onChange={onLabelChange} />
+        </InlineField>
+      </InlineFieldRow>
     </>
   );
 }

src/plugin.json

@@ -44,7 +44,7 @@
       }
     ],
     "version": "3.0.5",
-    "updated": "2022-06-07"
+    "updated": "2022-08-02"
   },
   "dependencies": {
     "grafanaDependency": ">=8.2.0",

src/types.ts

@@ -4,12 +4,14 @@ export interface MyQuery extends DataQuery {
   expression: string;
   queryType: any;
   breakDownFacetValue: string | undefined | null;
+  label: string | undefined | null;
 }
 
 export const defaultQuery: Partial<MyQuery> = {
   expression: '',
   queryType: 'Standard',
   breakDownFacetValue: '',
+  label: '',
 };
 
 export const queryTypes = [