[checkmk-commits] 3666 FIX ups_*: Fixed discovery for Vision UPS devices

Module: check_mk Branch: master Commit: 54a5e884f0019573b6c7d153b08e4d115ad0b567 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54a5e884f00195… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 7 15:23:57 2016 +0200 3666 FIX ups_*: Fixed discovery for Vision UPS devices --- .werks/3666 | 10 ++++++++++ ChangeLog | 1 + checks/ups_bat_temp | 1 + checks/ups_capacity | 2 +- checks/ups_in_freq | 2 +- checks/ups_in_voltage | 2 +- checks/ups_out_load | 2 +- checks/ups_out_voltage | 2 +- checks/ups_power | 2 +- checks/ups_test | 2 +- 10 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.werks/3666 b/.werks/3666 new file mode 100644 index 0000000..47ff58b --- /dev/null +++ b/.werks/3666 @@ -0,0 +1,10 @@ +Title: ups_*: Fixed discovery for Vision UPS devices +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1467897794 + + diff --git a/ChangeLog b/ChangeLog index 8116774..b78be88 100644 --- a/ChangeLog +++ b/ChangeLog @@ -301,6 +301,7 @@ * 3153 FIX: windows agent: fixed two problems that could cause missing wmi results... * 3555 FIX: esx_vsphere_sensors: fixed incorrect default parameter during service discovery... * 3665 FIX: hitachi_hnas_*: Fixed service discovery on some devices (e.g. HM800) + * 3666 FIX: ups_*: Fixed discovery for Vision UPS devices Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/ups_bat_temp b/checks/ups_bat_temp index 49cf8be..1f16c26 100644 --- a/checks/ups_bat_temp +++ b/checks/ups_bat_temp @@ -58,6 +58,7 @@ def snmp_scan_ups_bat_temp(oid): [".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.935", ".1.3.6.1.4.1.818.1.100.1.2" ] \ or oid(".1.3.6.1.2.1.1.2.0").startswith('.1.3.6.1.2.1.33') \ or oid('.1.3.6.1.2.1.33.1.1.1.0', "").startswith('RPS') diff --git a/checks/ups_capacity b/checks/ups_capacity index 3f68249..94f6c7a 100644 --- a/checks/ups_capacity +++ b/checks/ups_capacity @@ -61,6 +61,6 @@ check_info["ups_capacity"] = { [ ".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.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') } diff --git a/checks/ups_in_freq b/checks/ups_in_freq index 3b5c4a8..0003caa 100644 --- a/checks/ups_in_freq +++ b/checks/ups_in_freq @@ -60,6 +60,6 @@ check_info['ups_in_freq'] = { "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.2.1.33", ".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.476.1.42", ".1.3.6.1.4.1.818.1.100.1.2", ".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') } diff --git a/checks/ups_in_voltage b/checks/ups_in_voltage index c0db31e..0e4816e 100644 --- a/checks/ups_in_voltage +++ b/checks/ups_in_voltage @@ -42,6 +42,6 @@ check_info['ups_in_voltage'] = { "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.705.1.2", ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", ".1.3.6.1.4.1.232.165.3", - ".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.476.1.42", ".1.3.6.1.4.1.818.1.100.1.2", ".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') } diff --git a/checks/ups_out_load b/checks/ups_out_load index c7c8444..7ba16fa 100644 --- a/checks/ups_out_load +++ b/checks/ups_out_load @@ -58,6 +58,6 @@ check_info['ups_out_load'] = { "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.705.1.2", ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", ".1.3.6.1.4.1.232.165.3", - ".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.476.1.42", ".1.3.6.1.4.1.818.1.100.1.2", ".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') } diff --git a/checks/ups_out_voltage b/checks/ups_out_voltage index 5e47dc5..e98d956 100644 --- a/checks/ups_out_voltage +++ b/checks/ups_out_voltage @@ -42,6 +42,6 @@ check_info['ups_out_voltage'] = { "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.705.1.2", ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", ".1.3.6.1.4.1.232.165.3", - ".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.476.1.42", ".1.3.6.1.4.1.818.1.100.1.2", ".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') } diff --git a/checks/ups_power b/checks/ups_power index 110fd97..b89366d 100644 --- a/checks/ups_power +++ b/checks/ups_power @@ -62,5 +62,5 @@ check_info['ups_power'] = { "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.705.1.2", ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2" , ".1.3.6.1.4.1.5491.6", ".1.3.6.1.4.1.232.165.3", - ".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.476.1.42", ".1.3.6.1.4.1.818.1.100.1.2", ".1.3.6.1.4.1.935", ] } diff --git a/checks/ups_test b/checks/ups_test index c2cd8c5..4f2a775 100644 --- a/checks/ups_test +++ b/checks/ups_test @@ -123,6 +123,6 @@ check_info['ups_test'] = { ( ".1.3.6.1.2.1.33.1.7", [ 3, 5, 4 ] ), ], "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.818.1.100.1.2", - ".1.3.6.1.4.1.232.165.3",], + ".1.3.6.1.4.1.232.165.3", ".1.3.6.1.4.1.935", ], "includes" : [ 'uptime.include' ], }