Module: check_mk Branch: master Commit: d5303f7e6ce0ea2b60dfe115036713df8ee57f3e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5303f7e6ce0ea… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed May 28 16:01:18 2014 +0200 ups checks now supports also GE devices (Thanks to Andy Taylor) Thanks to a patch from Andy Taylor, our ups checks now supporting devcies from GE. --- .werks/165 | 9 +++++++++ ChangeLog | 1 + checks/ups_bat_temp | 2 +- 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, 18 insertions(+), 8 deletions(-) diff --git a/.werks/165 b/.werks/165 new file mode 100644 index 0000000..1902754 --- /dev/null +++ b/.werks/165 @@ -0,0 +1,9 @@ +Title: ups checks now supports also GE devices (Thanks to Andy Taylor) +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1401285562 +Class: feature + +Thanks to a patch from Andy Taylor, our ups checks now supporting devcies from GE. + diff --git a/ChangeLog b/ChangeLog index 8e4e1b2..6cde871 100644 --- a/ChangeLog +++ b/ChangeLog @@ -64,6 +64,7 @@ * 0926 windows agent: local / plugin scripts now get the REMOTE_HOST as environment variable * 0163 kaspersky_av_quarantine,kaspersky_av_tasks,kaspersky_av_updates: New checks for kaspersky anti virus on linux * 0164 symantec_av_progstate,symantec_av_quarantine, symantec_av_updates: New checks for Symantec Anti Virus on Linux + * 0165 ups checks now supports also GE devices (Thanks to Andy Taylor)... * 0777 FIX: special agent emcvnx: did not work with security file authentication... * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection diff --git a/checks/ups_bat_temp b/checks/ups_bat_temp index 589b665..068c320 100644 --- a/checks/ups_bat_temp +++ b/checks/ups_bat_temp @@ -57,7 +57,7 @@ check_info['ups_bat_temp'] = { "group" : "hw_temperature", "snmp_info" : ( ".1.3.6.1.2.1.33.1", ["1.5", "2.7" ] ), "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.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" ] \ 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 9fee589..edb63e1 100644 --- a/checks/ups_capacity +++ b/checks/ups_capacity @@ -60,5 +60,5 @@ check_info["ups_capacity"] = { "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.476.1.42", ".1.3.6.1.4.1.818.1.100.1.2" ] } diff --git a/checks/ups_in_freq b/checks/ups_in_freq index 4aca826..ae7d0d0 100644 --- a/checks/ups_in_freq +++ b/checks/ups_in_freq @@ -60,5 +60,5 @@ 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.476.1.42", ".1.3.6.1.4.1.818.1.100.1.2" ] } diff --git a/checks/ups_in_voltage b/checks/ups_in_voltage index 6fc089e..2971c14 100644 --- a/checks/ups_in_voltage +++ b/checks/ups_in_voltage @@ -42,5 +42,5 @@ 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", ".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.476.1.42", ".1.3.6.1.4.1.818.1.100.1.2" ] } diff --git a/checks/ups_out_load b/checks/ups_out_load index 04395ef..6da165d 100644 --- a/checks/ups_out_load +++ b/checks/ups_out_load @@ -58,5 +58,5 @@ 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", ".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.476.1.42", ".1.3.6.1.4.1.818.1.100.1.2" ] } diff --git a/checks/ups_out_voltage b/checks/ups_out_voltage index 0b5c731..4257c41 100644 --- a/checks/ups_out_voltage +++ b/checks/ups_out_voltage @@ -42,5 +42,5 @@ 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", ".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.476.1.42", ".1.3.6.1.4.1.818.1.100.1.2" ] } diff --git a/checks/ups_power b/checks/ups_power index 68876e1..29bb49a 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.476.1.42" ] + ".1.3.6.1.4.1.476.1.42", ".1.3.6.1.4.1.818.1.100.1.2" ] } diff --git a/checks/ups_test b/checks/ups_test index f08c89b..0a8249f 100644 --- a/checks/ups_test +++ b/checks/ups_test @@ -132,6 +132,6 @@ check_info['ups_test'] = { "has_perfdata" : False, "group" : "ups_test", "snmp_info" : ( ".1.3.6.1.2.1.33.1.7", [3,5,6,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"] + "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" ] }