diff --git a/plugins/ceph_pool_plugin.py b/plugins/ceph_pool_plugin.py old mode 100644 new mode 100755 index 7d4d322..c028fbc --- a/plugins/ceph_pool_plugin.py +++ b/plugins/ceph_pool_plugin.py @@ -83,9 +83,16 @@ def get_stats(self): # push totals from df data[ceph_cluster]['cluster'] = {} - data[ceph_cluster]['cluster']['total_space'] = int(json_df_data['stats']['total_space']) * 1024.0 - data[ceph_cluster]['cluster']['total_used'] = int(json_df_data['stats']['total_used']) * 1024.0 - data[ceph_cluster]['cluster']['total_avail'] = int(json_df_data['stats']['total_avail']) * 1024.0 + if json_df_data['stats'].has_key('total_bytes'): + # ceph 0.84+ + data[ceph_cluster]['cluster']['total_space'] = int(json_df_data['stats']['total_bytes']) + data[ceph_cluster]['cluster']['total_used'] = int(json_df_data['stats']['total_used_bytes']) + data[ceph_cluster]['cluster']['total_avail'] = int(json_df_data['stats']['total_avail_bytes']) + else: + # ceph < 0.84 + data[ceph_cluster]['cluster']['total_space'] = int(json_df_data['stats']['total_space']) * 1024.0 + data[ceph_cluster]['cluster']['total_used'] = int(json_df_data['stats']['total_used']) * 1024.0 + data[ceph_cluster]['cluster']['total_avail'] = int(json_df_data['stats']['total_avail']) * 1024.0 return data