IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixes regex InfluxDB queries intoduced in 1.6.0

Browse Source 
Do not encapsulate regex with quotes in query string
Fix the way series names are displayed, do not use column name but
rather series names
This commit is contained in:
Pauly Myjavec
2014-06-17 22:35:31 +10:00
parent 810f46c450
commit 1eadf52f5e
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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]]\") as \"[[column]]_[[func]]\" from [[series]] " +
"where [[timeFilter]] [[condition_add]] [[condition_key]] [[condition_op]] [[condition_value]] " +
"group by time([[interval]])[[group_comma]] [[group]] order asc";
@@ -86,6 +86,10 @@ function (angular, _, kbn) {
group: target.groupby_field_add ? target.groupby_field : '',
};
if(!templateData.series.match('^/.*/')) {
templateData.series = '"' + templateData.series + '"';
}
query = _.template(template, templateData, this.templateSettings);
query = filterSrv.applyTemplateToTarget(query);
@@ -112,12 +116,11 @@ 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 [];
}
return data[0].columns;
});
};
@@ -229,7 +232,7 @@ function (angular, _, kbn) {
datapoints[i] = [metricValue, groupPoints[i][timeCol]];
}
seriesName = alias ? alias : key;
seriesName = alias ? alias : series.name;
// if mulitple groups append key to alias
if (alias && groupByField) {