[checkmk-commits] Check_MK Git: check_mk: FIX: apc_symmetra: fix remaining runtime calculation (by factor 100)

Module: check_mk Branch: master Commit: c87358257fd53c7292ef9c5b7b0e383a513d08ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c87358257fd53c… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Wed May 18 08:45:50 2011 +0200 FIX: apc_symmetra: fix remaining runtime calculation (by factor 100) --- ChangeLog | 1 + checks/apc_symmetra | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index a599d89..289eaa3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * FIX: sort output of cmk --list-hosts alphabetically Checks & Agents: + * FIX: apc_symmetra: fix remaining runtime calculation (by factor 100) * brocade_port: check for Brocade FC ports has been rewritten with lots of new features. * AIX agent now simulates <<<netctr>>> output (by Jörg Linge) diff --git a/checks/apc_symmetra b/checks/apc_symmetra index febd566..a50523f 100644 --- a/checks/apc_symmetra +++ b/checks/apc_symmetra @@ -44,7 +44,7 @@ def check_apc(item, params, info): BasicBatteryStatus, BasicOutputStatus, AdvBatteryCapacity, \ AdvBatteryTemperature, AdvBatteryCurrent, AdvOutputVoltage, \ AdvOutputCurrent = [ saveint(x) for x in info[0][:7] ] - RunTimeRemaining = info[0][7] + RunTimeRemaining = int(info[0][7]) / 100 crit_capacity, crit_batt_temp, crit_batt_curr, crit_voltage = params @@ -55,7 +55,7 @@ def check_apc(item, params, info): infotxt = "Battery status %s" % (status_text.get(BasicBatteryStatus)) if BasicBatteryStatus != 2: state = 2 - infotxt += "(!)" + infotxt += "(!!)" else: state = 0 single_states.append( (state, infotxt, None) ) @@ -68,7 +68,7 @@ def check_apc(item, params, info): infotxt = "output status %s" % (status_text.get(BasicOutputStatus)) if BasicOutputStatus not in [2, 4, 12]: state = 2 - infotxt += "(!)" + infotxt += "(!!)" else: state = 0 single_states.append( (state, infotxt, None) ) @@ -77,7 +77,7 @@ def check_apc(item, params, info): infotxt = "capacity %d%%" % AdvBatteryCapacity if AdvBatteryCapacity <= crit_capacity: state = 2 - infotxt += "(!)" + infotxt += "(!!)" else: state = 0 single_states.append( (state, infotxt, ("capacity", AdvBatteryCapacity, "", crit_capacity, 0, 100)) ) @@ -86,7 +86,7 @@ def check_apc(item, params, info): infotxt = "bat. temp. %dC" % AdvBatteryTemperature if AdvBatteryTemperature >= crit_batt_temp: state = 2 - infotxt += "(!)" + infotxt += "(!!)" else: state = 0 single_states.append( (state, infotxt, ("battemp", AdvBatteryTemperature, "", crit_batt_temp) ) ) @@ -95,7 +95,7 @@ def check_apc(item, params, info): infotxt = "bat. curr. %dA" % AdvBatteryCurrent if AdvBatteryCurrent >= crit_batt_curr: state = 2 - infotxt += "(!)" + infotxt += "(!!)" else: state = 0 single_states.append( (state, infotxt, ("batcurr", AdvBatteryCurrent, "", crit_batt_curr, 0) ) ) @@ -104,7 +104,7 @@ def check_apc(item, params, info): infotxt = "output voltage %dV" % AdvOutputVoltage if AdvOutputVoltage <= crit_voltage: state = 2 - infotxt += "(!)" + infotxt += "(!!)" else: state = 0 single_states.append( (state, infotxt, ("voltage", AdvOutputVoltage, "", crit_voltage, 0) ) ) @@ -127,7 +127,7 @@ def check_apc(item, params, info): def inventory_apc(checkname, info): if len(info) > 0: - return [(None, "", "apc_default_levels")] + return [(None, "apc_default_levels")] check_info['apc_symmetra'] = ( check_apc, "APC Symmetra status", 1, inventory_apc )