[checkmk-commits] minor cleanup better description

Module: check_mk Branch: master Commit: bdb41896d0662f9f0b544ae2c2f6553570ef9083 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bdb41896d0662f… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Oct 19 09:25:47 2016 +0200 minor cleanup better description --- checks/ups_capacity | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/checks/ups_capacity b/checks/ups_capacity index 94f6c7a..09a1b90 100644 --- a/checks/ups_capacity +++ b/checks/ups_capacity @@ -56,11 +56,21 @@ check_info["ups_capacity"] = { "has_perfdata" : True, "group" : "ups_capacity", "includes" : [ "ups_capacity.include" ], - "snmp_info" : ( ".1.3.6.1.2.1.33.1.2", [ "2.0" , "3.0" ,"4.0" ] ), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ - [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1", ".1.3.6.1.4.1.818.1.100.1.1", - "1.3.6.1.4.1.705.1.2", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", - ".1.3.6.1.4.1.476.1.42", ".1.3.6.1.4.1.818.1.100.1.2", - ".1.3.6.1.4.1.232.165.3", ".1.3.6.1.4.1.935" ] \ - or oid(".1.3.6.1.2.1.1.2.0").startswith('.1.3.6.1.2.1.33') + "snmp_info" : ( ".1.3.6.1.2.1.33.1.2", [ + "2.0", # upsSecondsOnBattery + "3.0", # upsEstimatedMinutesRemaining + "4.0", # upsEstimatedChargeRemaining + ]), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [ + ".1.3.6.1.2.1.33.2", + ".1.3.6.1.4.1.232.165.3", + ".1.3.6.1.4.1.476.1.42", + ".1.3.6.1.4.1.534.1", + ".1.3.6.1.4.1.705.1", + ".1.3.6.1.4.1.705.1.2", + ".1.3.6.1.4.1.818.1.100.1.1", + ".1.3.6.1.4.1.818.1.100.1.2", + ".1.3.6.1.4.1.935" ] or + ".1.3.6.1.4.1.5491.6", + oid(".1.3.6.1.2.1.1.2.0").startswith('.1.3.6.1.2.1.33') }