BackendPlugins: update to sdk v0.42.0

misc cleanup
This commit is contained in:
Kyle Brandt
2020-04-09 15:47:30 -04:00
committed by GitHub
parent 712564f66a
commit 5153673884
11 changed files with 99 additions and 60 deletions
+2 -1
View File
@@ -7,6 +7,7 @@ import (
gocontext "context"
"github.com/grafana/grafana-plugin-sdk-go/data"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/null"
"github.com/grafana/grafana/pkg/components/simplejson"
@@ -173,7 +174,7 @@ func (c *QueryCondition) executeQuery(context *alerting.EvalContext, timeRange *
useDataframes := v.Dataframes != nil && (v.Series == nil || len(v.Series) == 0)
if useDataframes { // convert the dataframes to tsdb.TimeSeries
frames, err := tsdb.FramesFromBytes(v.Dataframes)
frames, err := data.UnmarshalArrowFrames(v.Dataframes)
if err != nil {
return nil, errutil.Wrap("tsdb.HandleRequest() failed to unmarshal arrow dataframes from bytes", err)
}
@@ -198,7 +198,7 @@ func (ctx *queryConditionTestContext) exec() (*alerting.ConditionResult, error)
}
if ctx.frame != nil {
bFrame, err := data.MarshalArrow(ctx.frame)
bFrame, err := ctx.frame.MarshalArrow()
if err != nil {
return nil, err
}