Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SQL: Fixes issues with showing value column name prefix in legends #35839

Merged
merged 7 commits into from
Jun 18, 2021
Merged

SQL: Fixes issues with showing value column name prefix in legends #35839

Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e9e1d1c
rename strategy
ryantxu Jun 16, 2021
9516ee5
Update pkg/tsdb/sqleng/sql_engine.go
ryantxu Jun 16, 2021
2174305
more strict constraints
ryantxu Jun 16, 2021
5ad38ba
Fixed so that it works on multi series results
torkelo Jun 17, 2021
2ead9b1
only apply the logic when original query returns 3 fields
torkelo Jun 17, 2021
12d7b05
removed part of comment
torkelo Jun 17, 2021
706ea50
Update mysql test
torkelo Jun 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 16 additions & 0 deletions pkg/tsdb/sqleng/sql_engine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,22 @@ func (e *dataPlugin) executeQuery(query plugins.DataSubQuery, wg *sync.WaitGroup
errAppendDebug("failed to convert long to wide series when converting from dataframe", err, interpolatedQuery)
return
}

// Before 8x, a special metric column was used to name time series. The LongToWide transforms that into a metric label on the value field.
// But that makes series name have both the value column name AND the metric name. So here we are removing the metric label here and moving it to the
// field name to get the same naming for the series as pre v8
// This will migrate special "metric"=name from label to field name
if len(frame.Fields) == 2 {
for _, field := range frame.Fields {
if len(field.Labels) == 1 { // 7x only supported one label
name, ok := field.Labels["metric"]
if ok {
field.Name = name
field.Labels = nil
}
}
}
}
}
if qm.FillMissing != nil {
var err error
Expand Down