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 pull request #4719 from nlf/master

Browse Source 
dont quote numbers for influxdb, closes #4163
This commit is contained in:
Torkel Ödegaard 2016-04-22 15:04:14 +02:00
commit 3bbc86bcf2
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/plugins/datasource/influxdb/influx_query.ts
View File

@ -152,7 +152,9 @@ export default class InfluxQuery {
if (interpolate) { if (interpolate) {
value = this.templateSrv.replace(value, this.scopedVars); value = this.templateSrv.replace(value, this.scopedVars);
} }
value = "'" + value.replace('\\', '\\\\') + "'"; if (isNaN(+value)) {
value = "'" + value.replace('\\', '\\\\') + "'";
}
} else if (interpolate){ } else if (interpolate){
value = this.templateSrv.replace(value, this.scopedVars, 'regex'); value = this.templateSrv.replace(value, this.scopedVars, 'regex');
} }

4
public/app/plugins/datasource/influxdb/query_builder.js
View File

@ -25,8 +25,8 @@ function (_) {
} }
} }
// quote value unless regex // quote value unless regex or number
if (operator !== '=~' && operator !== '!~') { if (operator !== '=~' && operator !== '!~' && isNaN(+value)) {
value = "'" + value + "'"; value = "'" + value + "'";
} }