From c1266abb98fcb92172d114bb71107a68a7dccaad Mon Sep 17 00:00:00 2001 From: Stefan Majer Date: Tue, 6 May 2014 08:38:09 +0200 Subject: [PATCH 1/3] Quote timeseries names to be able to have special character such as @ in a seriename. --- src/app/services/influxdb/influxdbDatasource.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/services/influxdb/influxdbDatasource.js b/src/app/services/influxdb/influxdbDatasource.js index 7da26744418..5a7a36a7c31 100644 --- a/src/app/services/influxdb/influxdbDatasource.js +++ b/src/app/services/influxdb/influxdbDatasource.js @@ -62,7 +62,7 @@ function (angular, _, kbn) { query = queryElements.join(" "); } else { - var template = "select [[func]](\"[[column]]\") as \"[[column]]_[[func]]\" from [[series]] " + + var template = "select [[func]](\"[[column]]\") as \"[[column]]_[[func]]\" from \"[[series]]\" " + "where [[timeFilter]] [[condition_add]] [[condition_key]] [[condition_op]] [[condition_value]] " + "group by time([[interval]]) order asc"; From c9df61c43c45479295ab93440d7884fd629c0381 Mon Sep 17 00:00:00 2001 From: Stefan Majer Date: Tue, 6 May 2014 08:42:49 +0200 Subject: [PATCH 2/3] Quote timeseries names to be able to have special character such as @ in a seriename. --- src/app/services/influxdb/influxdbDatasource.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/services/influxdb/influxdbDatasource.js b/src/app/services/influxdb/influxdbDatasource.js index 5a7a36a7c31..c9031d9e225 100644 --- a/src/app/services/influxdb/influxdbDatasource.js +++ b/src/app/services/influxdb/influxdbDatasource.js @@ -93,7 +93,7 @@ function (angular, _, kbn) { }; InfluxDatasource.prototype.listColumns = function(seriesName) { - return this.doInfluxRequest('select * from ' + seriesName + ' limit 1').then(function(data) { + return this.doInfluxRequest('select * from "' + seriesName + '" limit 1').then(function(data) { if (!data) { return []; } From 02bf5f9a5826cd6bbeb67b0e081d90bf76040acc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sun, 25 May 2014 17:04:51 +0200 Subject: [PATCH 3/3] updated changelog with PR #390, special characters in series names (influxdb) --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 262a17ddc3d..b2ae73d196f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ vNext - New Y-axis formater for metric values that represent seconds (Issue #427) - thx @jippi +- Allow special characters in serie names (influxdb datasource), PR #390 - thx @majst01 # 1.5.4 (2014-05-13) ### New features and improvements