[checkmk-commits] Check_MK Git: check_mk: apc_symmetra: add input voltage to informational output

Module: check_mk Branch: master Commit: 21918cfc7a01b218b1a40d10ed04ccc288c66f88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21918cfc7a01b2… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Thu Oct 10 18:10:30 2013 +0200 apc_symmetra: add input voltage to informational output --- ChangeLog | 1 + checks/apc_symmetra | 22 ++++++++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2b5ee2c..f252d29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ * esx_vsphere_hostsystem.multipath: now able to set warn/crit levels * cpu_netapp: added Perf-O-Meter and PNP template * cisco_cpu: added Perf-O-Meter and PNP template + * apc_symmetra: add input voltage to informational output * FIX: windows_agent: fixed bug in cleanup of open thread handles * FIX: cups default printer is now monitored again in linux agent * FIX: host notification email in html format: fixed formating error diff --git a/checks/apc_symmetra b/checks/apc_symmetra index a77554f..2fa5e82 100644 --- a/checks/apc_symmetra +++ b/checks/apc_symmetra @@ -73,9 +73,9 @@ apc_default_levels = { "levels": ( 95, 40, 1, 220 ) } def check_apc(item, params, info): BasicBatteryStatus, BasicOutputStatus, AdvBatteryCapacity, \ - AdvBatteryTemperature, AdvBatteryCurrent, AdvOutputVoltage, \ + AdvBatteryTemperature, AdvBatteryCurrent, AdvInputVoltage, AdvOutputVoltage, \ AdvOutputCurrent, AdvBatteryRunTimeRemaining, AdvTestCalibrationResults \ - = [ saveint(x) for x in info[0][:9] ] + = [ saveint(x) for x in info[0][:10] ] LastDiagnosticsDate = info[0][-1] RunTimeRemaining = AdvBatteryRunTimeRemaining / 100 @@ -157,6 +157,9 @@ def check_apc(item, params, info): state = 0 single_states.append( (state, infotxt, ("batcurr", AdvBatteryCurrent, "", crit_batt_curr, 0) ) ) + # 6a. Simply show input voltage (no performance data) + single_states.append( (0, "input voltage %dV" % AdvInputVoltage, None) ) + # 6. Check output voltage infotxt = "output voltage %dV" % AdvOutputVoltage if AdvOutputVoltage <= crit_voltage: @@ -195,6 +198,17 @@ check_info['apc_symmetra'] = { "group" : "apc_symentra", "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.318.1.3"), "snmp_info" : (".1.3.6.1.4.1.318.1.1.1", - [ "2.1.1.0", "4.1.1.0", "2.2.1.0", "2.2.2.0", - "2.2.9.0", "4.2.1.0", "4.2.4.0", "2.2.3.0", "7.2.6.0", "7.2.4.0" ] ) + [ + "2.1.1.0", # BasicBatteryStatus, + "4.1.1.0", # BasicOutputStatus, + "2.2.1.0", # AdvBatteryCapacity, + "2.2.2.0", # AdvBatteryTemperature, + "2.2.9.0", # AdvBatteryCurrent, + "3.2.1.0", # AdvInputVoltage, + "4.2.1.0", # AdvOutputVoltage, + "4.2.4.0", # AdvOutputCurrent, + "2.2.3.0", # AdvBatteryRunTimeRemaining, + "7.2.6.0", # AdvTestCalibrationResults + "7.2.4.0", # LastDiagnosticsDate + ] ) }