[checkmk-commits] Check_MK Git: check_mk: #1214 ups_bat_temp, ups_capacity, ups_in_freq,

ups_in_voltage,ups_out_load,ups_out_voltage: Checks now detect more UPS Devices Message-ID: <54bce515.a6JtOXPQxFIHqKgw%bk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 0536de5b8c4199dd9f4d4f24a612c0de6216f670 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0536de5b8c4199… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jan 19 12:05:51 2015 +0100 #1214 ups_bat_temp,ups_capacity,ups_in_freq,ups_in_voltage,ups_out_load,ups_out_voltage: Checks now detect more UPS Devices The SNMP scan function now checks also for the common ups interface MIB. --- .werks/1214 | 10 ++++++++++ ChangeLog | 1 + checks/ups_bat_temp | 3 ++- checks/ups_capacity | 5 +++-- checks/ups_in_freq | 3 ++- checks/ups_in_voltage | 5 +++-- checks/ups_out_load | 5 +++-- checks/ups_out_voltage | 5 +++-- 8 files changed, 27 insertions(+), 10 deletions(-) diff --git a/.werks/1214 b/.werks/1214 new file mode 100644 index 0000000..66f1d8c --- /dev/null +++ b/.werks/1214 @@ -0,0 +1,10 @@ +Title: ups_bat_temp,ups_capacity,ups_in_freq,ups_in_voltage,ups_out_load,ups_out_voltage: Checks now detect more UPS Devices +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1421665416 +Class: feature + +The SNMP scan function now checks also for the common ups interface MIB. + diff --git a/ChangeLog b/ChangeLog index db6f41e..88ae52b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ * 1669 mrpe program check_16bit_program.cc: Monitors 16 bit programs on windows... * 1849 netscaler_dnsrates: new check for DNS statistics of Citrix Netscaler Loadbalancers * 1850 netscaler_health.fan, netscaler_health.psus, netscaler_health.temp: new checks to monitor the health of Citrix Netscaler Loadbalancers + * 1214 ups_bat_temp,ups_capacity,ups_in_freq,ups_in_voltage,ups_out_load,ups_out_voltage: Checks now detect more UPS Devices... * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/checks/ups_bat_temp b/checks/ups_bat_temp index 5088152..830c59a 100644 --- a/checks/ups_bat_temp +++ b/checks/ups_bat_temp @@ -52,7 +52,8 @@ check_info['ups_bat_temp'] = { "2.7", # upsBatteryTemperature ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ - [ ".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", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.818.1.100.1.2" ] \ + [ ".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.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'), "includes" : [ "temperature.include" ], } diff --git a/checks/ups_capacity b/checks/ups_capacity index b99a4ce..de15dfe 100644 --- a/checks/ups_capacity +++ b/checks/ups_capacity @@ -59,6 +59,7 @@ check_info["ups_capacity"] = { "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.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.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" ] \ + 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 c17c192..9656eaa 100644 --- a/checks/ups_in_freq +++ b/checks/ups_in_freq @@ -60,5 +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" ] \ + 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 b015bb7..f56b169 100644 --- a/checks/ups_in_voltage +++ b/checks/ups_in_voltage @@ -41,6 +41,7 @@ check_info['ups_in_voltage'] = { "snmp_info" : ( ".1.3.6.1.2.1.33.1.3.3.1", [ 0, 3 ] ), "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.476.1.42", ".1.3.6.1.4.1.818.1.100.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" ] \ + 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 5e0ddc8..88a2658 100644 --- a/checks/ups_out_load +++ b/checks/ups_out_load @@ -57,6 +57,7 @@ check_info['ups_out_load'] = { "snmp_info" : ( ".1.3.6.1.2.1.33.1.4.4.1", [ 0, 5 ] ), "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.476.1.42", ".1.3.6.1.4.1.818.1.100.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" ] \ + 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 a54c109..3190a68 100644 --- a/checks/ups_out_voltage +++ b/checks/ups_out_voltage @@ -41,6 +41,7 @@ check_info['ups_out_voltage'] = { "snmp_info" : ( ".1.3.6.1.2.1.33.1.4.4.1", [ 0, 2 ] ), "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.476.1.42", ".1.3.6.1.4.1.818.1.100.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" ] \ + or oid(".1.3.6.1.2.1.1.2.0").startswith('.1.3.6.1.2.1.33') }