From 6a697eed2f0669f85e979c9036520582a6db5ade Mon Sep 17 00:00:00 2001
From: Mitsuhiro Tanda <mitsuhiro.tanda@gmail.com>
Date: Thu, 6 Aug 2015 14:41:06 +0900
Subject: [PATCH] fix deactivating statistics bug

---
 .../plugins/datasource/cloudwatch/datasource.js    | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/public/app/plugins/datasource/cloudwatch/datasource.js b/public/app/plugins/datasource/cloudwatch/datasource.js
index b5709e8935f..3e7d3fb1429 100644
--- a/public/app/plugins/datasource/cloudwatch/datasource.js
+++ b/public/app/plugins/datasource/cloudwatch/datasource.js
@@ -46,7 +46,7 @@ function (angular, _, kbn) {
             Value: target.dimensions[key]
           };
         });
-        query.statistics = _.keys(target.statistics);
+        query.statistics = getActivatedStatistics(target.statistics);
         query.period = target.period;
 
         var range = (end.getTime() - start.getTime()) / 1000;
@@ -130,7 +130,7 @@ function (angular, _, kbn) {
       var result = [];
 
       var dimensionPart = JSON.stringify(options.dimensions);
-      _.each(_.keys(options.statistics), function(s) {
+      _.each(getActivatedStatistics(options.statistics), function(s) {
         var metricLabel = md.Label + '_' + s + dimensionPart;
 
         var dps = _.map(md.Datapoints, function(value) {
@@ -144,6 +144,16 @@ function (angular, _, kbn) {
       return result;
     }
 
+    function getActivatedStatistics(statistics) {
+      var activatedStatistics = [];
+      _.each(statistics, function(v, k) {
+        if (v) {
+          activatedStatistics.push(k);
+        }
+      });
+      return activatedStatistics;
+    }
+
     function convertToCloudWatchTime(date) {
       return kbn.parseDate(date);
     }