From 52c2d9d3b8e18a60f8fba0002dcf1a1ddae20de1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=BE=D1=80=D0=B5=D0=BD=D0=B1=D0=B5=D1=80=D0=B3=20?= =?UTF-8?q?=D0=9C=D0=B0=D1=80=D0=BA?= Date: Mon, 14 May 2018 20:37:46 +0500 Subject: [PATCH] Description for bluestore and CPU --- main.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/main.py b/main.py index c703981..24851f2 100755 --- a/main.py +++ b/main.py @@ -121,9 +121,14 @@ def get_description(cluster, location): result = json.loads(outbuf.decode('utf-8')) descr = location.copy() - descr["rot_journal"] = int(result["journal_rotational"]) == 1 - descr["rot_data"] = int(result["rotational"]) == 1 + descr["type"] = result["osd_objectstore"] + if result["osd_objectstore"] == 'filestore': + descr["rot_journal"] = int(result["journal_rotational"]) == 1 + descr["rot_data"] = int(result["rotational"]) == 1 + elif result["osd_objectstore"] == 'bluestore': + descr["z_DB"] = '%s %s' % (result['bluefs_db_type'], result["bluefs_db_model"]) + descr["z_main"] = '%s %s' % (result['bluefs_slow_type'], result["bluefs_slow_model"]) return json.dumps(descr, sort_keys=True, ensure_ascii=False)