From 1eadf52f5e95c8e008e91eba63021e0285bfee15 Mon Sep 17 00:00:00 2001
From: Pauly Myjavec <Pauly.Myjavec@team.telstra.com>
Date: Tue, 17 Jun 2014 22:35:31 +1000
Subject: [PATCH] Fixes regex InfluxDB queries intoduced in 1.6.0

Do not encapsulate regex with quotes in query string
Fix the way series names are displayed, do not use column name but
rather series names
---
 src/app/services/influxdb/influxdbDatasource.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/app/services/influxdb/influxdbDatasource.js b/src/app/services/influxdb/influxdbDatasource.js
index eaca5f3c80f..3c95f5fc220 100644
--- a/src/app/services/influxdb/influxdbDatasource.js
+++ b/src/app/services/influxdb/influxdbDatasource.js
@@ -68,7 +68,7 @@ function (angular, _, kbn) {
         }
         else {
 
-          var template = "select [[group]][[group_comma]] [[func]](\"[[column]]\") as \"[[column]]_[[func]]\" from \"[[series]]\" " +
+          var template = "select [[group]][[group_comma]] [[func]](\"[[column]]\") as \"[[column]]_[[func]]\" from [[series]] " +
                          "where  [[timeFilter]] [[condition_add]] [[condition_key]] [[condition_op]] [[condition_value]] " +
                          "group by time([[interval]])[[group_comma]] [[group]] order asc";
 
@@ -86,6 +86,10 @@ function (angular, _, kbn) {
             group: target.groupby_field_add ? target.groupby_field : '',
           };
 
+          if(!templateData.series.match('^/.*/')) {
+                  templateData.series = '"' + templateData.series + '"';
+          }
+
           query = _.template(template, templateData, this.templateSettings);
           query = filterSrv.applyTemplateToTarget(query);
 
@@ -112,12 +116,11 @@ function (angular, _, kbn) {
     };
 
     InfluxDatasource.prototype.listColumns = function(seriesName) {
-      return this.doInfluxRequest('select * from "' + seriesName + '" limit 1').then(function(data) {
+      return this.doInfluxRequest('select * from /' + seriesName + '/ limit 1').then(function(data) {
         if (!data) {
           return [];
         }
 
-        return data[0].columns;
       });
     };
 
@@ -229,7 +232,7 @@ function (angular, _, kbn) {
             datapoints[i] = [metricValue, groupPoints[i][timeCol]];
           }
 
-          seriesName = alias ? alias : key;
+          seriesName = alias ? alias : series.name;
 
           // if mulitple groups append key to alias
           if (alias && groupByField) {