]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
pybind/mgr/prometheus: no need to convert perf_schema to ordered_dict
authorJan Fajerski <jfajerski@suse.com>
Thu, 10 Aug 2017 16:07:14 +0000 (18:07 +0200)
committerJohn Spray <john.spray@redhat.com>
Wed, 1 Nov 2017 23:03:23 +0000 (23:03 +0000)
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 5e4b4b5ea2a217731691c1c391c252b08452798a)

src/pybind/mgr/prometheus/module.py

index f1900bdeed08b60d36f550547a5fea1a886919b7..b1230c7ab8579ad29a1ab2b793e483dacc23726c 100644 (file)
@@ -227,16 +227,9 @@ class Module(MgrModule):
             self.log.warning('_get_ordered_schema: no data')
             return
 
-        new_schema = dict()
-        for k1 in schema.keys():    # 'perf_schema', but assume only one
-            for k2 in sorted(schema[k1].keys()):
-                sorted_dict = OrderedDict(
-                    sorted(schema[k1][k2].items(), key=lambda i: i[0])
-                )
-                new_schema[k2] = sorted_dict
-        for k in sorted(new_schema.keys()):
-            self.log.debug("updating schema for %s" % k)
-            self.schema[k] = new_schema[k]
+        k = '{}.{}'.format(daemon_type, daemon_id)
+        self.log.debug("updating schema for %s" % k)
+        self.schema[k] = schema['perf_schema'][k]
 
     def shutdown(self):
         self.serving = False