Merge pull request #1101 from gnocchixyz/mergify/bp/stable/4.3/pr-1074

Ensure member statistics key is decoded (bp #1074)
gnocchixyz · Jan 13, 2021 · 3d52c28 · 3d52c28
2 parents 598b1ea + 8f8819b
commit 3d52c28
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/gnocchi/rest/api.py b/gnocchi/rest/api.py
@@ -2102,10 +2102,14 @@ def get(details=True):
             report_dict['metricd']['processors'] = [
                 member.decode() for member in members
             ]
-            report_dict['metricd']['statistics'] = {
-                member.decode(): cap.get()
-                for member, cap in six.moves.zip(members, caps)
-            }
+            members_data = {}
+            for member, cap in six.moves.zip(members, caps):
+                caps_data = {
+                    six.ensure_str(k): v
+                    for k, v in six.iteritems(cap.get())
+                }
+                members_data[member.decode()] = caps_data
+            report_dict['metricd']['statistics'] = members_data
         else:
             report_dict['metricd']['processors'] = None
             report_dict['metricd']['statistics'] = {}