From 4e0f95dc3146b44ca2100e44bd2ddcda30c53d42 Mon Sep 17 00:00:00 2001 From: Kyle Brandt Date: Mon, 5 Dec 2022 12:48:10 -0500 Subject: [PATCH] Chore: Update SDK to v0.145.0 with TimeSeriesMulti Constant (#59729) --- go.mod | 6 +- go.sum | 19 +- pkg/tsdb/loki/frame_test.go | 4 +- .../loki/testdata/matrix_gap.golden.jsonc | 4 +- .../loki/testdata/matrix_inf.golden.jsonc | 4 +- .../loki/testdata/matrix_name.golden.jsonc | 4 +- .../loki/testdata/matrix_nan.golden.jsonc | 4 +- .../loki/testdata/matrix_simple.golden.jsonc | 8 +- .../testdata/matrix_small_step.golden.jsonc | 4 +- .../testdata/matrix_with_stats.golden.jsonc | 8 +- .../loki/testdata/vector_simple.golden.jsonc | 8 +- .../vector_special_values.golden.jsonc | 12 +- .../prometheus/buffered/time_series_query.go | 2 +- .../testdata/range_auto.result.golden.jsonc | 4 +- .../range_infinity.result.golden.jsonc | 4 +- .../range_missing.result.golden.jsonc | 4 +- .../testdata/range_nan.result.golden.jsonc | 4 +- .../testdata/range_simple.result.golden.jsonc | 8 +- pkg/util/converter/prom.go | 6 +- .../testdata/loki-streams-a-frame.jsonc | 1 + .../testdata/loki-streams-a-wide-frame.jsonc | 1 + .../testdata/loki-streams-b-frame.jsonc | 1 + .../testdata/loki-streams-b-wide-frame.jsonc | 1 + .../testdata/loki-streams-c-frame.jsonc | 1 + .../testdata/loki-streams-c-wide-frame.jsonc | 1 + .../testdata/prom-exemplars-a-frame.jsonc | 1 + .../prom-exemplars-a-wide-frame.jsonc | 1 + .../testdata/prom-exemplars-b-frame.jsonc | 1 + .../prom-exemplars-b-wide-frame.jsonc | 1 + .../testdata/prom-labels-frame.jsonc | 1 + .../testdata/prom-labels-wide-frame.jsonc | 1 + .../testdata/prom-matrix-frame.jsonc | 9 +- ...rom-matrix-histogram-no-labels-frame.jsonc | 9 +- ...atrix-histogram-no-labels-wide-frame.jsonc | 9 +- ...m-matrix-histogram-partitioned-frame.jsonc | 193 +++++++++--------- ...rix-histogram-partitioned-wide-frame.jsonc | 193 +++++++++--------- .../testdata/prom-matrix-wide-frame.jsonc | 1 + .../prom-matrix-with-nans-frame.jsonc | 5 +- .../prom-matrix-with-nans-wide-frame.jsonc | 1 + .../testdata/prom-scalar-frame.jsonc | 5 +- .../testdata/prom-scalar-wide-frame.jsonc | 5 +- .../testdata/prom-series-frame.jsonc | 1 + .../testdata/prom-series-wide-frame.jsonc | 1 + .../testdata/prom-string-frame.jsonc | 5 +- .../testdata/prom-string-wide-frame.jsonc | 5 +- .../testdata/prom-vector-frame.jsonc | 21 +- ...rom-vector-histogram-no-labels-frame.jsonc | 9 +- ...ector-histogram-no-labels-wide-frame.jsonc | 9 +- .../testdata/prom-vector-wide-frame.jsonc | 1 + .../testdata/prom-warnings-frame.jsonc | 21 +- .../testdata/prom-warnings-wide-frame.jsonc | 1 + 51 files changed, 342 insertions(+), 291 deletions(-) diff --git a/go.mod b/go.mod index 16fb97f6a2f..fc9778ffbe9 100644 --- a/go.mod +++ b/go.mod @@ -59,7 +59,7 @@ require ( github.com/grafana/cuetsy v0.1.1 github.com/grafana/grafana-aws-sdk v0.11.0 github.com/grafana/grafana-azure-sdk-go v1.3.1 - github.com/grafana/grafana-plugin-sdk-go v0.142.0 + github.com/grafana/grafana-plugin-sdk-go v0.145.0 github.com/grafana/thema v0.0.0-20221113112305-b441ed85a1fd github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 github.com/hashicorp/go-hclog v1.0.0 @@ -304,7 +304,11 @@ require ( github.com/segmentio/asm v1.1.4 // indirect github.com/shopspring/decimal v1.2.0 // indirect github.com/spf13/cast v1.3.1 // indirect + github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8 // indirect + github.com/unknwon/com v1.0.1 // indirect + github.com/unknwon/log v0.0.0-20150304194804-e617c87089d3 // indirect go.starlark.net v0.0.0-20221020143700-22309ac47eac // indirect + gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect ) require ( diff --git a/go.sum b/go.sum index 91cfa8ec3a9..48560c53758 100644 --- a/go.sum +++ b/go.sum @@ -1342,6 +1342,8 @@ github.com/gophercloud/gophercloud v0.18.0/go.mod h1:wRtmUelyIIv3CSSDI47aUwbs075 github.com/gophercloud/gophercloud v0.20.0/go.mod h1:wRtmUelyIIv3CSSDI47aUwbs075O6i+LY+pXsKCBsb4= github.com/gophercloud/gophercloud v0.24.0 h1:jDsIMGJ1KZpAjYfQgGI2coNQj5Q83oPzuiGJRFWgMzw= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gopherjs/gopherjs v0.0.0-20191106031601-ce3c9ade29de h1:F7WD09S8QB4LrkEpka0dFPLSotH11HRpCsLIbIcJ7sU= github.com/gopherjs/gopherjs v0.0.0-20191106031601-ce3c9ade29de/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= @@ -1376,8 +1378,8 @@ github.com/grafana/grafana-azure-sdk-go v1.3.1/go.mod h1:rgrnK9m6CgKlgx4rH3FFP/6 github.com/grafana/grafana-google-sdk-go v0.0.0-20211104130251-b190293eaf58 h1:2ud7NNM7LrGPO4x0NFR8qLq68CqI4SmB7I2yRN2w9oE= github.com/grafana/grafana-google-sdk-go v0.0.0-20211104130251-b190293eaf58/go.mod h1:Vo2TKWfDVmNTELBUM+3lkrZvFtBws0qSZdXhQxRdJrE= github.com/grafana/grafana-plugin-sdk-go v0.114.0/go.mod h1:D7x3ah+1d4phNXpbnOaxa/osSaZlwh9/ZUnGGzegRbk= -github.com/grafana/grafana-plugin-sdk-go v0.142.0 h1:fDgA0EmWWy5+/7nX7fdHBfADR6pWuR1TZA5QL36VX7U= -github.com/grafana/grafana-plugin-sdk-go v0.142.0/go.mod h1:srvRQ+de4C5h7FqA5lSFUkFCs5pJolWT+PGV2AyBOFk= +github.com/grafana/grafana-plugin-sdk-go v0.145.0 h1:ZlRxxV3C6RA+wNWeGr+rLVD70pgsZwiLI9etzE0zu+Q= +github.com/grafana/grafana-plugin-sdk-go v0.145.0/go.mod h1:dFof/7GenWBFTmrfcPRCpLau7tgIED0ykzupWAlB0o0= github.com/grafana/prometheus-alertmanager v0.24.1-0.20221012142027-823cd9150293 h1:dJIdfHqu+XjKz+w9zXLqXKPdp6Jjx/UPSOwdeSfWdeQ= github.com/grafana/prometheus-alertmanager v0.24.1-0.20221012142027-823cd9150293/go.mod h1:HVHqK+BVPa/tmL8EMhLCCrPt2a1GdJpEyxr5hgur2UI= github.com/grafana/saml v0.4.9-0.20220727151557-61cd9c9353fc h1:1PY8n+rXuBNr3r1JQhoytWDCpc+pq+BibxV0SZv+Cr4= @@ -1665,6 +1667,8 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jsternberg/zap-logfmt v1.0.0/go.mod h1:uvPs/4X51zdkcm5jXl5SYoN+4RK21K8mysFmDaM/h+o= github.com/jsternberg/zap-logfmt v1.2.0/go.mod h1:kz+1CUmCutPWABnNkOu9hOHKdT2q3TDYCcsFy9hpqb0= +github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= @@ -2309,8 +2313,12 @@ github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/assertions v1.0.1 h1:voD4ITNjPL5jjBfgR/r8fPIIBrliWrWHeiJApdr3r4w= github.com/smartystreets/assertions v1.0.1/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM= +github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s= github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/snowflakedb/gosnowflake v1.3.4/go.mod h1:NsRq2QeiMUuoNUJhp5Q6xGC4uBrsS9g6LwZVEkTWgsE= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= @@ -2435,6 +2443,12 @@ github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= +github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8 h1:aVGB3YnaS/JNfOW3tiHIlmNmTDg618va+eT0mVomgyI= +github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8/go.mod h1:fVle4kNr08ydeohzYafr20oZzbAkhQT39gKK/pFQ5M4= +github.com/unknwon/com v1.0.1 h1:3d1LTxD+Lnf3soQiD4Cp/0BRB+Rsa/+RTvz8GMMzIXs= +github.com/unknwon/com v1.0.1/go.mod h1:tOOxU81rwgoCLoOVVPHb6T/wt8HZygqH5id+GNnlCXM= +github.com/unknwon/log v0.0.0-20150304194804-e617c87089d3 h1:4EYQaWAatQokdji3zqZloVIW/Ke1RQjYw2zHULyrHJg= +github.com/unknwon/log v0.0.0-20150304194804-e617c87089d3/go.mod h1:1xEUf2abjfP92w2GZTV+GgaRxXErwRXcClbUwrNJffU= github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= @@ -2979,6 +2993,7 @@ golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191020152052-9984515f0562/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191025021431-6c3a3bfe00ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/pkg/tsdb/loki/frame_test.go b/pkg/tsdb/loki/frame_test.go index e1f57f85a1d..47bbbf7f90a 100644 --- a/pkg/tsdb/loki/frame_test.go +++ b/pkg/tsdb/loki/frame_test.go @@ -95,7 +95,7 @@ func TestAdjustFrame(t *testing.T) { field2.Labels = data.Labels{"app": "Application", "tag2": "tag2"} frame := data.NewFrame("test", field1, field2) - frame.SetMeta(&data.FrameMeta{Type: data.FrameTypeTimeSeriesMany}) + frame.SetMeta(&data.FrameMeta{Type: data.FrameTypeTimeSeriesMulti}) query := &lokiQuery{ Expr: "up(ALERTS)", @@ -123,7 +123,7 @@ func TestAdjustFrame(t *testing.T) { field2 := data.NewField("", nil, make([]float64, 0)) frame := data.NewFrame("test", field1, field2) - frame.SetMeta(&data.FrameMeta{Type: data.FrameTypeTimeSeriesMany}) + frame.SetMeta(&data.FrameMeta{Type: data.FrameTypeTimeSeriesMulti}) err := adjustFrame(frame, query) require.NoError(t, err) diff --git a/pkg/tsdb/loki/testdata/matrix_gap.golden.jsonc b/pkg/tsdb/loki/testdata/matrix_gap.golden.jsonc index 746d190cd86..42169beb718 100644 --- a/pkg/tsdb/loki/testdata/matrix_gap.golden.jsonc +++ b/pkg/tsdb/loki/testdata/matrix_gap.golden.jsonc @@ -1,7 +1,7 @@ // 🌟 This was machine generated. Do not edit. 🌟 // // Frame[0] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "executedQueryString": "Expr: up(ALERTS)\nStep: 42s" // } // Name: {} @@ -28,7 +28,7 @@ "schema": { "name": "{}", "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "executedQueryString": "Expr: up(ALERTS)\nStep: 42s" }, "fields": [ diff --git a/pkg/tsdb/loki/testdata/matrix_inf.golden.jsonc b/pkg/tsdb/loki/testdata/matrix_inf.golden.jsonc index eda8ef19b83..80da91d0b75 100644 --- a/pkg/tsdb/loki/testdata/matrix_inf.golden.jsonc +++ b/pkg/tsdb/loki/testdata/matrix_inf.golden.jsonc @@ -1,7 +1,7 @@ // 🌟 This was machine generated. Do not edit. 🌟 // // Frame[0] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "executedQueryString": "Expr: up(ALERTS)\nStep: 42s" // } // Name: {level="info", location="moon", protocol="http"} @@ -30,7 +30,7 @@ "schema": { "name": "{level=\"info\", location=\"moon\", protocol=\"http\"}", "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "executedQueryString": "Expr: up(ALERTS)\nStep: 42s" }, "fields": [ diff --git a/pkg/tsdb/loki/testdata/matrix_name.golden.jsonc b/pkg/tsdb/loki/testdata/matrix_name.golden.jsonc index c5b9961f404..66f4f5db496 100644 --- a/pkg/tsdb/loki/testdata/matrix_name.golden.jsonc +++ b/pkg/tsdb/loki/testdata/matrix_name.golden.jsonc @@ -1,7 +1,7 @@ // 🌟 This was machine generated. Do not edit. 🌟 // // Frame[0] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "executedQueryString": "Expr: up(ALERTS)\nStep: 42s" // } // Name: {__name__="moon", level="error"} @@ -23,7 +23,7 @@ "schema": { "name": "{__name__=\"moon\", level=\"error\"}", "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "executedQueryString": "Expr: up(ALERTS)\nStep: 42s" }, "fields": [ diff --git a/pkg/tsdb/loki/testdata/matrix_nan.golden.jsonc b/pkg/tsdb/loki/testdata/matrix_nan.golden.jsonc index d3f1dc6a9f0..025b0961691 100644 --- a/pkg/tsdb/loki/testdata/matrix_nan.golden.jsonc +++ b/pkg/tsdb/loki/testdata/matrix_nan.golden.jsonc @@ -1,7 +1,7 @@ // 🌟 This was machine generated. Do not edit. 🌟 // // Frame[0] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "executedQueryString": "Expr: up(ALERTS)\nStep: 42s" // } // Name: {} @@ -25,7 +25,7 @@ "schema": { "name": "{}", "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "executedQueryString": "Expr: up(ALERTS)\nStep: 42s" }, "fields": [ diff --git a/pkg/tsdb/loki/testdata/matrix_simple.golden.jsonc b/pkg/tsdb/loki/testdata/matrix_simple.golden.jsonc index 7f2295b3399..0e37c6ee222 100644 --- a/pkg/tsdb/loki/testdata/matrix_simple.golden.jsonc +++ b/pkg/tsdb/loki/testdata/matrix_simple.golden.jsonc @@ -1,7 +1,7 @@ // 🌟 This was machine generated. Do not edit. 🌟 // // Frame[0] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "executedQueryString": "Expr: up(ALERTS)\nStep: 42s" // } // Name: {level="error", location="moon"} @@ -20,7 +20,7 @@ // // // Frame[1] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "executedQueryString": "Expr: up(ALERTS)\nStep: 42s" // } // Name: {level="info", location="mars"} @@ -46,7 +46,7 @@ "schema": { "name": "{level=\"error\", location=\"moon\"}", "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "executedQueryString": "Expr: up(ALERTS)\nStep: 42s" }, "fields": [ @@ -97,7 +97,7 @@ "schema": { "name": "{level=\"info\", location=\"mars\"}", "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "executedQueryString": "Expr: up(ALERTS)\nStep: 42s" }, "fields": [ diff --git a/pkg/tsdb/loki/testdata/matrix_small_step.golden.jsonc b/pkg/tsdb/loki/testdata/matrix_small_step.golden.jsonc index 8e19e4e84c7..7699d3aa09e 100644 --- a/pkg/tsdb/loki/testdata/matrix_small_step.golden.jsonc +++ b/pkg/tsdb/loki/testdata/matrix_small_step.golden.jsonc @@ -1,7 +1,7 @@ // 🌟 This was machine generated. Do not edit. 🌟 // // Frame[0] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "executedQueryString": "Expr: up(ALERTS)\nStep: 42s" // } // Name: {level="error"} @@ -26,7 +26,7 @@ "schema": { "name": "{level=\"error\"}", "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "executedQueryString": "Expr: up(ALERTS)\nStep: 42s" }, "fields": [ diff --git a/pkg/tsdb/loki/testdata/matrix_with_stats.golden.jsonc b/pkg/tsdb/loki/testdata/matrix_with_stats.golden.jsonc index 48eb212bfc9..8a34e8866ab 100644 --- a/pkg/tsdb/loki/testdata/matrix_with_stats.golden.jsonc +++ b/pkg/tsdb/loki/testdata/matrix_with_stats.golden.jsonc @@ -1,7 +1,7 @@ // 🌟 This was machine generated. Do not edit. 🌟 // // Frame[0] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "stats": [ // { // "displayName": "Summary: bytes processed per second", @@ -126,7 +126,7 @@ // // // Frame[1] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "executedQueryString": "Expr: up(ALERTS)\nStep: 42s" // } // Name: {level="info", location="mars"} @@ -149,7 +149,7 @@ "schema": { "name": "{level=\"error\", location=\"moon\"}", "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "stats": [ { "displayName": "Summary: bytes processed per second", @@ -304,7 +304,7 @@ "schema": { "name": "{level=\"info\", location=\"mars\"}", "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "executedQueryString": "Expr: up(ALERTS)\nStep: 42s" }, "fields": [ diff --git a/pkg/tsdb/loki/testdata/vector_simple.golden.jsonc b/pkg/tsdb/loki/testdata/vector_simple.golden.jsonc index 300cb9a6457..759e47d5a55 100644 --- a/pkg/tsdb/loki/testdata/vector_simple.golden.jsonc +++ b/pkg/tsdb/loki/testdata/vector_simple.golden.jsonc @@ -1,7 +1,7 @@ // 🌟 This was machine generated. Do not edit. 🌟 // // Frame[0] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "executedQueryString": "Expr: query1" // } // Name: {level="error", location="moon"} @@ -17,7 +17,7 @@ // // // Frame[1] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "executedQueryString": "Expr: query1" // } // Name: {level="info", location="moon"} @@ -39,7 +39,7 @@ "schema": { "name": "{level=\"error\", location=\"moon\"}", "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "executedQueryString": "Expr: query1" }, "fields": [ @@ -81,7 +81,7 @@ "schema": { "name": "{level=\"info\", location=\"moon\"}", "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "executedQueryString": "Expr: query1" }, "fields": [ diff --git a/pkg/tsdb/loki/testdata/vector_special_values.golden.jsonc b/pkg/tsdb/loki/testdata/vector_special_values.golden.jsonc index d362bc4d649..25025839664 100644 --- a/pkg/tsdb/loki/testdata/vector_special_values.golden.jsonc +++ b/pkg/tsdb/loki/testdata/vector_special_values.golden.jsonc @@ -1,7 +1,7 @@ // 🌟 This was machine generated. Do not edit. 🌟 // // Frame[0] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "executedQueryString": "Expr: query1" // } // Name: {level="error", location="moon"} @@ -17,7 +17,7 @@ // // // Frame[1] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "executedQueryString": "Expr: query1" // } // Name: {level="info", location="moon"} @@ -33,7 +33,7 @@ // // // Frame[2] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "executedQueryString": "Expr: query1" // } // Name: {level="debug", location="moon"} @@ -55,7 +55,7 @@ "schema": { "name": "{level=\"error\", location=\"moon\"}", "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "executedQueryString": "Expr: query1" }, "fields": [ @@ -105,7 +105,7 @@ "schema": { "name": "{level=\"info\", location=\"moon\"}", "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "executedQueryString": "Expr: query1" }, "fields": [ @@ -155,7 +155,7 @@ "schema": { "name": "{level=\"debug\", location=\"moon\"}", "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "executedQueryString": "Expr: query1" }, "fields": [ diff --git a/pkg/tsdb/prometheus/buffered/time_series_query.go b/pkg/tsdb/prometheus/buffered/time_series_query.go index fa1cdc107ae..a6861ce5a96 100644 --- a/pkg/tsdb/prometheus/buffered/time_series_query.go +++ b/pkg/tsdb/prometheus/buffered/time_series_query.go @@ -688,7 +688,7 @@ func deviation(values []float64) float64 { func newDataFrame(name string, typ string, fields ...*data.Field) *data.Frame { frame := data.NewFrame(name, fields...) frame.Meta = &data.FrameMeta{ - Type: data.FrameTypeTimeSeriesMany, + Type: data.FrameTypeTimeSeriesMulti, Custom: map[string]string{ "resultType": typ, // Note: SSE depends on this property and map type }, diff --git a/pkg/tsdb/prometheus/testdata/range_auto.result.golden.jsonc b/pkg/tsdb/prometheus/testdata/range_auto.result.golden.jsonc index 658c52ef38e..52e2d2c7be0 100644 --- a/pkg/tsdb/prometheus/testdata/range_auto.result.golden.jsonc +++ b/pkg/tsdb/prometheus/testdata/range_auto.result.golden.jsonc @@ -1,7 +1,7 @@ // 🌟 This was machine generated. Do not edit. 🌟 // // Frame[0] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "custom": { // "resultType": "matrix" // }, @@ -35,7 +35,7 @@ "schema": { "name": "histogram_quantile(0.95, sum(rate(tns_request_duration_seconds_bucket[1m0s])) by (le))", "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "custom": { "resultType": "matrix" }, diff --git a/pkg/tsdb/prometheus/testdata/range_infinity.result.golden.jsonc b/pkg/tsdb/prometheus/testdata/range_infinity.result.golden.jsonc index 19e2ade7b27..09ccdfe64d3 100644 --- a/pkg/tsdb/prometheus/testdata/range_infinity.result.golden.jsonc +++ b/pkg/tsdb/prometheus/testdata/range_infinity.result.golden.jsonc @@ -1,7 +1,7 @@ // 🌟 This was machine generated. Do not edit. 🌟 // // Frame[0] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "custom": { // "resultType": "matrix" // }, @@ -28,7 +28,7 @@ "schema": { "name": "1 / 0", "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "custom": { "resultType": "matrix" }, diff --git a/pkg/tsdb/prometheus/testdata/range_missing.result.golden.jsonc b/pkg/tsdb/prometheus/testdata/range_missing.result.golden.jsonc index 9214b554fc8..b6dc63c5d68 100644 --- a/pkg/tsdb/prometheus/testdata/range_missing.result.golden.jsonc +++ b/pkg/tsdb/prometheus/testdata/range_missing.result.golden.jsonc @@ -1,7 +1,7 @@ // 🌟 This was machine generated. Do not edit. 🌟 // // Frame[0] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "custom": { // "resultType": "matrix" // }, @@ -28,7 +28,7 @@ "schema": { "name": "go_goroutines{job=\"prometheus\"}", "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "custom": { "resultType": "matrix" }, diff --git a/pkg/tsdb/prometheus/testdata/range_nan.result.golden.jsonc b/pkg/tsdb/prometheus/testdata/range_nan.result.golden.jsonc index b94f094e1e6..44aa5af58df 100644 --- a/pkg/tsdb/prometheus/testdata/range_nan.result.golden.jsonc +++ b/pkg/tsdb/prometheus/testdata/range_nan.result.golden.jsonc @@ -1,7 +1,7 @@ // 🌟 This was machine generated. Do not edit. 🌟 // // Frame[0] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "custom": { // "resultType": "matrix" // }, @@ -28,7 +28,7 @@ "schema": { "name": "{handler=\"/api/v1/query_range\", job=\"prometheus\"}", "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "custom": { "resultType": "matrix" }, diff --git a/pkg/tsdb/prometheus/testdata/range_simple.result.golden.jsonc b/pkg/tsdb/prometheus/testdata/range_simple.result.golden.jsonc index 61e74919c29..bb3c642fd05 100644 --- a/pkg/tsdb/prometheus/testdata/range_simple.result.golden.jsonc +++ b/pkg/tsdb/prometheus/testdata/range_simple.result.golden.jsonc @@ -1,7 +1,7 @@ // 🌟 This was machine generated. Do not edit. 🌟 // // Frame[0] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "custom": { // "resultType": "matrix" // }, @@ -22,7 +22,7 @@ // // // Frame[1] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "custom": { // "resultType": "matrix" // }, @@ -48,7 +48,7 @@ "schema": { "name": "prometheus_http_requests_total{code=\"200\", handler=\"/api/v1/query_range\", job=\"prometheus\"}", "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "custom": { "resultType": "matrix" }, @@ -102,7 +102,7 @@ "schema": { "name": "prometheus_http_requests_total{code=\"400\", handler=\"/api/v1/query_range\", job=\"prometheus\"}", "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "custom": { "resultType": "matrix" }, diff --git a/pkg/util/converter/prom.go b/pkg/util/converter/prom.go index 5a51b33f2f1..4b9dda60916 100644 --- a/pkg/util/converter/prom.go +++ b/pkg/util/converter/prom.go @@ -330,7 +330,7 @@ func readString(iter *jsoniter.Iterator) *backend.DataResponse { frame := data.NewFrame("", timeField, valueField) frame.Meta = &data.FrameMeta{ - Type: data.FrameTypeTimeSeriesMany, + Type: data.FrameTypeTimeSeriesMulti, Custom: resultTypeToCustomMeta("string"), } @@ -354,7 +354,7 @@ func readScalar(iter *jsoniter.Iterator) *backend.DataResponse { frame := data.NewFrame("", timeField, valueField) frame.Meta = &data.FrameMeta{ - Type: data.FrameTypeTimeSeriesMany, + Type: data.FrameTypeTimeSeriesMulti, Custom: resultTypeToCustomMeta("scalar"), } @@ -544,7 +544,7 @@ func readMatrixOrVectorMulti(iter *jsoniter.Iterator, resultType string) *backen } else { frame := data.NewFrame("", timeField, valueField) frame.Meta = &data.FrameMeta{ - Type: data.FrameTypeTimeSeriesMany, + Type: data.FrameTypeTimeSeriesMulti, Custom: resultTypeToCustomMeta(resultType), } rsp.Frames = append(rsp.Frames, frame) diff --git a/pkg/util/converter/testdata/loki-streams-a-frame.jsonc b/pkg/util/converter/testdata/loki-streams-a-frame.jsonc index ea7680895e7..06559dd9366 100644 --- a/pkg/util/converter/testdata/loki-streams-a-frame.jsonc +++ b/pkg/util/converter/testdata/loki-streams-a-frame.jsonc @@ -54,6 +54,7 @@ // // 🌟 This was machine generated. Do not edit. 🌟 { + "status": 200, "frames": [ { "schema": { diff --git a/pkg/util/converter/testdata/loki-streams-a-wide-frame.jsonc b/pkg/util/converter/testdata/loki-streams-a-wide-frame.jsonc index ea7680895e7..06559dd9366 100644 --- a/pkg/util/converter/testdata/loki-streams-a-wide-frame.jsonc +++ b/pkg/util/converter/testdata/loki-streams-a-wide-frame.jsonc @@ -54,6 +54,7 @@ // // 🌟 This was machine generated. Do not edit. 🌟 { + "status": 200, "frames": [ { "schema": { diff --git a/pkg/util/converter/testdata/loki-streams-b-frame.jsonc b/pkg/util/converter/testdata/loki-streams-b-frame.jsonc index aba2b7ad6dc..fa04ae09377 100644 --- a/pkg/util/converter/testdata/loki-streams-b-frame.jsonc +++ b/pkg/util/converter/testdata/loki-streams-b-frame.jsonc @@ -53,6 +53,7 @@ // // 🌟 This was machine generated. Do not edit. 🌟 { + "status": 200, "frames": [ { "schema": { diff --git a/pkg/util/converter/testdata/loki-streams-b-wide-frame.jsonc b/pkg/util/converter/testdata/loki-streams-b-wide-frame.jsonc index aba2b7ad6dc..fa04ae09377 100644 --- a/pkg/util/converter/testdata/loki-streams-b-wide-frame.jsonc +++ b/pkg/util/converter/testdata/loki-streams-b-wide-frame.jsonc @@ -53,6 +53,7 @@ // // 🌟 This was machine generated. Do not edit. 🌟 { + "status": 200, "frames": [ { "schema": { diff --git a/pkg/util/converter/testdata/loki-streams-c-frame.jsonc b/pkg/util/converter/testdata/loki-streams-c-frame.jsonc index 89b7386f7f9..45c917f3e6f 100644 --- a/pkg/util/converter/testdata/loki-streams-c-frame.jsonc +++ b/pkg/util/converter/testdata/loki-streams-c-frame.jsonc @@ -15,6 +15,7 @@ // // 🌟 This was machine generated. Do not edit. 🌟 { + "status": 200, "frames": [ { "schema": { diff --git a/pkg/util/converter/testdata/loki-streams-c-wide-frame.jsonc b/pkg/util/converter/testdata/loki-streams-c-wide-frame.jsonc index 89b7386f7f9..45c917f3e6f 100644 --- a/pkg/util/converter/testdata/loki-streams-c-wide-frame.jsonc +++ b/pkg/util/converter/testdata/loki-streams-c-wide-frame.jsonc @@ -15,6 +15,7 @@ // // 🌟 This was machine generated. Do not edit. 🌟 { + "status": 200, "frames": [ { "schema": { diff --git a/pkg/util/converter/testdata/prom-exemplars-a-frame.jsonc b/pkg/util/converter/testdata/prom-exemplars-a-frame.jsonc index d1c18e4d4d4..5ecc472e7f0 100644 --- a/pkg/util/converter/testdata/prom-exemplars-a-frame.jsonc +++ b/pkg/util/converter/testdata/prom-exemplars-a-frame.jsonc @@ -36,6 +36,7 @@ // // 🌟 This was machine generated. Do not edit. 🌟 { + "status": 200, "frames": [ { "schema": { diff --git a/pkg/util/converter/testdata/prom-exemplars-a-wide-frame.jsonc b/pkg/util/converter/testdata/prom-exemplars-a-wide-frame.jsonc index d1c18e4d4d4..5ecc472e7f0 100644 --- a/pkg/util/converter/testdata/prom-exemplars-a-wide-frame.jsonc +++ b/pkg/util/converter/testdata/prom-exemplars-a-wide-frame.jsonc @@ -36,6 +36,7 @@ // // 🌟 This was machine generated. Do not edit. 🌟 { + "status": 200, "frames": [ { "schema": { diff --git a/pkg/util/converter/testdata/prom-exemplars-b-frame.jsonc b/pkg/util/converter/testdata/prom-exemplars-b-frame.jsonc index 2bf2b6e271e..25369baebe5 100644 --- a/pkg/util/converter/testdata/prom-exemplars-b-frame.jsonc +++ b/pkg/util/converter/testdata/prom-exemplars-b-frame.jsonc @@ -3047,6 +3047,7 @@ // // 🌟 This was machine generated. Do not edit. 🌟 { + "status": 200, "frames": [ { "schema": { diff --git a/pkg/util/converter/testdata/prom-exemplars-b-wide-frame.jsonc b/pkg/util/converter/testdata/prom-exemplars-b-wide-frame.jsonc index 2bf2b6e271e..25369baebe5 100644 --- a/pkg/util/converter/testdata/prom-exemplars-b-wide-frame.jsonc +++ b/pkg/util/converter/testdata/prom-exemplars-b-wide-frame.jsonc @@ -3047,6 +3047,7 @@ // // 🌟 This was machine generated. Do not edit. 🌟 { + "status": 200, "frames": [ { "schema": { diff --git a/pkg/util/converter/testdata/prom-labels-frame.jsonc b/pkg/util/converter/testdata/prom-labels-frame.jsonc index 099022f1908..80dea07f3bb 100644 --- a/pkg/util/converter/testdata/prom-labels-frame.jsonc +++ b/pkg/util/converter/testdata/prom-labels-frame.jsonc @@ -23,6 +23,7 @@ // // 🌟 This was machine generated. Do not edit. 🌟 { + "status": 200, "frames": [ { "schema": { diff --git a/pkg/util/converter/testdata/prom-labels-wide-frame.jsonc b/pkg/util/converter/testdata/prom-labels-wide-frame.jsonc index 099022f1908..80dea07f3bb 100644 --- a/pkg/util/converter/testdata/prom-labels-wide-frame.jsonc +++ b/pkg/util/converter/testdata/prom-labels-wide-frame.jsonc @@ -23,6 +23,7 @@ // // 🌟 This was machine generated. Do not edit. 🌟 { + "status": 200, "frames": [ { "schema": { diff --git a/pkg/util/converter/testdata/prom-matrix-frame.jsonc b/pkg/util/converter/testdata/prom-matrix-frame.jsonc index dc91656053b..34962e54703 100644 --- a/pkg/util/converter/testdata/prom-matrix-frame.jsonc +++ b/pkg/util/converter/testdata/prom-matrix-frame.jsonc @@ -1,7 +1,7 @@ // 🌟 This was machine generated. Do not edit. 🌟 // // Frame[0] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "custom": { // "resultType": "matrix" // } @@ -21,7 +21,7 @@ // // // Frame[1] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "custom": { // "resultType": "matrix" // } @@ -41,11 +41,12 @@ // // 🌟 This was machine generated. Do not edit. 🌟 { + "status": 200, "frames": [ { "schema": { "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "custom": { "resultType": "matrix" } @@ -90,7 +91,7 @@ { "schema": { "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "custom": { "resultType": "matrix" } diff --git a/pkg/util/converter/testdata/prom-matrix-histogram-no-labels-frame.jsonc b/pkg/util/converter/testdata/prom-matrix-histogram-no-labels-frame.jsonc index a1ffaf6edb9..f02ca0ce646 100644 --- a/pkg/util/converter/testdata/prom-matrix-histogram-no-labels-frame.jsonc +++ b/pkg/util/converter/testdata/prom-matrix-histogram-no-labels-frame.jsonc @@ -1,9 +1,9 @@ // 🌟 This was machine generated. Do not edit. 🌟 -// +// // Frame[0] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 932 Rows // +-------------------------------+------------------------+------------------------+--------------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -21,10 +21,11 @@ // | 2022-04-14 19:08:20 +0000 UTC | 9.07293025972535e-06 | 9.894100606163098e-06 | 3.712286008031362 | 0 | // | ... | ... | ... | ... | ... | // +-------------------------------+------------------------+------------------------+--------------------+---------------+ -// -// +// +// // 🌟 This was machine generated. Do not edit. 🌟 { + "status": 200, "frames": [ { "schema": { diff --git a/pkg/util/converter/testdata/prom-matrix-histogram-no-labels-wide-frame.jsonc b/pkg/util/converter/testdata/prom-matrix-histogram-no-labels-wide-frame.jsonc index a1ffaf6edb9..f02ca0ce646 100644 --- a/pkg/util/converter/testdata/prom-matrix-histogram-no-labels-wide-frame.jsonc +++ b/pkg/util/converter/testdata/prom-matrix-histogram-no-labels-wide-frame.jsonc @@ -1,9 +1,9 @@ // 🌟 This was machine generated. Do not edit. 🌟 -// +// // Frame[0] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 932 Rows // +-------------------------------+------------------------+------------------------+--------------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -21,10 +21,11 @@ // | 2022-04-14 19:08:20 +0000 UTC | 9.07293025972535e-06 | 9.894100606163098e-06 | 3.712286008031362 | 0 | // | ... | ... | ... | ... | ... | // +-------------------------------+------------------------+------------------------+--------------------+---------------+ -// -// +// +// // 🌟 This was machine generated. Do not edit. 🌟 { + "status": 200, "frames": [ { "schema": { diff --git a/pkg/util/converter/testdata/prom-matrix-histogram-partitioned-frame.jsonc b/pkg/util/converter/testdata/prom-matrix-histogram-partitioned-frame.jsonc index dcd6c49b2c1..49c6a3829a6 100644 --- a/pkg/util/converter/testdata/prom-matrix-histogram-partitioned-frame.jsonc +++ b/pkg/util/converter/testdata/prom-matrix-histogram-partitioned-frame.jsonc @@ -1,9 +1,9 @@ // 🌟 This was machine generated. Do not edit. 🌟 -// +// // Frame[0] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 0 Rows // +-------------------+--------------------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -11,13 +11,13 @@ // | Type: []time.Time | Type: []float64 | Type: []float64 | Type: []float64 | Type: []int8 | // +-------------------+--------------------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ // +-------------------+--------------------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ -// -// -// +// +// +// // Frame[1] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 0 Rows // +-------------------+---------------------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -25,13 +25,13 @@ // | Type: []time.Time | Type: []float64 | Type: []float64 | Type: []float64 | Type: []int8 | // +-------------------+---------------------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ // +-------------------+---------------------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ -// -// -// +// +// +// // Frame[2] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 0 Rows // +-------------------+--------------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -39,13 +39,13 @@ // | Type: []time.Time | Type: []float64 | Type: []float64 | Type: []float64 | Type: []int8 | // +-------------------+--------------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ // +-------------------+--------------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ -// -// -// +// +// +// // Frame[3] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 0 Rows // +-------------------+---------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -53,13 +53,13 @@ // | Type: []time.Time | Type: []float64 | Type: []float64 | Type: []float64 | Type: []int8 | // +-------------------+---------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ // +-------------------+---------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ -// -// -// +// +// +// // Frame[4] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 0 Rows // +-------------------+-----------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -67,13 +67,13 @@ // | Type: []time.Time | Type: []float64 | Type: []float64 | Type: []float64 | Type: []int8 | // +-------------------+-----------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ // +-------------------+-----------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ -// -// -// +// +// +// // Frame[5] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 0 Rows // +-------------------+--------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -81,13 +81,13 @@ // | Type: []time.Time | Type: []float64 | Type: []float64 | Type: []float64 | Type: []int8 | // +-------------------+--------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ // +-------------------+--------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ -// -// -// +// +// +// // Frame[6] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 0 Rows // +-------------------+------------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -95,13 +95,13 @@ // | Type: []time.Time | Type: []float64 | Type: []float64 | Type: []float64 | Type: []int8 | // +-------------------+------------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ // +-------------------+------------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ -// -// -// +// +// +// // Frame[7] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 0 Rows // +-------------------+--------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -109,13 +109,13 @@ // | Type: []time.Time | Type: []float64 | Type: []float64 | Type: []float64 | Type: []int8 | // +-------------------+--------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ // +-------------------+--------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ -// -// -// +// +// +// // Frame[8] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 1 Rows // +-------------------------------+--------------------------------------------------------------------------------------------+----------------------+----------------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -124,13 +124,13 @@ // +-------------------------------+--------------------------------------------------------------------------------------------+----------------------+----------------------+---------------+ // | 2022-04-14 19:08:20 +0000 UTC | 0.05255602595335715 | 0.057312752700291944 | 0.003508784241348215 | 0 | // +-------------------------------+--------------------------------------------------------------------------------------------+----------------------+----------------------+---------------+ -// -// -// +// +// +// // Frame[9] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 0 Rows // +-------------------+---------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -138,13 +138,13 @@ // | Type: []time.Time | Type: []float64 | Type: []float64 | Type: []float64 | Type: []int8 | // +-------------------+---------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ // +-------------------+---------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ -// -// -// +// +// +// // Frame[10] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 426 Rows // +-------------------------------+------------------------------------------------------------------------------------+-----------------------+-----------------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -162,13 +162,13 @@ // | 2022-04-14 19:08:20 +0000 UTC | 0.002762135864009951 | 0.0030121305183748843 | 0.30175469375429953 | 0 | // | ... | ... | ... | ... | ... | // +-------------------------------+------------------------------------------------------------------------------------+-----------------------+-----------------------+---------------+ -// -// -// +// +// +// // Frame[11] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 1 Rows // +-------------------------------+-------------------------------------------------------------------------------------+--------------------+-----------------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -177,13 +177,13 @@ // +-------------------------------+-------------------------------------------------------------------------------------+--------------------+-----------------------+---------------+ // | 2022-04-14 19:08:20 +0000 UTC | 1 | 1.0905077326652577 | 0.0035087596183873042 | 0 | // +-------------------------------+-------------------------------------------------------------------------------------+--------------------+-----------------------+---------------+ -// -// -// +// +// +// // Frame[12] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 6 Rows // +-------------------------------+-----------------------------------------------------------------------------------+--------------------+----------------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -197,13 +197,13 @@ // | 2022-04-14 19:13:20 +0000 UTC | 0.8408964152537144 | 0.9170040432046711 | 0.003508771929824561 | 0 | // | 2022-04-14 19:13:20 +0000 UTC | 1 | 1.0905077326652577 | 0.003508771929824561 | 0 | // +-------------------------------+-----------------------------------------------------------------------------------+--------------------+----------------------+---------------+ -// -// -// +// +// +// // Frame[13] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 269 Rows // +-------------------------------+---------------------------------------------------------------------------+------------------------+--------------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -221,13 +221,13 @@ // | 2022-04-14 19:08:20 +0000 UTC | 9.07293025972535e-06 | 9.894100606163098e-06 | 3.533338799658994 | 0 | // | ... | ... | ... | ... | ... | // +-------------------------------+---------------------------------------------------------------------------+------------------------+--------------------+---------------+ -// -// -// +// +// +// // Frame[14] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 303 Rows // +-------------------------------+-----------------------------------------------------------------------------------------------------------------+-----------------------+----------------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -245,13 +245,13 @@ // | 2022-04-14 19:08:20 +0000 UTC | 0.005065779510355506 | 0.005524271728019902 | 0.06666662973235489 | 0 | // | ... | ... | ... | ... | ... | // +-------------------------------+-----------------------------------------------------------------------------------------------------------------+-----------------------+----------------------+---------------+ -// -// -// +// +// +// // Frame[15] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 56 Rows // +-------------------------------+------------------------------------------------------------------------------------------------------+-----------------------+-----------------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -269,13 +269,13 @@ // | 2022-04-14 19:10:00 +0000 UTC | 0.005524271728019902 | 0.0060242610367497685 | 0.00713925 | 0 | // | ... | ... | ... | ... | ... | // +-------------------------------+------------------------------------------------------------------------------------------------------+-----------------------+-----------------------+---------------+ -// -// -// +// +// +// // Frame[16] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 41 Rows // +-------------------------------+-----------------------------------------------------------------------------------------------------+-----------------------+-----------------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -293,13 +293,13 @@ // | 2022-04-14 19:10:00 +0000 UTC | 0.0060242610367497685 | 0.006569503244169644 | 0.0035300277777777778 | 0 | // | ... | ... | ... | ... | ... | // +-------------------------------+-----------------------------------------------------------------------------------------------------+-----------------------+-----------------------+---------------+ -// -// -// +// +// +// // Frame[17] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 29 Rows // +-------------------------------+-----------------------------------------------------------------------------------------------------------+----------------------+-----------------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -317,13 +317,13 @@ // | 2022-04-14 19:11:40 +0000 UTC | 0.04052623608284405 | 0.044194173824159216 | 0.003508771929824561 | 0 | // | ... | ... | ... | ... | ... | // +-------------------------------+-----------------------------------------------------------------------------------------------------------+----------------------+-----------------------+---------------+ -// -// -// +// +// +// // Frame[18] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 38 Rows // +-------------------------------+------------------------------------------------------------------------------------------------------+----------------------+-----------------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -341,13 +341,13 @@ // | 2022-04-14 19:11:40 +0000 UTC | 0.0060242610367497685 | 0.006569503244169644 | 0.003508771929824561 | 0 | // | ... | ... | ... | ... | ... | // +-------------------------------+------------------------------------------------------------------------------------------------------+----------------------+-----------------------+---------------+ -// -// -// +// +// +// // Frame[19] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 195 Rows // +-------------------------------+---------------------------------------------------------------------------------------------+-----------------------+----------------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -365,13 +365,13 @@ // | 2022-04-14 19:08:20 +0000 UTC | 0.0021298979153618314 | 0.0023226701464896895 | 0.07368416128056675 | 0 | // | ... | ... | ... | ... | ... | // +-------------------------------+---------------------------------------------------------------------------------------------+-----------------------+----------------------+---------------+ -// -// -// +// +// +// // Frame[20] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 261 Rows // +-------------------------------+-------------------------------------------------------------------------------------------+-----------------------+-----------------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -389,13 +389,13 @@ // | 2022-04-14 19:08:20 +0000 UTC | 0.0009765625 | 0.0010649489576809157 | 0.03508765774105932 | 0 | // | ... | ... | ... | ... | ... | // +-------------------------------+-------------------------------------------------------------------------------------------+-----------------------+-----------------------+---------------+ -// -// -// +// +// +// // Frame[21] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 176 Rows // +-------------------------------+-------------------------------------------------------------------------------------------------------+-----------------------+-----------------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -413,13 +413,13 @@ // | 2022-04-14 19:08:20 +0000 UTC | 0.009290680585958758 | 0.010131559020711013 | 0.003508771929824561 | 0 | // | ... | ... | ... | ... | ... | // +-------------------------------+-------------------------------------------------------------------------------------------------------+-----------------------+-----------------------+---------------+ -// -// -// +// +// +// // Frame[22] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 255 Rows // +-------------------------------+-------------------------------------------------------------------------------------------------------------+-----------------------+----------------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -437,13 +437,13 @@ // | 2022-04-14 19:08:20 +0000 UTC | 0.04052623608284405 | 0.044194173824159216 | 0 | 0 | // | ... | ... | ... | ... | ... | // +-------------------------------+-------------------------------------------------------------------------------------------------------------+-----------------------+----------------------+---------------+ -// -// -// +// +// +// // Frame[23] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 167 Rows // +-------------------------------+------------------------------------------------------------------------------------+------------------------+-----------------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -461,10 +461,11 @@ // | 2022-04-14 19:08:20 +0000 UTC | 1.1766134837401892e-05 | 1.2831061023768835e-05 | 0.1578945767934209 | 0 | // | ... | ... | ... | ... | ... | // +-------------------------------+------------------------------------------------------------------------------------+------------------------+-----------------------+---------------+ -// -// +// +// // 🌟 This was machine generated. Do not edit. 🌟 { + "status": 200, "frames": [ { "schema": { diff --git a/pkg/util/converter/testdata/prom-matrix-histogram-partitioned-wide-frame.jsonc b/pkg/util/converter/testdata/prom-matrix-histogram-partitioned-wide-frame.jsonc index dcd6c49b2c1..49c6a3829a6 100644 --- a/pkg/util/converter/testdata/prom-matrix-histogram-partitioned-wide-frame.jsonc +++ b/pkg/util/converter/testdata/prom-matrix-histogram-partitioned-wide-frame.jsonc @@ -1,9 +1,9 @@ // 🌟 This was machine generated. Do not edit. 🌟 -// +// // Frame[0] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 0 Rows // +-------------------+--------------------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -11,13 +11,13 @@ // | Type: []time.Time | Type: []float64 | Type: []float64 | Type: []float64 | Type: []int8 | // +-------------------+--------------------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ // +-------------------+--------------------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ -// -// -// +// +// +// // Frame[1] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 0 Rows // +-------------------+---------------------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -25,13 +25,13 @@ // | Type: []time.Time | Type: []float64 | Type: []float64 | Type: []float64 | Type: []int8 | // +-------------------+---------------------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ // +-------------------+---------------------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ -// -// -// +// +// +// // Frame[2] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 0 Rows // +-------------------+--------------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -39,13 +39,13 @@ // | Type: []time.Time | Type: []float64 | Type: []float64 | Type: []float64 | Type: []int8 | // +-------------------+--------------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ // +-------------------+--------------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ -// -// -// +// +// +// // Frame[3] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 0 Rows // +-------------------+---------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -53,13 +53,13 @@ // | Type: []time.Time | Type: []float64 | Type: []float64 | Type: []float64 | Type: []int8 | // +-------------------+---------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ // +-------------------+---------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ -// -// -// +// +// +// // Frame[4] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 0 Rows // +-------------------+-----------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -67,13 +67,13 @@ // | Type: []time.Time | Type: []float64 | Type: []float64 | Type: []float64 | Type: []int8 | // +-------------------+-----------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ // +-------------------+-----------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ -// -// -// +// +// +// // Frame[5] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 0 Rows // +-------------------+--------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -81,13 +81,13 @@ // | Type: []time.Time | Type: []float64 | Type: []float64 | Type: []float64 | Type: []int8 | // +-------------------+--------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ // +-------------------+--------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ -// -// -// +// +// +// // Frame[6] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 0 Rows // +-------------------+------------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -95,13 +95,13 @@ // | Type: []time.Time | Type: []float64 | Type: []float64 | Type: []float64 | Type: []int8 | // +-------------------+------------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ // +-------------------+------------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ -// -// -// +// +// +// // Frame[7] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 0 Rows // +-------------------+--------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -109,13 +109,13 @@ // | Type: []time.Time | Type: []float64 | Type: []float64 | Type: []float64 | Type: []int8 | // +-------------------+--------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ // +-------------------+--------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ -// -// -// +// +// +// // Frame[8] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 1 Rows // +-------------------------------+--------------------------------------------------------------------------------------------+----------------------+----------------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -124,13 +124,13 @@ // +-------------------------------+--------------------------------------------------------------------------------------------+----------------------+----------------------+---------------+ // | 2022-04-14 19:08:20 +0000 UTC | 0.05255602595335715 | 0.057312752700291944 | 0.003508784241348215 | 0 | // +-------------------------------+--------------------------------------------------------------------------------------------+----------------------+----------------------+---------------+ -// -// -// +// +// +// // Frame[9] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 0 Rows // +-------------------+---------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -138,13 +138,13 @@ // | Type: []time.Time | Type: []float64 | Type: []float64 | Type: []float64 | Type: []int8 | // +-------------------+---------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ // +-------------------+---------------------------------------------------------------------------------------------+-----------------+-----------------+---------------+ -// -// -// +// +// +// // Frame[10] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 426 Rows // +-------------------------------+------------------------------------------------------------------------------------+-----------------------+-----------------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -162,13 +162,13 @@ // | 2022-04-14 19:08:20 +0000 UTC | 0.002762135864009951 | 0.0030121305183748843 | 0.30175469375429953 | 0 | // | ... | ... | ... | ... | ... | // +-------------------------------+------------------------------------------------------------------------------------+-----------------------+-----------------------+---------------+ -// -// -// +// +// +// // Frame[11] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 1 Rows // +-------------------------------+-------------------------------------------------------------------------------------+--------------------+-----------------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -177,13 +177,13 @@ // +-------------------------------+-------------------------------------------------------------------------------------+--------------------+-----------------------+---------------+ // | 2022-04-14 19:08:20 +0000 UTC | 1 | 1.0905077326652577 | 0.0035087596183873042 | 0 | // +-------------------------------+-------------------------------------------------------------------------------------+--------------------+-----------------------+---------------+ -// -// -// +// +// +// // Frame[12] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 6 Rows // +-------------------------------+-----------------------------------------------------------------------------------+--------------------+----------------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -197,13 +197,13 @@ // | 2022-04-14 19:13:20 +0000 UTC | 0.8408964152537144 | 0.9170040432046711 | 0.003508771929824561 | 0 | // | 2022-04-14 19:13:20 +0000 UTC | 1 | 1.0905077326652577 | 0.003508771929824561 | 0 | // +-------------------------------+-----------------------------------------------------------------------------------+--------------------+----------------------+---------------+ -// -// -// +// +// +// // Frame[13] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 269 Rows // +-------------------------------+---------------------------------------------------------------------------+------------------------+--------------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -221,13 +221,13 @@ // | 2022-04-14 19:08:20 +0000 UTC | 9.07293025972535e-06 | 9.894100606163098e-06 | 3.533338799658994 | 0 | // | ... | ... | ... | ... | ... | // +-------------------------------+---------------------------------------------------------------------------+------------------------+--------------------+---------------+ -// -// -// +// +// +// // Frame[14] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 303 Rows // +-------------------------------+-----------------------------------------------------------------------------------------------------------------+-----------------------+----------------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -245,13 +245,13 @@ // | 2022-04-14 19:08:20 +0000 UTC | 0.005065779510355506 | 0.005524271728019902 | 0.06666662973235489 | 0 | // | ... | ... | ... | ... | ... | // +-------------------------------+-----------------------------------------------------------------------------------------------------------------+-----------------------+----------------------+---------------+ -// -// -// +// +// +// // Frame[15] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 56 Rows // +-------------------------------+------------------------------------------------------------------------------------------------------+-----------------------+-----------------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -269,13 +269,13 @@ // | 2022-04-14 19:10:00 +0000 UTC | 0.005524271728019902 | 0.0060242610367497685 | 0.00713925 | 0 | // | ... | ... | ... | ... | ... | // +-------------------------------+------------------------------------------------------------------------------------------------------+-----------------------+-----------------------+---------------+ -// -// -// +// +// +// // Frame[16] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 41 Rows // +-------------------------------+-----------------------------------------------------------------------------------------------------+-----------------------+-----------------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -293,13 +293,13 @@ // | 2022-04-14 19:10:00 +0000 UTC | 0.0060242610367497685 | 0.006569503244169644 | 0.0035300277777777778 | 0 | // | ... | ... | ... | ... | ... | // +-------------------------------+-----------------------------------------------------------------------------------------------------+-----------------------+-----------------------+---------------+ -// -// -// +// +// +// // Frame[17] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 29 Rows // +-------------------------------+-----------------------------------------------------------------------------------------------------------+----------------------+-----------------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -317,13 +317,13 @@ // | 2022-04-14 19:11:40 +0000 UTC | 0.04052623608284405 | 0.044194173824159216 | 0.003508771929824561 | 0 | // | ... | ... | ... | ... | ... | // +-------------------------------+-----------------------------------------------------------------------------------------------------------+----------------------+-----------------------+---------------+ -// -// -// +// +// +// // Frame[18] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 38 Rows // +-------------------------------+------------------------------------------------------------------------------------------------------+----------------------+-----------------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -341,13 +341,13 @@ // | 2022-04-14 19:11:40 +0000 UTC | 0.0060242610367497685 | 0.006569503244169644 | 0.003508771929824561 | 0 | // | ... | ... | ... | ... | ... | // +-------------------------------+------------------------------------------------------------------------------------------------------+----------------------+-----------------------+---------------+ -// -// -// +// +// +// // Frame[19] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 195 Rows // +-------------------------------+---------------------------------------------------------------------------------------------+-----------------------+----------------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -365,13 +365,13 @@ // | 2022-04-14 19:08:20 +0000 UTC | 0.0021298979153618314 | 0.0023226701464896895 | 0.07368416128056675 | 0 | // | ... | ... | ... | ... | ... | // +-------------------------------+---------------------------------------------------------------------------------------------+-----------------------+----------------------+---------------+ -// -// -// +// +// +// // Frame[20] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 261 Rows // +-------------------------------+-------------------------------------------------------------------------------------------+-----------------------+-----------------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -389,13 +389,13 @@ // | 2022-04-14 19:08:20 +0000 UTC | 0.0009765625 | 0.0010649489576809157 | 0.03508765774105932 | 0 | // | ... | ... | ... | ... | ... | // +-------------------------------+-------------------------------------------------------------------------------------------+-----------------------+-----------------------+---------------+ -// -// -// +// +// +// // Frame[21] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 176 Rows // +-------------------------------+-------------------------------------------------------------------------------------------------------+-----------------------+-----------------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -413,13 +413,13 @@ // | 2022-04-14 19:08:20 +0000 UTC | 0.009290680585958758 | 0.010131559020711013 | 0.003508771929824561 | 0 | // | ... | ... | ... | ... | ... | // +-------------------------------+-------------------------------------------------------------------------------------------------------+-----------------------+-----------------------+---------------+ -// -// -// +// +// +// // Frame[22] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 255 Rows // +-------------------------------+-------------------------------------------------------------------------------------------------------------+-----------------------+----------------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -437,13 +437,13 @@ // | 2022-04-14 19:08:20 +0000 UTC | 0.04052623608284405 | 0.044194173824159216 | 0 | 0 | // | ... | ... | ... | ... | ... | // +-------------------------------+-------------------------------------------------------------------------------------------------------------+-----------------------+----------------------+---------------+ -// -// -// +// +// +// // Frame[23] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 167 Rows // +-------------------------------+------------------------------------------------------------------------------------+------------------------+-----------------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -461,10 +461,11 @@ // | 2022-04-14 19:08:20 +0000 UTC | 1.1766134837401892e-05 | 1.2831061023768835e-05 | 0.1578945767934209 | 0 | // | ... | ... | ... | ... | ... | // +-------------------------------+------------------------------------------------------------------------------------+------------------------+-----------------------+---------------+ -// -// +// +// // 🌟 This was machine generated. Do not edit. 🌟 { + "status": 200, "frames": [ { "schema": { diff --git a/pkg/util/converter/testdata/prom-matrix-wide-frame.jsonc b/pkg/util/converter/testdata/prom-matrix-wide-frame.jsonc index 5ef32b61126..affb83ab5b2 100644 --- a/pkg/util/converter/testdata/prom-matrix-wide-frame.jsonc +++ b/pkg/util/converter/testdata/prom-matrix-wide-frame.jsonc @@ -21,6 +21,7 @@ // // 🌟 This was machine generated. Do not edit. 🌟 { + "status": 200, "frames": [ { "schema": { diff --git a/pkg/util/converter/testdata/prom-matrix-with-nans-frame.jsonc b/pkg/util/converter/testdata/prom-matrix-with-nans-frame.jsonc index 2daafd89b11..f527d47df0d 100644 --- a/pkg/util/converter/testdata/prom-matrix-with-nans-frame.jsonc +++ b/pkg/util/converter/testdata/prom-matrix-with-nans-frame.jsonc @@ -1,7 +1,7 @@ // 🌟 This was machine generated. Do not edit. 🌟 // // Frame[0] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "custom": { // "resultType": "matrix" // } @@ -21,11 +21,12 @@ // // 🌟 This was machine generated. Do not edit. 🌟 { + "status": 200, "frames": [ { "schema": { "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "custom": { "resultType": "matrix" } diff --git a/pkg/util/converter/testdata/prom-matrix-with-nans-wide-frame.jsonc b/pkg/util/converter/testdata/prom-matrix-with-nans-wide-frame.jsonc index 8bb09734b4b..c53e80c0c73 100644 --- a/pkg/util/converter/testdata/prom-matrix-with-nans-wide-frame.jsonc +++ b/pkg/util/converter/testdata/prom-matrix-with-nans-wide-frame.jsonc @@ -21,6 +21,7 @@ // // 🌟 This was machine generated. Do not edit. 🌟 { + "status": 200, "frames": [ { "schema": { diff --git a/pkg/util/converter/testdata/prom-scalar-frame.jsonc b/pkg/util/converter/testdata/prom-scalar-frame.jsonc index 898d6f03e73..bd0d2cacdd5 100644 --- a/pkg/util/converter/testdata/prom-scalar-frame.jsonc +++ b/pkg/util/converter/testdata/prom-scalar-frame.jsonc @@ -1,7 +1,7 @@ // 🌟 This was machine generated. Do not edit. 🌟 // // Frame[0] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "custom": { // "resultType": "scalar" // } @@ -19,11 +19,12 @@ // // 🌟 This was machine generated. Do not edit. 🌟 { + "status": 200, "frames": [ { "schema": { "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "custom": { "resultType": "scalar" } diff --git a/pkg/util/converter/testdata/prom-scalar-wide-frame.jsonc b/pkg/util/converter/testdata/prom-scalar-wide-frame.jsonc index 898d6f03e73..bd0d2cacdd5 100644 --- a/pkg/util/converter/testdata/prom-scalar-wide-frame.jsonc +++ b/pkg/util/converter/testdata/prom-scalar-wide-frame.jsonc @@ -1,7 +1,7 @@ // 🌟 This was machine generated. Do not edit. 🌟 // // Frame[0] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "custom": { // "resultType": "scalar" // } @@ -19,11 +19,12 @@ // // 🌟 This was machine generated. Do not edit. 🌟 { + "status": 200, "frames": [ { "schema": { "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "custom": { "resultType": "scalar" } diff --git a/pkg/util/converter/testdata/prom-series-frame.jsonc b/pkg/util/converter/testdata/prom-series-frame.jsonc index 49e103ead0d..295b59823ed 100644 --- a/pkg/util/converter/testdata/prom-series-frame.jsonc +++ b/pkg/util/converter/testdata/prom-series-frame.jsonc @@ -16,6 +16,7 @@ // // 🌟 This was machine generated. Do not edit. 🌟 { + "status": 200, "frames": [ { "schema": { diff --git a/pkg/util/converter/testdata/prom-series-wide-frame.jsonc b/pkg/util/converter/testdata/prom-series-wide-frame.jsonc index 49e103ead0d..295b59823ed 100644 --- a/pkg/util/converter/testdata/prom-series-wide-frame.jsonc +++ b/pkg/util/converter/testdata/prom-series-wide-frame.jsonc @@ -16,6 +16,7 @@ // // 🌟 This was machine generated. Do not edit. 🌟 { + "status": 200, "frames": [ { "schema": { diff --git a/pkg/util/converter/testdata/prom-string-frame.jsonc b/pkg/util/converter/testdata/prom-string-frame.jsonc index 33b3daf5d9e..6307e2916bc 100644 --- a/pkg/util/converter/testdata/prom-string-frame.jsonc +++ b/pkg/util/converter/testdata/prom-string-frame.jsonc @@ -1,7 +1,7 @@ // 🌟 This was machine generated. Do not edit. 🌟 // // Frame[0] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "custom": { // "resultType": "string" // } @@ -19,11 +19,12 @@ // // 🌟 This was machine generated. Do not edit. 🌟 { + "status": 200, "frames": [ { "schema": { "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "custom": { "resultType": "string" } diff --git a/pkg/util/converter/testdata/prom-string-wide-frame.jsonc b/pkg/util/converter/testdata/prom-string-wide-frame.jsonc index 33b3daf5d9e..6307e2916bc 100644 --- a/pkg/util/converter/testdata/prom-string-wide-frame.jsonc +++ b/pkg/util/converter/testdata/prom-string-wide-frame.jsonc @@ -1,7 +1,7 @@ // 🌟 This was machine generated. Do not edit. 🌟 // // Frame[0] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "custom": { // "resultType": "string" // } @@ -19,11 +19,12 @@ // // 🌟 This was machine generated. Do not edit. 🌟 { + "status": 200, "frames": [ { "schema": { "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "custom": { "resultType": "string" } diff --git a/pkg/util/converter/testdata/prom-vector-frame.jsonc b/pkg/util/converter/testdata/prom-vector-frame.jsonc index 587cba760ac..cdd2532fa5f 100644 --- a/pkg/util/converter/testdata/prom-vector-frame.jsonc +++ b/pkg/util/converter/testdata/prom-vector-frame.jsonc @@ -1,7 +1,7 @@ // 🌟 This was machine generated. Do not edit. 🌟 // // Frame[0] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "custom": { // "resultType": "vector" // } @@ -19,7 +19,7 @@ // // // Frame[1] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "custom": { // "resultType": "vector" // } @@ -37,7 +37,7 @@ // // // Frame[2] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "custom": { // "resultType": "vector" // } @@ -55,7 +55,7 @@ // // // Frame[3] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "custom": { // "resultType": "vector" // } @@ -73,7 +73,7 @@ // // // Frame[4] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "custom": { // "resultType": "vector" // } @@ -91,11 +91,12 @@ // // 🌟 This was machine generated. Do not edit. 🌟 { + "status": 200, "frames": [ { "schema": { "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "custom": { "resultType": "vector" } @@ -136,7 +137,7 @@ { "schema": { "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "custom": { "resultType": "vector" } @@ -177,7 +178,7 @@ { "schema": { "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "custom": { "resultType": "vector" } @@ -225,7 +226,7 @@ { "schema": { "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "custom": { "resultType": "vector" } @@ -273,7 +274,7 @@ { "schema": { "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "custom": { "resultType": "vector" } diff --git a/pkg/util/converter/testdata/prom-vector-histogram-no-labels-frame.jsonc b/pkg/util/converter/testdata/prom-vector-histogram-no-labels-frame.jsonc index e6f3f1ec5bf..21f3e31e35e 100644 --- a/pkg/util/converter/testdata/prom-vector-histogram-no-labels-frame.jsonc +++ b/pkg/util/converter/testdata/prom-vector-histogram-no-labels-frame.jsonc @@ -1,9 +1,9 @@ // 🌟 This was machine generated. Do not edit. 🌟 -// +// // Frame[0] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 134 Rows // +-----------------------------------+------------------------+------------------------+---------------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -21,10 +21,11 @@ // | 2022-04-14 20:21:08.042 +0000 UTC | 9.07293025972535e-06 | 9.894100606163098e-06 | 3.392982456140351 | 0 | // | ... | ... | ... | ... | ... | // +-----------------------------------+------------------------+------------------------+---------------------+---------------+ -// -// +// +// // 🌟 This was machine generated. Do not edit. 🌟 { + "status": 200, "frames": [ { "schema": { diff --git a/pkg/util/converter/testdata/prom-vector-histogram-no-labels-wide-frame.jsonc b/pkg/util/converter/testdata/prom-vector-histogram-no-labels-wide-frame.jsonc index e6f3f1ec5bf..21f3e31e35e 100644 --- a/pkg/util/converter/testdata/prom-vector-histogram-no-labels-wide-frame.jsonc +++ b/pkg/util/converter/testdata/prom-vector-histogram-no-labels-wide-frame.jsonc @@ -1,9 +1,9 @@ // 🌟 This was machine generated. Do not edit. 🌟 -// +// // Frame[0] { // "type": "heatmap-cells" // } -// Name: +// Name: // Dimensions: 5 Fields by 134 Rows // +-----------------------------------+------------------------+------------------------+---------------------+---------------+ // | Name: xMax | Name: yMin | Name: yMax | Name: count | Name: yLayout | @@ -21,10 +21,11 @@ // | 2022-04-14 20:21:08.042 +0000 UTC | 9.07293025972535e-06 | 9.894100606163098e-06 | 3.392982456140351 | 0 | // | ... | ... | ... | ... | ... | // +-----------------------------------+------------------------+------------------------+---------------------+---------------+ -// -// +// +// // 🌟 This was machine generated. Do not edit. 🌟 { + "status": 200, "frames": [ { "schema": { diff --git a/pkg/util/converter/testdata/prom-vector-wide-frame.jsonc b/pkg/util/converter/testdata/prom-vector-wide-frame.jsonc index de2405c1fab..e6cd4985d55 100644 --- a/pkg/util/converter/testdata/prom-vector-wide-frame.jsonc +++ b/pkg/util/converter/testdata/prom-vector-wide-frame.jsonc @@ -20,6 +20,7 @@ // // 🌟 This was machine generated. Do not edit. 🌟 { + "status": 200, "frames": [ { "schema": { diff --git a/pkg/util/converter/testdata/prom-warnings-frame.jsonc b/pkg/util/converter/testdata/prom-warnings-frame.jsonc index 26f89f1ac1a..6f88319e60b 100644 --- a/pkg/util/converter/testdata/prom-warnings-frame.jsonc +++ b/pkg/util/converter/testdata/prom-warnings-frame.jsonc @@ -1,7 +1,7 @@ // 🌟 This was machine generated. Do not edit. 🌟 // // Frame[0] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "custom": { // "resultType": "vector" // }, @@ -29,7 +29,7 @@ // // // Frame[1] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "custom": { // "resultType": "vector" // }, @@ -57,7 +57,7 @@ // // // Frame[2] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "custom": { // "resultType": "vector" // }, @@ -85,7 +85,7 @@ // // // Frame[3] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "custom": { // "resultType": "vector" // }, @@ -113,7 +113,7 @@ // // // Frame[4] { -// "type": "timeseries-many", +// "type": "timeseries-multi", // "custom": { // "resultType": "vector" // }, @@ -141,11 +141,12 @@ // // 🌟 This was machine generated. Do not edit. 🌟 { + "status": 200, "frames": [ { "schema": { "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "custom": { "resultType": "vector" }, @@ -196,7 +197,7 @@ { "schema": { "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "custom": { "resultType": "vector" }, @@ -247,7 +248,7 @@ { "schema": { "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "custom": { "resultType": "vector" }, @@ -305,7 +306,7 @@ { "schema": { "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "custom": { "resultType": "vector" }, @@ -363,7 +364,7 @@ { "schema": { "meta": { - "type": "timeseries-many", + "type": "timeseries-multi", "custom": { "resultType": "vector" }, diff --git a/pkg/util/converter/testdata/prom-warnings-wide-frame.jsonc b/pkg/util/converter/testdata/prom-warnings-wide-frame.jsonc index c4b1c7aa96f..36fac2a7969 100644 --- a/pkg/util/converter/testdata/prom-warnings-wide-frame.jsonc +++ b/pkg/util/converter/testdata/prom-warnings-wide-frame.jsonc @@ -30,6 +30,7 @@ // // 🌟 This was machine generated. Do not edit. 🌟 { + "status": 200, "frames": [ { "schema": {