Browse Source

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

Marcus Efraimsson 7 years ago
parent
commit
e32cf75c2d
1 changed files with 5 additions and 0 deletions
  1. 5 0
      pkg/tsdb/sql_engine.go

+ 5 - 0
pkg/tsdb/sql_engine.go

@@ -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