From bca8eae2225fd293e257a56d821ea495073b1cee Mon Sep 17 00:00:00 2001 From: Patrick Nawracay Date: Mon, 27 Aug 2018 15:14:23 +0200 Subject: [PATCH] mgr/dashboard: Improve readability Signed-off-by: Patrick Nawracay --- src/pybind/mgr/dashboard/controllers/osd.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/pybind/mgr/dashboard/controllers/osd.py b/src/pybind/mgr/dashboard/controllers/osd.py index 43cd6c8ffba..3d30df83ed1 100644 --- a/src/pybind/mgr/dashboard/controllers/osd.py +++ b/src/pybind/mgr/dashboard/controllers/osd.py @@ -13,20 +13,24 @@ from ..tools import str_to_bool class Osd(RESTController): def list(self): osds = self.get_osd_map() + # Extending by osd stats information for s in mgr.get('osd_stats')['osd_stats']: osds[str(s['osd'])].update({'osd_stats': s}) + # Extending by osd node information nodes = mgr.get('osd_map_tree')['nodes'] osd_tree = [(str(o['id']), o) for o in nodes if o['id'] >= 0] for o in osd_tree: osds[o[0]].update({'tree': o[1]}) + # Extending by osd parent node information hosts = [(h['name'], h) for h in nodes if h['id'] < 0] for h in hosts: for o_id in h[1]['children']: if o_id >= 0: osds[str(o_id)]['host'] = h[1] + # Extending by osd histogram data for o_id in osds: o = osds[o_id] @@ -40,6 +44,7 @@ class Osd(RESTController): # Gauge stats for s in ['osd.numpg', 'osd.stat_bytes', 'osd.stat_bytes_used']: o['stats'][s.split('.')[1]] = mgr.get_latest('osd', osd_spec, s) + return list(osds.values()) def get_osd_map(self): -- 2.39.5