From: Jan Fajerski <jfajerski@suse.com>
Date: Thu, 10 Aug 2017 16:07:14 +0000 (+0200)
Subject: pybind/mgr/prometheus: no need to convert perf_schema to ordered_dict
X-Git-Tag: v12.2.2~61^2~81
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d0ef1cd2570644451205e5306feca0da94462d1f;p=ceph.git

pybind/mgr/prometheus: no need to convert perf_schema to ordered_dict

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 5e4b4b5ea2a217731691c1c391c252b08452798a)
---

diff --git a/src/pybind/mgr/prometheus/module.py b/src/pybind/mgr/prometheus/module.py
index f1900bdeed08..b1230c7ab857 100644
--- a/src/pybind/mgr/prometheus/module.py
+++ b/src/pybind/mgr/prometheus/module.py
@@ -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