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

fix(influxdb_09): fixed handling of regex measurement in explore queries, fixes #2415

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-07-31 09:17:14 +02:00
parent 4c7e52288d
commit 7cae087eb9
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/plugins/datasource/influxdb/queryBuilder.js
View File

@@ -44,7 +44,10 @@ function (_) {
} }
if (measurement) { if (measurement) {
query += ' FROM "' + measurement + '"'; if (!measurement.match('^/.*/') && !measurement.match(/^merge\(.*\)/)) {
measurement = '"' + measurement+ '"';
}
query += ' FROM ' + measurement;
} }
if (withKey) { if (withKey) {

6
public/test/specs/influx09-querybuilder-specs.js
View File

@@ -102,6 +102,12 @@ define([
expect(query).to.be('SHOW TAG KEYS FROM "cpu"'); expect(query).to.be('SHOW TAG KEYS FROM "cpu"');
}); });
it('should handle regex measurement in tag keys query', function() {
var builder = new InfluxQueryBuilder({ measurement: '/.*/', tags: [] });
var query = builder.buildExploreQuery('TAG_KEYS');
expect(query).to.be('SHOW TAG KEYS FROM /.*/');
});
it('should have no conditions in tags keys query given query with no measurement or tag', function() { it('should have no conditions in tags keys query given query with no measurement or tag', function() {
var builder = new InfluxQueryBuilder({ measurement: '', tags: [] }); var builder = new InfluxQueryBuilder({ measurement: '', tags: [] });
var query = builder.buildExploreQuery('TAG_KEYS'); var query = builder.buildExploreQuery('TAG_KEYS');