Merge pull request #27 from umesecke/master

support changed statistic keys in json of ceph 0.84+ (fixes #25)
rochaporto · Feb 13, 2015 · eae93e6 · eae93e6
2 parents 4936e2e + 85a7968
commit eae93e6
Showing 1 changed file with 10 additions and 3 deletions.
diff --git 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