From c8ec3a345c1c429ed749d7e6b6a4adb097230058 Mon Sep 17 00:00:00 2001 From: Erik Sundell Date: Mon, 10 Sep 2018 11:31:53 +0200 Subject: [PATCH] Stackdriver: Parse datapoints correctly --- pkg/tsdb/stackdriver/stackdriver.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkg/tsdb/stackdriver/stackdriver.go b/pkg/tsdb/stackdriver/stackdriver.go index e0a579d4d11..8a32b0b90b7 100644 --- a/pkg/tsdb/stackdriver/stackdriver.go +++ b/pkg/tsdb/stackdriver/stackdriver.go @@ -15,6 +15,7 @@ import ( "github.com/grafana/grafana/pkg/api/pluginproxy" "github.com/grafana/grafana/pkg/cmd/grafana-cli/logger" + "github.com/grafana/grafana/pkg/components/null" "github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/setting" @@ -103,13 +104,17 @@ func (e *StackdriverExecutor) Query(ctx context.Context, dsInfo *models.DataSour queryRes := tsdb.NewQueryResult() for _, series := range data.TimeSeries { + points := make([]tsdb.TimePoint, 0) + for _, point := range series.Points { + points = append(points, tsdb.NewTimePoint(null.FloatFrom(point.Value.DoubleValue), float64((point.Interval.EndTime).Unix())*1000)) + } queryRes.Series = append(queryRes.Series, &tsdb.TimeSeries{ - Name: series.Metric.Type, - // Points: [], + Name: series.Metric.Type, + Points: points, }) if setting.Env == setting.DEV { - // glog.Debug("Graphite response", "target", series.Target, "datapoints", len(series.DataPoints)) + glog.Debug("Stackdriver response", "target", points, "datapoints", len(points)) } }