From 25f08ddd39661b571d767a8ecae07f13cd6eca1d Mon Sep 17 00:00:00 2001
From: Mitsuhiro Tanda <mitsuhiro.tanda@gmail.com>
Date: Fri, 11 Mar 2016 16:59:06 +0900
Subject: [PATCH] (cloudwatch) change parameter form of
 ec2_instance_attribute()

---
 public/app/plugins/datasource/cloudwatch/datasource.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/app/plugins/datasource/cloudwatch/datasource.js b/public/app/plugins/datasource/cloudwatch/datasource.js
index 5d093640b1e..cdaeebb83b8 100644
--- a/public/app/plugins/datasource/cloudwatch/datasource.js
+++ b/public/app/plugins/datasource/cloudwatch/datasource.js
@@ -205,14 +205,14 @@ function (angular, _, moment, dateMath, CloudWatchAnnotationQuery) {
         });
       }
 
-      var ec2InstanceAttributeQuery = query.match(/^ec2_instance_attribute\(([^,]+?),\s?([^,]+?),\s?([^)]+)\)/);
+      var ec2InstanceAttributeQuery = query.match(/^ec2_instance_attribute\(([^,]+?),\s?([^,]+?),\s?(.+?)\)/);
       if (ec2InstanceAttributeQuery) {
         region = templateSrv.replace(ec2InstanceAttributeQuery[1]);
         var filterJson = JSON.parse(templateSrv.replace(ec2InstanceAttributeQuery[3]));
-        var filter = _.map(filterJson, function(f) {
+        var filter = _.map(filterJson, function(values, name) {
           return {
-            Name: f.slice(0, f.indexOf('=')),
-            Values: f.slice(f.indexOf('=') + 1).split(',')
+            Name: name,
+            Values: values
           };
         });
         var targetAttributeName = templateSrv.replace(ec2InstanceAttributeQuery[2]);