import ceph quincy 17.2.6

[ceph.git] / ceph / src / pybind / mgr / dashboard / controllers / osd.py

diff --git a/ceph/src/pybind/mgr/dashboard/controllers/osd.py b/ceph/src/pybind/mgr/dashboard/controllers/osd.py
index 9c903ed672eec997627e79952fcbe169cb8f0634..1e557bd74d41ecd9b39af7f696124b76aa42ac89 100644 (file)
--- a/ceph/src/pybind/mgr/dashboard/controllers/osd.py
+++ b/ceph/src/pybind/mgr/dashboard/controllers/osd.py
@@ -482,8 +482,18 @@ class Osd(RESTController):
 
     @RESTController.Resource('GET')
     def devices(self, svc_id):
-        # (str) -> dict
-        return CephService.send_command('mon', 'device ls-by-daemon', who='osd.{}'.format(svc_id))
+        # type: (str) -> Union[list, str]
+        devices: Union[list, str] = CephService.send_command(
+            'mon', 'device ls-by-daemon', who='osd.{}'.format(svc_id))
+        mgr_map = mgr.get('mgr_map')
+        available_modules = [m['name'] for m in mgr_map['available_modules']]
+
+        life_expectancy_enabled = any(
+            item.startswith('diskprediction_') for item in available_modules)
+        for device in devices:
+            device['life_expectancy_enabled'] = life_expectancy_enabled
+
+        return devices
 
 
 @UIRouter('/osd', Scope.OSD)