From b6ab86c45a428243d41c0079e6ddc504a3aa96b5 Mon Sep 17 00:00:00 2001
From: David TARDIVEL <David.TARDIVEL@b-com.com>
Date: Thu, 15 Sep 2016 17:16:38 +0200
Subject: [PATCH] Remove group_by statement in metric queries

ceilosca seems to not correctly handle group_by statement.
I remove it, because we don't need it for now.

Change-Id: Ie18551ba5a6bd155f9f4ae9c29c25b379affe019
Closes-Bug: #1623983
---
 watcher/common/ceilometer_helper.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/watcher/common/ceilometer_helper.py b/watcher/common/ceilometer_helper.py
index 0fee21b8c..cd4c94bf5 100644
--- a/watcher/common/ceilometer_helper.py
+++ b/watcher/common/ceilometer_helper.py
@@ -144,17 +144,17 @@ class CeilometerHelper(object):
         :return:
         """
 
+        end_time = datetime.datetime.utcnow()
         start_time = (datetime.datetime.utcnow() -
                       datetime.timedelta(seconds=int(period)))
         query = self.build_query(
-            resource_id=resource_id, start_time=start_time)
+            resource_id=resource_id, start_time=start_time, end_time=end_time)
         statistic = self.query_retry(f=self.ceilometer.statistics.list,
                                      meter_name=meter_name,
                                      q=query,
                                      period=period,
                                      aggregates=[
-                                         {'func': aggregate}],
-                                     groupby=['resource_id'])
+                                         {'func': aggregate}])
 
         item_value = None
         if statistic: