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

feat(influxdb): escape influxdb tag values, fixes #3950

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-02-08 10:31:26 +01:00
parent 7f83be3d0d
commit de90ad8967
2 changed files with 4 additions and 4 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

@ -6,8 +6,8 @@ import queryPart from './query_part';
export default class InfluxQuery {
target: any;
selectModels: any[];
groupByParts: any;
queryBuilder: any;
groupByParts: any;
constructor(target) {
this.target = target;
@ -144,7 +144,7 @@ export default class InfluxQuery {
// quote value unless regex
if (operator !== '=~' && operator !== '!~') {
value = "'" + value + "'";
value = "'" + value.replace('\\', '\\\\') + "'";
}
return str + '"' + tag.key + '" ' + operator + ' ' + value;

4
public/app/plugins/datasource/influxdb/specs/influx_query_specs.ts
View File

@ -51,12 +51,12 @@ describe('InfluxQuery', function() {
var query = new InfluxQuery({
measurement: 'cpu',
groupBy: [{type: 'time', params: ['auto']}],
tags: [{key: 'hostname', value: 'server1'}]
tags: [{key: 'hostname', value: 'server\\1'}]
});
var queryText = query.render();
expect(queryText).to.be('SELECT mean("value") FROM "cpu" WHERE "hostname" = \'server1\' AND $timeFilter'
expect(queryText).to.be('SELECT mean("value") FROM "cpu" WHERE "hostname" = \'server\\\\1\' AND $timeFilter'
+ ' GROUP BY time($interval)');
});