From 1b155a02fdcdee763e7454e375e780975d53c281 Mon Sep 17 00:00:00 2001 From: Kyle Brandt Date: Mon, 29 Jan 2024 11:39:23 -0500 Subject: [PATCH] Prometheus: (Dataplane) Set FrameTypeVersion on Scalar type responses (#81491) So expressions (SSE) and recorded queries (RQ) detect the response correctly --- pkg/util/converter/prom.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/util/converter/prom.go b/pkg/util/converter/prom.go index fcdd6f8a23b..60215e5cff9 100644 --- a/pkg/util/converter/prom.go +++ b/pkg/util/converter/prom.go @@ -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}, }