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

SSE/Prom: Undo empty frame change that triggers 500s in SSE (#61871)

Browse Source 
added in https://github.com/grafana/grafana/pull/61643
This commit is contained in:
Kyle Brandt 2023-01-20 12:32:14 -05:00 committed by GitHub
parent 7a9793ec0e
commit 5bb38293d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/tsdb/prometheus/querydata/response.go
View File

@ -30,12 +30,6 @@ func (s *QueryData) parseResponse(ctx context.Context, q *models.Query, res *htt
VectorWideSeries: s.enableWideSeries, VectorWideSeries: s.enableWideSeries,
}) })
// The ExecutedQueryString can be viewed in QueryInspector in UI
// Add frame to attach metadata to it
if len(r.Frames) == 0 {
r.Frames = append(r.Frames, data.NewFrame(""))
}
for _, frame := range r.Frames { for _, frame := range r.Frames {
if s.enableWideSeries { if s.enableWideSeries {
addMetadataToWideFrame(q, frame) addMetadataToWideFrame(q, frame)

21
pkg/tsdb/prometheus/testdata/exemplar.result.golden.jsonc vendored
View File

@ -26,16 +26,6 @@
// +-----------------------------------+-----------------+--------------------------------------------+----------------+-------------------+-------------------+----------------+----------------+--------------------+----------------+------------------+-----------------+-------------------+----------------------------------+ // +-----------------------------------+-----------------+--------------------------------------------+----------------+-------------------+-------------------+----------------+----------------+--------------------+----------------+------------------+-----------------+-------------------+----------------------------------+
// //
// //
//
// Frame[1] {
// "executedQueryString": "Expr: histogram_quantile(0.99, sum(rate(traces_spanmetrics_duration_seconds_bucket[15s])) by (le))\nStep: 15s"
// }
// Name:
// Dimensions: 0 Fields by 0 Rows
// +
// +
//
//
// 🌟 This was machine generated. Do not edit. 🌟 // 🌟 This was machine generated. Do not edit. 🌟
{ {
"status": 200, "status": 200,
@ -1050,17 +1040,6 @@
] ]
] ]
} }
},
{
"schema": {
"meta": {
"executedQueryString": "Expr: histogram_quantile(0.99, sum(rate(traces_spanmetrics_duration_seconds_bucket[15s])) by (le))\nStep: 15s"
},
"fields": []
},
"data": {
"values": []
}
} }
] ]
} }

21
pkg/tsdb/prometheus/testdata/exemplar.result.streaming-wide.golden.jsonc vendored
View File

@ -26,16 +26,6 @@
// +-----------------------------------+-----------------+--------------------------------------------+----------------+-------------------+-------------------+----------------+----------------+--------------------+----------------+------------------+-----------------+-------------------+----------------------------------+ // +-----------------------------------+-----------------+--------------------------------------------+----------------+-------------------+-------------------+----------------+----------------+--------------------+----------------+------------------+-----------------+-------------------+----------------------------------+
// //
// //
//
// Frame[1] {
// "executedQueryString": "Expr: histogram_quantile(0.99, sum(rate(traces_spanmetrics_duration_seconds_bucket[15s])) by (le))\nStep: 15s"
// }
// Name:
// Dimensions: 0 Fields by 0 Rows
// +
// +
//
//
// 🌟 This was machine generated. Do not edit. 🌟 // 🌟 This was machine generated. Do not edit. 🌟
{ {
"status": 200, "status": 200,
@ -1050,17 +1040,6 @@
] ]
] ]
} }
},
{
"schema": {
"meta": {
"executedQueryString": "Expr: histogram_quantile(0.99, sum(rate(traces_spanmetrics_duration_seconds_bucket[15s])) by (le))\nStep: 15s"
},
"fields": []
},
"data": {
"values": []
}
} }
] ]
} }