From 9a53779b6c125b470f6ee07392175413d346b60b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sun, 22 Jun 2014 18:02:43 +0200 Subject: [PATCH] Default property that marks which datasource is default in config.js is now optional (Fixes #526) --- CHANGELOG.md | 1 + src/app/services/datasourceSrv.js | 3 +++ src/app/services/influxdb/influxdbDatasource.js | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72919a93017..bf6ad182113 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ vNext - Bug in when using % sign in legends (aliases), fixed by removing url decoding of metric names (Fixes #506) - Series names and column name typeahead cache fix (Fixes #522) - Fixed influxdb issue with raw query that caused wrong value column detection (Fixes #504) +- Default property that marks which datasource is default in config.js is now optional (Fixes #526) # 1.6.0 (2014-06-16) diff --git a/src/app/services/datasourceSrv.js b/src/app/services/datasourceSrv.js index 5fa651f52be..cccdaca7ae1 100644 --- a/src/app/services/datasourceSrv.js +++ b/src/app/services/datasourceSrv.js @@ -15,6 +15,9 @@ function (angular, _, config) { this.init = function() { var defaultDatasource = _.findWhere(_.values(config.datasources), { default: true }); + if (!defaultDatasource) { + defaultDatasource = config.datasources[_.keys(config.datasources)[0]]; + } this.default = this.datasourceFactory(defaultDatasource); }; diff --git a/src/app/services/influxdb/influxdbDatasource.js b/src/app/services/influxdb/influxdbDatasource.js index d3adca618b7..c63b735b9ea 100644 --- a/src/app/services/influxdb/influxdbDatasource.js +++ b/src/app/services/influxdb/influxdbDatasource.js @@ -68,7 +68,7 @@ function (angular, _, kbn) { } else { - var template = "select [[group]][[group_comma]] [[func]](\"[[column]]\") as \"[[column]]_[[func]]\" from [[series]] " + + var template = "select [[group]][[group_comma]] [[func]]([[column]]) from [[series]] " + "where [[timeFilter]] [[condition_add]] [[condition_key]] [[condition_op]] [[condition_value]] " + "group by time([[interval]])[[group_comma]] [[group]] order asc";