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

Merge branch 'master' into Tetha-hkraemer-filtersrv-object-refactoring

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-05-25 19:08:28 +02:00
commit 992bcccee9
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -1,5 +1,6 @@
vNext vNext
- New Y-axis formater for metric values that represent seconds (Issue #427) - thx @jippi - 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) # 1.5.4 (2014-05-13)
### New features and improvements ### New features and improvements

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

@ -62,16 +62,10 @@ 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,
@ -99,7 +93,7 @@ function (angular, _, kbn) {
}; };
InfluxDatasource.prototype.listColumns = function(seriesName) { 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) { if (!data) {
return []; return [];
} }