From 41e13fab55b4f326d85b30e53b1cc3258f7db568 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Wed, 5 Aug 2015 18:42:03 +0200
Subject: [PATCH] fix(influxdb): fix for using template variables in side alias
 field in influxdb 0.9 editor, fixes #2446

---
 CHANGELOG.md                                         | 1 +
 public/app/plugins/datasource/influxdb/datasource.js | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5989ad51079..50d421782cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 **Fixes**
 - [Issue #2443](https://github.com/grafana/grafana/issues/2443). Templating: Fix for buggy repeat row behavior when combined with with repeat panel due to recent change before 2.1 release
 - [Issue #2442](https://github.com/grafana/grafana/issues/2442). Templating: Fix text panel when using template variables in text in in repeated panel
+- [Issue #2446](https://github.com/grafana/grafana/issues/2446). InfluxDB: Fix for using template vars inside alias field (InfluxDB 0.9)
 
 # 2.1.0 (2015-08-04)
 
diff --git a/public/app/plugins/datasource/influxdb/datasource.js b/public/app/plugins/datasource/influxdb/datasource.js
index 82829a9ddb8..58d7ae7d253 100644
--- a/public/app/plugins/datasource/influxdb/datasource.js
+++ b/public/app/plugins/datasource/influxdb/datasource.js
@@ -61,6 +61,9 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) {
           if (!result || !result.series) { continue; }
 
           var alias = (options.targets[i] || {}).alias;
+          if (alias) {
+            alias = templateSrv.replace(alias, options.scopedVars);
+          }
           var targetSeries = new InfluxSeries({ series: data.results[i].series, alias: alias }).getTimeSeries();
           for (y = 0; y < targetSeries.length; y++) {
             seriesList.push(targetSeries[y]);