From f28eec8be3f7c9bc5c71ca4f22e44b5eb19a28a8 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Tanda <mitsuhiro.tanda@gmail.com>
Date: Wed, 17 Feb 2016 11:59:53 +0900
Subject: [PATCH] (cloudwatch) fix template replace with panel repeat

---
 .../plugins/datasource/cloudwatch/datasource.js    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/public/app/plugins/datasource/cloudwatch/datasource.js b/public/app/plugins/datasource/cloudwatch/datasource.js
index b621d30c81c..a2e6469014d 100644
--- a/public/app/plugins/datasource/cloudwatch/datasource.js
+++ b/public/app/plugins/datasource/cloudwatch/datasource.js
@@ -58,7 +58,7 @@ function (angular, _, moment, dateMath) {
         var result = [];
 
         _.each(allResponse, function(response, index) {
-          var metrics = transformMetricData(response, options.targets[index]);
+          var metrics = transformMetricData(response, options.targets[index], options.scopedVars);
           result = result.concat(metrics);
         });
 
@@ -302,18 +302,18 @@ function (angular, _, moment, dateMath) {
       return this.defaultRegion;
     };
 
-    function transformMetricData(md, options) {
+    function transformMetricData(md, options, scopedVars) {
       var aliasRegex = /\{\{(.+?)\}\}/g;
       var aliasPattern = options.alias || '{{metric}}_{{stat}}';
       var aliasData = {
-        region: templateSrv.replace(options.region),
-        namespace: templateSrv.replace(options.namespace),
-        metric: templateSrv.replace(options.metricName),
+        region: templateSrv.replace(options.region, scopedVars),
+        namespace: templateSrv.replace(options.namespace, scopedVars),
+        metric: templateSrv.replace(options.metricName, scopedVars),
       };
       var aliasDimensions = {};
       _.each(_.keys(options.dimensions), function(origKey) {
-        var key = templateSrv.replace(origKey);
-        var value = templateSrv.replace(options.dimensions[origKey]);
+        var key = templateSrv.replace(origKey, scopedVars);
+        var value = templateSrv.replace(options.dimensions[origKey], scopedVars);
         aliasDimensions[key] = value;
       });
       _.extend(aliasData, aliasDimensions);