From 728e96e13442ed10f97488995d0f274193d9a6e2 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Tanda <mitsuhiro.tanda@gmail.com>
Date: Mon, 26 Jun 2017 16:13:30 +0900
Subject: [PATCH] fix invalid query filter

---
 public/app/plugins/datasource/cloudwatch/datasource.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/cloudwatch/datasource.js b/public/app/plugins/datasource/cloudwatch/datasource.js
index 74f93874519..c8fd9e71237 100644
--- a/public/app/plugins/datasource/cloudwatch/datasource.js
+++ b/public/app/plugins/datasource/cloudwatch/datasource.js
@@ -32,7 +32,11 @@ function (angular, _, moment, dateMath, kbn, templatingVariable, CloudWatchAnnot
       options.targets = this.expandTemplateVariable(options.targets, options.scopedVars, templateSrv);
 
       var queries = _.filter(options.targets, function (item) {
-        return item.hide !== true || !item.namespace || !item.metricName || _.isEmpty(item.statistics);
+        return item.hide !== true &&
+          !!item.region &&
+          !!item.namespace &&
+          !!item.metricName &&
+          !_.isEmpty(item.statistics);
       }).map(function (item) {
         item.region = templateSrv.replace(item.region, options.scopedVars);
         item.namespace = templateSrv.replace(item.namespace, options.scopedVars);