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

fix usage of metric column types so that you don't need to specify metric alias

Browse Source
This commit is contained in:
Marcus Efraimsson 2018-07-30 13:50:18 +02:00
parent 3aa4790979
commit e32cf75c2d
No known key found for this signature in database
GPG Key ID: EBFE0FB04612DD4A
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/tsdb/sql_engine.go
View File

@ -75,6 +75,10 @@ var NewSqlQueryEndpoint = func(config *SqlQueryEndpointConfiguration, rowTransfo
queryEndpoint.timeColumnNames = config.TimeColumnNames queryEndpoint.timeColumnNames = config.TimeColumnNames
} }
if len(config.MetricColumnTypes) > 0 {
queryEndpoint.metricColumnTypes = config.MetricColumnTypes
}
engineCache.Lock() engineCache.Lock()
defer engineCache.Unlock() defer engineCache.Unlock()
@ -249,6 +253,7 @@ func (e *sqlQueryEndpoint) transformToTimeSeries(query *Query, rows *core.Rows,
columnType := columnTypes[i].DatabaseTypeName() columnType := columnTypes[i].DatabaseTypeName()
for _, mct := range e.metricColumnTypes { for _, mct := range e.metricColumnTypes {
e.log.Info(mct)
if columnType == mct { if columnType == mct {
metricIndex = i metricIndex = i
continue continue