Commit 529cb433 by Torkel Ödegaard

Merge branch 'master' of github.com:grafana/grafana into query-editor-style

parents 1a433de0 6bc898b2
......@@ -162,13 +162,13 @@ export default class InfluxQuery {
return str + '"' + tag.key + '" ' + operator + ' ' + value;
}
getMeasurementAndPolicy() {
getMeasurementAndPolicy(interpolate) {
var policy = this.target.policy;
var measurement = this.target.measurement;
if (!measurement.match('^/.*/')) {
measurement = '"' + measurement+ '"';
} else {
} else if (interpolate) {
measurement = this.templateSrv.replace(measurement, this.scopedVars, 'regex');
}
......@@ -212,7 +212,7 @@ export default class InfluxQuery {
query += selectText;
}
query += ' FROM ' + this.getMeasurementAndPolicy() + ' WHERE ';
query += ' FROM ' + this.getMeasurementAndPolicy(interpolate) + ' WHERE ';
var conditions = _.map(target.tags, (tag, index) => {
return this.renderTagCondition(tag, index, interpolate);
});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment