From f98ae787b7235f42f1b869ea616f386f9cc41f7c Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Sun, 19 Jan 2014 00:29:05 -0500 Subject: ceilometer: fix postgresql query errors From the 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 --- .../sqlalchemy-fix-ceilometer-resource-query.patch | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 meta-openstack/recipes-devtools/python/python-ceilometer/sqlalchemy-fix-ceilometer-resource-query.patch (limited to 'meta-openstack/recipes-devtools/python/python-ceilometer') 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 +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 +--- + 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 + -- cgit v1.2.3-54-g00ecf