IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Prometheus: (Dataplane) Set FrameTypeVersion on Scalar type responses (#81491)

Browse Source 
So expressions (SSE) and recorded queries (RQ) detect the response correctly
This commit is contained in:
Kyle Brandt
2024-01-29 11:39:23 -05:00
committed by GitHub
parent ba544e5b33
commit 1b155a02fd
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/util/converter/prom.go
View File

@@ -263,7 +263,7 @@ func readResult(resultType string, rsp backend.DataResponse, iter *jsonitere.Ite
return rsp
}
case "scalar":
rsp = readScalar(iter)
rsp = readScalar(iter, opt.Dataplane)
if rsp.Error != nil {
return rsp
}
@@ -541,7 +541,7 @@ func readString(iter *jsonitere.Iterator) backend.DataResponse {
}
}
func readScalar(iter *jsonitere.Iterator) backend.DataResponse {
func readScalar(iter *jsonitere.Iterator, dataPlane bool) backend.DataResponse {
rsp := backend.DataResponse{}
timeField := data.NewFieldFromFieldType(data.FieldTypeTime, 0)
@@ -564,6 +564,10 @@ func readScalar(iter *jsonitere.Iterator) backend.DataResponse {
Custom: resultTypeToCustomMeta("scalar"),
}
if dataPlane {
frame.Meta.TypeVersion = data.FrameTypeVersion{0, 1}
}
return backend.DataResponse{
Frames: []*data.Frame{frame},
}