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): removes quotes for field key queries

Browse Source 
fixes #6473
This commit is contained in:
bergquist 2016-12-16 17:08:04 +01:00
parent 3a9680939e
commit 4244551a87
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,8 +56,11 @@ function (_) {
query += ' WITH MEASUREMENT =~ /' + withMeasurementFilter +'/';
}
} else if (type === 'FIELDS') {
query = 'SHOW FIELD KEYS FROM "' + this.target.measurement + '"';
return query;
if (!this.target.measurement.match('^/.*/')) {
return 'SHOW FIELD KEYS FROM "' + this.target.measurement + '"';
} else {
return 'SHOW FIELD KEYS FROM ' + this.target.measurement;
}
} else if (type === 'RETENTION POLICIES') {
query = 'SHOW RETENTION POLICIES on "' + this.database + '"';
return query;

6
public/app/plugins/datasource/influxdb/specs/query_builder_specs.ts
View File

@ -88,6 +88,12 @@ describe('InfluxQueryBuilder', function() {
expect(query).to.be('SHOW FIELD KEYS FROM "cpu"');
});
it('should build show field query with regexp', function() {
var builder = new InfluxQueryBuilder({measurement: '/$var/', tags: [{key: 'app', value: 'email'}]});
var query = builder.buildExploreQuery('FIELDS');
expect(query).to.be('SHOW FIELD KEYS FROM /$var/');
});
it('should build show retention policies query', function() {
var builder = new InfluxQueryBuilder({measurement: 'cpu', tags: []}, 'site');
var query = builder.buildExploreQuery('RETENTION POLICIES');