Merge "Properly handle 'resource_id' as None for Gnocchi publisher"

1 files changed, 12 insertions, 1 deletions

diff --git a/ceilometer/publisher/gnocchi.py b/ceilometer/publisher/gnocchi.py
index 27e499f5..2741ba00 100644
--- a/ceilometer/publisher/gnocchi.py
+++ b/ceilometer/publisher/gnocchi.py
@@ -325,7 +325,18 @@ class GnocchiPublisher(publisher.ConfigPublisherBase):
 
         # NOTE(sileht): skip sample generated by gnocchi itself
         data = [s for s in data if not self._is_gnocchi_activity(s)]
-        data.sort(key=operator.attrgetter('resource_id'))
+
+        def value_to_sort(object_to_sort):
+            value = object_to_sort.resource_id
+            if not value:
+                LOG.debug("Resource ID was not defined for sample data [%s]. "
+                          "Therefore, we will use an empty string as the "
+                          "resource ID.", object_to_sort)
+                value = ''
+
+            return value
+
+        data.sort(key=value_to_sort)
         resource_grouped_samples = itertools.groupby(
             data, key=operator.attrgetter('resource_id'))