[checkmk-commits] Check_MK Git: check_mk: solaris_multipath: code review

Module: check_mk Branch: master Commit: e54adcf65608cce0049b48569386783a9cec3a78 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e54adcf65608cc… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Wed Jan 21 11:00:26 2015 +0100 solaris_multipath: code review --- checks/solaris_multipath | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/checks/solaris_multipath b/checks/solaris_multipath index f5f0210..ddca400 100644 --- a/checks/solaris_multipath +++ b/checks/solaris_multipath @@ -31,26 +31,24 @@ def inventory_solaris_multipath(info): for device, total, ok in info: item = device.split('/')[-1] - yield item, '{ "total": %s }' % total + yield item, total def check_solaris_multipath(item, params, info): for device, total, ok in info: if item == device.split('/')[-1]: - itotal = params.get("total") # total from last service discovery ok = int(ok) total = int(total) - - if not itotal: + if not params: state = 1 - infotext = "%d of %d paths up, but total paths not yet inventorized, redo service discovery" % (ok, total) + infotext = "%d paths up, but total paths unknown, redo service discovery" % ok else: - itotal = int(itotal) + itotal = int(params) infotext = "%d of %d paths up" % (ok, itotal) if total > itotal: state = 1 - infotext += ", but total paths increased to %d, redo service discovery" % total + infotext = "%d paths up, but total paths increased to %d, redo service discovery" % (ok, total) elif itotal == ok: state = 0 elif itotal >= ok * 2: # less than half of paths ok @@ -65,4 +63,5 @@ check_info["solaris_multipath"] = { "inventory_function" : inventory_solaris_multipath, "check_function" : check_solaris_multipath, "service_description" : "Multipath %s", + "group" : "multipath" }