diff --git a/pkg/tsdb/prometheus/buffered/time_series_query.go b/pkg/tsdb/prometheus/buffered/time_series_query.go index bc82b0f67d8..192ca00fe68 100644 --- a/pkg/tsdb/prometheus/buffered/time_series_query.go +++ b/pkg/tsdb/prometheus/buffered/time_series_query.go @@ -598,7 +598,11 @@ func exemplarToDataFrames(response []apiv1.ExemplarQueryResult, query *Prometheu dataFields = append(dataFields, data.NewField(label, nil, labelsVector[label])) } - return append(frames, newDataFrame("exemplar", "exemplar", dataFields...)) + newFrame := newDataFrame("exemplar", "exemplar", dataFields...) + // unset on exemplars (ugly but this client will be deprecated soon) + newFrame.Meta.Type = "" + + return append(frames, newFrame) } func sortedLabels(labelsVector map[string][]string) []string { diff --git a/pkg/tsdb/prometheus/buffered/time_series_query_test.go b/pkg/tsdb/prometheus/buffered/time_series_query_test.go index c54a5576353..8d78769edc4 100644 --- a/pkg/tsdb/prometheus/buffered/time_series_query_test.go +++ b/pkg/tsdb/prometheus/buffered/time_series_query_test.go @@ -706,7 +706,11 @@ func TestPrometheus_parseTimeSeriesResponse(t *testing.T) { data.NewField("traceID", map[string]string{}, []string{"test1", "test2"}), data.NewField("userID", map[string]string{}, []string{"", "test3"}), } - if diff := cmp.Diff(newDataFrame("exemplar", "exemplar", fields...), res[0], data.FrameTestCompareOptions()...); diff != "" { + + newFrame := newDataFrame("exemplar", "exemplar", fields...) + newFrame.Meta.Type = "" + + if diff := cmp.Diff(newFrame, res[0], data.FrameTestCompareOptions()...); diff != "" { t.Errorf("Result mismatch (-want +got):\n%s", diff) } }) diff --git a/pkg/tsdb/prometheus/querydata/response.go b/pkg/tsdb/prometheus/querydata/response.go index 778fd0c0c82..b6b1a771ed0 100644 --- a/pkg/tsdb/prometheus/querydata/response.go +++ b/pkg/tsdb/prometheus/querydata/response.go @@ -160,7 +160,6 @@ func processExemplars(q *models.Query, dr *backend.DataResponse) *backend.DataRe // copy the frame metadata to the new exemplar frame exemplarFrame.Meta = frame.Meta exemplarFrame.RefID = frame.RefID - frame.Meta.Type = data.FrameTypeTimeSeriesMany step := time.Duration(frame.Fields[0].Config.Interval) * time.Millisecond seriesLabels := getSeriesLabels(frame) diff --git a/pkg/tsdb/prometheus/testdata/exemplar.result.golden.jsonc b/pkg/tsdb/prometheus/testdata/exemplar.result.golden.jsonc index 6bd04762af8..4d87b4cf262 100644 --- a/pkg/tsdb/prometheus/testdata/exemplar.result.golden.jsonc +++ b/pkg/tsdb/prometheus/testdata/exemplar.result.golden.jsonc @@ -1,7 +1,6 @@ // 🌟 This was machine generated. Do not edit. 🌟 // // Frame[0] { -// "type": "timeseries-many", // "custom": { // "resultType": "exemplar" // }, @@ -34,7 +33,6 @@ "schema": { "name": "exemplar", "meta": { - "type": "timeseries-many", "custom": { "resultType": "exemplar" }, diff --git a/pkg/tsdb/prometheus/testdata/exemplar.result.streaming-wide.golden.jsonc b/pkg/tsdb/prometheus/testdata/exemplar.result.streaming-wide.golden.jsonc index 6bd04762af8..4d87b4cf262 100644 --- a/pkg/tsdb/prometheus/testdata/exemplar.result.streaming-wide.golden.jsonc +++ b/pkg/tsdb/prometheus/testdata/exemplar.result.streaming-wide.golden.jsonc @@ -1,7 +1,6 @@ // 🌟 This was machine generated. Do not edit. 🌟 // // Frame[0] { -// "type": "timeseries-many", // "custom": { // "resultType": "exemplar" // }, @@ -34,7 +33,6 @@ "schema": { "name": "exemplar", "meta": { - "type": "timeseries-many", "custom": { "resultType": "exemplar" },