public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Loki: Add feature flag to enable dataplane-compliant metric frames (#66017)

Browse Source 
* loki: add feature flag to enable dataplane-compatible metric frames

* linter fix
This commit is contained in:
Gábor Farkas
2023-04-13 15:07:08 +02:00
committed by GitHub
parent af3bf04f2e
commit 531caec602
36 changed files with 2333 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/loki/frame.go
+6 -4
View File
@@ -12,7 +12,7 @@ import (
// we adjust the dataframes to be the way frontend & alerting
// wants them.
func adjustFrame(frame *data.Frame, query *lokiQuery) error {
func adjustFrame(frame *data.Frame, query *lokiQuery, setMetricFrameName bool) error {
fields := frame.Fields
if len(fields) < 2 {
@@ -25,13 +25,13 @@ func adjustFrame(frame *data.Frame, query *lokiQuery) error {
secondField := fields[1]
if secondField.Type() == data.FieldTypeFloat64 {
return adjustMetricFrame(frame, query)
return adjustMetricFrame(frame, query, setMetricFrameName)
} else {
return adjustLogsFrame(frame, query)
}
}
func adjustMetricFrame(frame *data.Frame, query *lokiQuery) error {
func adjustMetricFrame(frame *data.Frame, query *lokiQuery, setFrameName bool) error {
fields := frame.Fields
// we check if the fields are of correct type
if len(fields) != 2 {
@@ -50,7 +50,9 @@ func adjustMetricFrame(frame *data.Frame, query *lokiQuery) error {
isMetricRange := query.QueryType == QueryTypeRange
name := formatName(labels, query)
frame.Name = name
if setFrameName {
frame.Name = name
}
if frame.Meta == nil {
frame.Meta = &data.FrameMeta{}