Merge pull request #64 from teicee/ceph-15

Ceph 15.2.5
Crapworks · Apr 27, 2021 · e36f4eb · e36f4eb
2 parents 57b9c81 + b9054aa
commit e36f4eb
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/app/dashboard/views.py b/app/dashboard/views.py
@@ -114,6 +114,14 @@ def get(self):
             if 'err' in cluster_status:
                 abort(500, cluster_status['err'])
 
+            # ceph >= 15.2.5
+            if 'osdmap' not in cluster_status['osdmap']:
+                # osdmap has been converted to depth-1 dict
+                cluster_status['osdmap']['osdmap'] = cluster_status['osdmap'].copy()
+                monitor_status = CephClusterCommand(cluster, prefix='quorum_status', format='json')
+                cluster_status['monmap'] = monitor_status['monmap']
+
+
             # check for unhealthy osds and get additional osd infos from cluster
             total_osds = cluster_status['osdmap']['osdmap']['num_osds']
             in_osds = cluster_status['osdmap']['osdmap']['num_up_osds']