code refactor

Author: ashritha-singu

README.md

@@ -5,7 +5,7 @@ and dashboards in Grafana using data in Dataset. You may want to use this plugin
 to allow you to visualize Dataset data next to other data sources, for instance
 when you want to monitor many feeds on a single dashboard.
 
-![SystemDashboard](images/SystemDashboard.png)
+![SystemDashboard](https://github.com/scalyr/scalyr-grafana-datasource-plugin/blob/go-rewrite-v2/src/img/SystemDashboard.png)
 
 With the Dataset plugin, you will be able to create and visualize your log-based
 metrics along side all of your other data sources. It's a great way to have a

pkg/plugin/client.go

@@ -101,7 +101,6 @@ func (d *DataSetClient) DoFacetValuesRequest(req FacetQuery) (LRQResult, error)
 	// Repeat ping requests for our query until we get a result with all steps steps complete
 	// TODO: A timeout or some other way of escaping besides an error
 	for stepsComplete < stepsTotal {
-		log.DefaultLogger.Warn(" request", request)
 		resp, err := d.netClient.Do(request)
 		if err != nil {
 			log.DefaultLogger.Warn("error sending request to DataSet", "err", err)

pkg/plugin/lrq_types.go

@@ -28,6 +28,12 @@ const OK = "OK"
 const TIMEOUT = "TIMEOUT"
 const ERROR = "ERROR"
 
+const (
+	PERCENTAGE string = "PERCENTAGE"
+	NUMBER     string = "NUMBER"
+	TIMESTAMP  string = "TIMESTAMP"
+)
+
 type LogOptions struct {
 	Filter    string `json:"filter"`
 	Ascending bool   `json:"ascending"`

pkg/plugin/plugin.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"math"
 	"net/http"
 	"strconv"
 	"strings"
@@ -38,7 +39,6 @@ func NewDataSetDatasource(settings backend.DataSourceInstanceSettings) (instance
 	var unsecure jsonData
 	err := json.Unmarshal(settings.JSONData, &unsecure)
 	if err != nil {
-		log.DefaultLogger.Warn("error marshalling", "err", err)
 		return nil, err
 	}
 	url := unsecure.ScalyrUrl
@@ -117,7 +117,6 @@ func (d *DataSetDatasource) CallResource(ctx context.Context, req *backend.CallR
 		}
 		finalResponse := make([]string, len(facetResultData.Facet.Values))
 		for i, val := range facetResultData.Facet.Values {
-			log.DefaultLogger.Warn("facetResultData", val.Value, val.Value)
 			finalResponse[i] = val.Value
 		}
 		pb := &FacetResponse{Value: finalResponse}
@@ -210,13 +209,10 @@ func displayPlotData(result LRQResult, response backend.DataResponse) backend.Da
 	values := make([]float64, len(resultData.XAxis))
 	for index, value := range resultData.XAxis {
 		values[index] = resultData.Plots[0].Samples[index] // TODO: handle multiple PlotData objects for Breakdown graphs
-		log.DefaultLogger.Warn("value:   ", "value", value)
-		times[index] = time.Unix(value/1000, 0) // TODO: we lose the precision of milliseconds here, is this fine?
-		log.DefaultLogger.Warn("times[index]:   ", "times[index]", times[index])
+		times[index] = time.Unix(value/1000, 0)            // TODO: we lose the precision of milliseconds here, is this fine?
 	}
 
 	// add fields.
-	log.DefaultLogger.Warn("values:  ", "values", values)
 	frame.Fields = append(frame.Fields,
 		data.NewField("time", nil, times),
 		data.NewField("values", nil, values),
@@ -229,97 +225,107 @@ func displayPlotData(result LRQResult, response backend.DataResponse) backend.Da
 
 func displayPQData(result LRQResult, response backend.DataResponse) backend.DataResponse {
 	resultData := TableResultData{}
-
 	err := json.Unmarshal(result.Data, &resultData)
 	if err != nil {
 		return response
 	}
-	if len(resultData.Columns) < 1 {
+	if len(resultData.Values) < 1 {
 		return response
 	}
 	frame := data.NewFrame("response")
-
+	// Iterate over the data to modify the result into dataframe acceptable format
 	for idx, col := range resultData.Columns {
-		switch val := col.Type; {
-		case val == "TIMESTAMP":
-			tmp := make([]time.Time, len(resultData.Values))
-			for j, b := range resultData.Values {
-				timeInInt := int64(b[idx].(float64))
-				tmp[j] = time.Unix(timeInInt/1000000000, 0)
+		switch cellType := col.Type; {
+		case cellType == TIMESTAMP:
+			res := make([]time.Time, len(resultData.Values))
+			for i, val := range resultData.Values {
+				timeInInt := int64(val[idx].(float64))
+				res[i] = time.Unix(timeInInt/1000000000, 0) // convert nanoseconds to Time.time format
 			}
 			frame.Fields = append(frame.Fields,
-				data.NewField(col.Name, nil, tmp),
+				data.NewField(col.Name, nil, res),
 			)
 			break
-		case val == "PERCENTAGE":
-			tmp := make([]string, len(resultData.Values))
-			for j, b := range resultData.Values {
-				tmp[j] = strconv.Itoa(b[idx].(int))
+		case cellType == PERCENTAGE:
+			res := make([]string, len(resultData.Values))
+			for i, val := range resultData.Values {
+				if w, ok := val[idx].(int); ok {
+					res[i] = strconv.FormatInt(int64(w), 10) + "%"
+				}
 			}
 			frame.Fields = append(frame.Fields,
-				data.NewField(col.Name, nil, tmp),
+				data.NewField(col.Name, nil, res),
 			)
 			break
-		case val == "NUMBER" && col.DecimalPlaces > 0:
-			tmp := make([]float64, len(resultData.Values))
-			for j, b := range resultData.Values {
-				switch b[idx].(type) {
+		case cellType == NUMBER && col.DecimalPlaces > 0:
+			res := make([]float64, len(resultData.Values))
+			for i, val := range resultData.Values {
+				switch val[idx].(type) {
 				case float32:
-					tmp[j] = float64(b[idx].(float32))
+					res[i] = float64(val[idx].(float32))
+					break
+				case string:
+					if val[idx] == "Infinity" {
+						res[i] = math.Inf(1)
+					} else if val[idx] == "-Infinity" {
+						res[i] = math.Inf(-1)
+					} else if val[idx] == "NaN" {
+						res[i] = math.NaN()
+					}
 					break
 				default:
-					tmp[j] = b[idx].(float64)
+					res[i] = val[idx].(float64)
 				}
 			}
 			frame.Fields = append(frame.Fields,
-				data.NewField(col.Name, nil, tmp),
+				data.NewField(col.Name, nil, res),
 			)
 			break
-		case val == "NUMBER" && col.DecimalPlaces <= 0:
-			tmp := make([]int64, len(resultData.Values))
-			for j, b := range resultData.Values {
-				switch b[idx].(type) {
+		case cellType == NUMBER && col.DecimalPlaces <= 0:
+			res := make([]int64, len(resultData.Values))
+			for i, val := range resultData.Values {
+				switch val[idx].(type) {
 				case int:
-					tmp[j] = int64(b[idx].(int))
+					res[i] = int64(val[idx].(int))
 					break
 				case int16:
-					tmp[j] = int64(b[idx].(int16))
+					res[i] = int64(val[idx].(int16))
 					break
 				case int32:
-					tmp[j] = int64(b[idx].(int32))
+					res[i] = int64(val[idx].(int32))
 					break
 				case float32:
-					tmp[j] = int64(b[idx].(float32))
+					res[i] = int64(val[idx].(float32))
 					break
 				case float64:
-					tmp[j] = int64(b[idx].(float64))
+					res[i] = int64(val[idx].(float64))
 					break
 				default:
-					tmp[j] = b[idx].(int64)
+					res[i] = val[idx].(int64)
 				}
 			}
 			frame.Fields = append(frame.Fields,
-				data.NewField(col.Name, nil, tmp),
+				data.NewField(col.Name, nil, res),
 			)
 			break
 		default:
-			tmp := make([]string, len(resultData.Values))
-			for j, b := range resultData.Values {
-				switch b[idx].(type) {
+			res := make([]string, len(resultData.Values))
+			for i, val := range resultData.Values {
+				switch val[idx].(type) {
 				case string:
-					tmp[j] = b[idx].(string)
+					res[i] = val[idx].(string)
 					break
 				case bool:
-					if w, ok := b[idx].(bool); ok {
-						tmp[j] = strconv.FormatBool(w)
+					if w, ok := val[idx].(bool); ok {
+						res[i] = strconv.FormatBool(w)
 					}
 					break
 				default:
 
 				}
 			}
 			frame.Fields = append(frame.Fields,
-				data.NewField(col.Name, nil, tmp),
+				data.NewField(col.Name, nil, res),
 			)
 		}
 	}
@@ -332,7 +338,6 @@ func displayPQData(result LRQResult, response backend.DataResponse) backend.Data
 // datasource configuration page which allows users to verify that
 // a datasource is working as expected.
 func (d *DataSetDatasource) CheckHealth(_ context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
-	// currentTime := time.Now().UnixNano()
 	request := FacetRequest{
 		QueryType: "facet",
 		MaxCount:  1,

src/plugin.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/grafana/grafana/master/docs/sources/developers/plugins/plugin.schema.json",
   "type": "datasource",
-  "name": "dataset-datasource",
+  "name": "Dataset",
   "id": "sentinelone-dataset-datasource",
   "metrics": true,
   "backend": true,