mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Prometheus: Chore - Remove incorrect FrameType from exemplar frame (#57695)
This commit is contained in:
parent
6a6fdbc1f9
commit
2cd9cbd359
@ -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 {
|
||||
|
@ -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)
|
||||
}
|
||||
})
|
||||
|
@ -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)
|
||||
|
@ -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"
|
||||
},
|
||||
|
@ -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"
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user