Merge pull request #5 from k0ste/newfeature

Changeset for support Luminous 12.2.2
Crapworks · Dec 9, 2017 · fafe1cb · fafe1cb
2 parents ce45b7d + 93ca10e
commit fafe1cb
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/check-ceph-dash.py b/check-ceph-dash.py
@@ -33,7 +33,10 @@ def _map(self, status):
             return ('UNKNOWN', 3)
 
     def get_perf_data(self):
-        nagios_str, nagios_exit = self._map(self['health']['overall_status'])
+        if 'status' in self['health']:
+            nagios_str, nagios_exit = self._map(self['health']['status'])
+        else:
+            nagios_str, nagios_exit = self._map(self['health']['overall_status'])
         if nagios_exit == 3:
             return ""
 
@@ -65,7 +68,10 @@ def get_perf_data(self):
         return perfdata
 
     def get_exit_code(self):
-        nagios_str, nagios_exit = self._map(self['health']['overall_status'])
+        if 'status' in self['health']:
+            nagios_str, nagios_exit = self._map(self['health']['status'])
+        else:
+            nagios_str, nagios_exit = self._map(self['health']['overall_status'])
         return int(nagios_exit)
 
     def get_nagios_string(self):
@@ -76,10 +82,10 @@ def get_nagios_string(self):
         if nagios_exit == 0:
             summary = 'ceph cluster operates with no problems'
         else:
-            if 'summary' in self['health']:
-                summary = '\n'.join([ "{severity}: {summary}".format(**problems) for problems in self['health']['summary']])
-            elif 'checks' in self['health']:
+            if 'checks' in self['health']:
                 summary = '\n'.join([ "{severity}: {summary[message]}".format(**problems) for problems in self['health']['checks'].values()])
+            elif 'summary' in self['health']:
+                summary = '\n'.join([ "{severity}: {summary}".format(**problems) for problems in self['health']['summary']])
             else:
                 summary = 'Unable to fetch healt details. Please check cluster directly'