From b82f1edd6393c1aac49dcb0dc3cd26f9acc8b41f Mon Sep 17 00:00:00 2001 From: Mitsuhiro Tanda Date: Wed, 28 Oct 2015 19:36:49 +0900 Subject: [PATCH] fix panel repeat for cloudwatch --- public/app/plugins/datasource/cloudwatch/datasource.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/public/app/plugins/datasource/cloudwatch/datasource.js b/public/app/plugins/datasource/cloudwatch/datasource.js index 9a9876b53ae..6a99724123b 100644 --- a/public/app/plugins/datasource/cloudwatch/datasource.js +++ b/public/app/plugins/datasource/cloudwatch/datasource.js @@ -34,7 +34,7 @@ function (angular, _) { query.region = templateSrv.replace(target.region, options.scopedVars); query.namespace = templateSrv.replace(target.namespace, options.scopedVars); query.metricName = templateSrv.replace(target.metricName, options.scopedVars); - query.dimensions = convertDimensionFormat(target.dimensions); + query.dimensions = convertDimensionFormat(target.dimensions, options.scopedVars); query.statistics = target.statistics; query.period = parseInt(target.period, 10); @@ -119,7 +119,7 @@ function (angular, _) { parameters: { namespace: templateSrv.replace(namespace), metricName: templateSrv.replace(metricName), - dimensions: convertDimensionFormat(dimensions), + dimensions: convertDimensionFormat(dimensions, {}), } }; @@ -276,11 +276,11 @@ function (angular, _) { return Math.round(date.valueOf() / 1000); } - function convertDimensionFormat(dimensions) { + function convertDimensionFormat(dimensions, scopedVars) { return _.map(dimensions, function(value, key) { return { - Name: templateSrv.replace(key), - Value: templateSrv.replace(value) + Name: templateSrv.replace(key, scopedVars), + Value: templateSrv.replace(value, scopedVars) }; }); }