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

influxdb: another minor refactor of #9474

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-11-17 15:23:45 +01:00
parent 37409163b9
commit 6595be95eb
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/app/plugins/datasource/influxdb/query_builder.ts
View File

@@ -49,16 +49,18 @@ export class InfluxQueryBuilder {
} else if (type === 'FIELDS') { } else if (type === 'FIELDS') {
measurement = this.target.measurement; measurement = this.target.measurement;
policy = this.target.policy; policy = this.target.policy;
if (!measurement.match('^/.*/')) { if (!measurement.match('^/.*/')) {
measurement = '"' + measurement + '"'; measurement = '"' + measurement + '"';
if (policy) {
if (!policy.match('^/.*/')) { if (policy && policy !== 'default') {
policy = '"' + policy + '"'; policy = '"' + policy + '"';
}
measurement = policy + '.' + measurement; measurement = policy + '.' + measurement;
} }
} }
return 'SHOW FIELD KEYS FROM ' + measurement; return 'SHOW FIELD KEYS FROM ' + measurement;
} else if (type === 'RETENTION POLICIES') { } else if (type === 'RETENTION POLICIES') {
query = 'SHOW RETENTION POLICIES on "' + this.database + '"'; query = 'SHOW RETENTION POLICIES on "' + this.database + '"';
return query; return query;
@@ -70,9 +72,7 @@ export class InfluxQueryBuilder {
} }
if (policy && policy !== 'default') { if (policy && policy !== 'default') {
if (!policy.match('^/.*/') && !policy.match(/^merge\(.*\)/)) { policy = '"' + policy + '"';
policy = '"' + policy + '"';
}
measurement = policy + '.' + measurement; measurement = policy + '.' + measurement;
} }