From 5850ae51b180becf5a50d8a070921721fb40a8a3 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Tanda Date: Fri, 29 Sep 2017 13:24:18 +0900 Subject: [PATCH] fix, add targetContainsTemplate() --- public/app/plugins/datasource/cloudwatch/datasource.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/public/app/plugins/datasource/cloudwatch/datasource.js b/public/app/plugins/datasource/cloudwatch/datasource.js index 192713b4bd4..f6ea196e764 100644 --- a/public/app/plugins/datasource/cloudwatch/datasource.js +++ b/public/app/plugins/datasource/cloudwatch/datasource.js @@ -300,6 +300,15 @@ function (angular, _, moment, dateMath, kbn, templatingVariable) { }); }; + this.targetContainsTemplate = function(target) { + return templateSrv.variableExists(target.region) || + templateSrv.variableExists(target.namespace) || + templateSrv.variableExists(target.metricName) || + _.find(target.dimensions, function(v, k) { + return templateSrv.variableExists(k) || templateSrv.variableExists(v); + }); + }; + this.testDatasource = function() { /* use billing metrics for test */ var region = this.defaultRegion;