Merge branch 'influxdb_alias_columns' of https://github.com/thuck/grafana into…

Merge branch 'influxdb_alias_columns' of https://github.com/thuck/grafana into thuck-influxdb_alias_columns

docs/sources/datasources/influxdb.md

@@ -62,6 +62,7 @@ You can switch to raw query mode by pressing the pen icon.
 
 
 - $m = replaced with measurement name
 - $m = replaced with measurement name
 - $measurement = replaced with measurement name
 - $measurement = replaced with measurement name
+- $col = replaced with column name
 - $tag_hostname = replaced with the value of the hostname tag
 - $tag_hostname = replaced with the value of the hostname tag
 - You can also use [[tag_hostname]] pattern replacement syntax
 - You can also use [[tag_hostname]] pattern replacement syntax
 
 

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

@@ -35,7 +35,7 @@ function (_) {
         }
         }
 
 
         if (self.alias) {
         if (self.alias) {
-          seriesName = self._getSeriesName(series);
+          seriesName = self._getSeriesName(series, j);
         } else if (series.tags) {
         } else if (series.tags) {
           seriesName = seriesName + ' {' + tags.join(', ') + '}';
           seriesName = seriesName + ' {' + tags.join(', ') + '}';
         }
         }
@@ -54,13 +54,14 @@ function (_) {
     return output;
     return output;
   };
   };
 
 
-  p._getSeriesName = function(series) {
+  p._getSeriesName = function(series, index) {
     var regex = /\$(\w+)|\[\[([\s\S]+?)\]\]/g;
     var regex = /\$(\w+)|\[\[([\s\S]+?)\]\]/g;
 
 
     return this.alias.replace(regex, function(match, g1, g2) {
     return this.alias.replace(regex, function(match, g1, g2) {
       var group = g1 || g2;
       var group = g1 || g2;
 
 
       if (group === 'm' || group === 'measurement') { return series.name; }
       if (group === 'm' || group === 'measurement') { return series.name; }
+      if (group === 'col') { return series.columns[index]; }
       if (group.indexOf('tag_') !== 0) { return match; }
       if (group.indexOf('tag_') !== 0) { return match; }
 
 
       var tag = group.replace('tag_', '');
       var tag = group.replace('tag_', '');

public/app/plugins/datasource/influxdb/partials/query.editor.html

@@ -212,6 +212,7 @@
 			<ul>
 			<ul>
 				<li>$m = replaced with measurement name</li>
 				<li>$m = replaced with measurement name</li>
 				<li>$measurement = replaced with measurement name</li>
 				<li>$measurement = replaced with measurement name</li>
+				<li>$col = replaced with column name</li>
 				<li>$tag_hostname = replaced with the value of the hostname tag</li>
 				<li>$tag_hostname = replaced with the value of the hostname tag</li>
 				<li>You can also use [[tag_hostname]] pattern replacement syntax</li>
 				<li>You can also use [[tag_hostname]] pattern replacement syntax</li>
 			</ul>
 			</ul>