From 2f7a59fb1878fcd05f5039012e0ffdcb256227a9 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Tanda Date: Tue, 17 Oct 2017 18:11:21 +0900 Subject: [PATCH 1/2] fix template variable expanding (cherry picked from commit 0f87279ab82b15cc4511680a5decbea8f419c266) --- public/app/plugins/datasource/cloudwatch/datasource.js | 1 + 1 file changed, 1 insertion(+) diff --git a/public/app/plugins/datasource/cloudwatch/datasource.js b/public/app/plugins/datasource/cloudwatch/datasource.js index 8037cafb3e6..d169cf56edf 100644 --- a/public/app/plugins/datasource/cloudwatch/datasource.js +++ b/public/app/plugins/datasource/cloudwatch/datasource.js @@ -354,6 +354,7 @@ function (angular, _, moment, dateMath, kbn, templatingVariable) { var t = angular.copy(target); var scopedVar = {}; scopedVar[variable.name] = v; + t.refId = target.refId + '_' + v.value; t.dimensions[dimensionKey] = templateSrv.replace(t.dimensions[dimensionKey], scopedVar); return t; }).value(); From 1ef850fae005570e669a7b23f2f7ef0006b4f5ee Mon Sep 17 00:00:00 2001 From: bergquist Date: Tue, 17 Oct 2017 11:17:34 +0200 Subject: [PATCH 2/2] prepare for v4.6.0-beta2 release --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e037b0211cf..4314e723487 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "company": "Grafana Labs" }, "name": "grafana", - "version": "4.6.0-beta1", + "version": "4.6.0-beta2", "repository": { "type": "git", "url": "http://github.com/grafana/grafana.git"