2 files changed, 36 insertions, 0 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer/sqlalchemy-fix-ceilometer-resource-query.patch b/meta-openstack/recipes-devtools/python/python-ceilometer/sqlalchemy-fix-ceilometer-resource-query.patch
new file mode 100644
index 0000000..fae92d6
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-ceilometer/sqlalchemy-fix-ceilometer-resource-query.patch
@@ -0,0 +1,35 @@
+From 249139daafd4ac4cdc60a70d033ee7026d3354e7 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@windriver.com>
+Date: Sun, 19 Jan 2014 00:25:48 -0500
+Subject: [PATCH] sqlalchemy: fix ceilometer resource query
+
+Implement the abandoned ceilometer fix from:
+
+ https://review.openstack.org/#/c/59204/ [Fix for get_statistics with postgresql]
+
+Without this fix, the ceilometer resource tab in horizon returns an error due
+to badly formed SQL and a database backend error.
+
+Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
+---
+ ceilometer/storage/impl_sqlalchemy.py |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/ceilometer/storage/impl_sqlalchemy.py b/ceilometer/storage/impl_sqlalchemy.py
+index 8d321eaaeffe..f1c99a72ded9 100644
+--- a/ceilometer/storage/impl_sqlalchemy.py
++++ b/ceilometer/storage/impl_sqlalchemy.py
+@@ -577,7 +577,9 @@ class Connection(base.Connection):
+             group_attributes = [getattr(Meter, g) for g in groupby]
+             select.extend(group_attributes)
+ 
+-        query = session.query(*select)
++        #Group by counter_unit for postgresql queries
++        #In mysql this doesn't change anything because one meter has one unit
++        query = session.query(*select).group_by(Meter.counter_unit)
+ 
+         if groupby:
+             query = query.group_by(*group_attributes)
+-- 
+1.7.10.4
+
diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
index d441e70..e556f32 100644
--- a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
@@ -12,6 +12,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \
            file://ceilometer.init \
            file://0001-Fix-for-get_resources-with-postgresql.patch \
            file://0002-enable-sql-metadata-query.patch \
+           file://sqlalchemy-fix-ceilometer-resource-query.patch \
 "
 
 SRCREV="ef71dc6a11ab624e756bfb61ec974e9f6096bc30"