From e32cf75c2d3caca0d62e3296701d63c9135e2233 Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Mon, 30 Jul 2018 13:50:18 +0200 Subject: [PATCH] fix usage of metric column types so that you don't need to specify metric alias --- pkg/tsdb/sql_engine.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/tsdb/sql_engine.go b/pkg/tsdb/sql_engine.go index 027f37fc243..29428971c64 100644 --- a/pkg/tsdb/sql_engine.go +++ b/pkg/tsdb/sql_engine.go @@ -75,6 +75,10 @@ var NewSqlQueryEndpoint = func(config *SqlQueryEndpointConfiguration, rowTransfo queryEndpoint.timeColumnNames = config.TimeColumnNames } + if len(config.MetricColumnTypes) > 0 { + queryEndpoint.metricColumnTypes = config.MetricColumnTypes + } + engineCache.Lock() defer engineCache.Unlock() @@ -249,6 +253,7 @@ func (e *sqlQueryEndpoint) transformToTimeSeries(query *Query, rows *core.Rows, columnType := columnTypes[i].DatabaseTypeName() for _, mct := range e.metricColumnTypes { + e.log.Info(mct) if columnType == mct { metricIndex = i continue