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

public/app/plugins/datasource/influxdb/queryBuilder.js

@@ -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) {

public/test/specs/influx09-querybuilder-specs.js

@@ -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');