root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 84 Packages Projects Releases Wiki Activity

small change to influxdb template to support older versions of influxdb

This commit is contained in:
Torkel Ödegaard 2014-05-10 01:40:08 +02:00
parent f4568ef589
commit 07610a5f92
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/services/influxdb/influxdbDatasource.js
View File

@ -62,10 +62,16 @@ function (angular, _, kbn) {
query = queryElements.join(" "); query = queryElements.join(" ");
} }
else { 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]] " + "where [[timeFilter]] [[condition_add]] [[condition_key]] [[condition_op]] [[condition_value]] " +
"group by time([[interval]]) order asc"; "group by time([[interval]]) order asc";
if (target.column.indexOf('-') !== -1 || target.column.indexOf('.') !== -1) {
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";
}
var templateData = { var templateData = {
series: target.series, series: target.series,
column: target.column, column: target.column,