Module: check_mk Branch: master Commit: 636496b256c833e20e88bd70db80cdd65220feb5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=636496b256c833… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Nov 29 17:49:59 2013 +0100 ups_checks: Addded another device to be detected by scanfunction --- checks/ups_bat_temp | 2 +- checks/ups_capacity | 2 +- checks/ups_eaton_enviroment | 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 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/checks/ups_bat_temp b/checks/ups_bat_temp index 6e84317..589b665 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.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"] \ 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 9648860..71333a3 100644 --- a/checks/ups_capacity +++ b/checks/ups_capacity @@ -99,6 +99,6 @@ 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.2.1.33.2", ".1.3.6.1.4.1.5491.6", + ".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" ] } diff --git a/checks/ups_eaton_enviroment b/checks/ups_eaton_enviroment index e5907d6..15ae972 100644 --- a/checks/ups_eaton_enviroment +++ b/checks/ups_eaton_enviroment @@ -62,6 +62,6 @@ check_info['ups_eaton_enviroment'] = { "has_perfdata" : True, "group" : "eaton_enviroment", "snmp_info" : ( ".1.3.6.1.4.1.534.1.6", [1,5,6 ] ), - "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"] + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.705.1.2", ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1"] } diff --git a/checks/ups_in_freq b/checks/ups_in_freq index e9ff1ab..4aca826 100644 --- a/checks/ups_in_freq +++ b/checks/ups_in_freq @@ -59,6 +59,6 @@ check_info['ups_in_freq'] = { "snmp_info" : ( ".1.3.6.1.2.1.33.1.3.3.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.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.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" ] \ } diff --git a/checks/ups_in_voltage b/checks/ups_in_voltage index 13038e0..961f1df 100644 --- a/checks/ups_in_voltage +++ b/checks/ups_in_voltage @@ -57,7 +57,7 @@ check_info['ups_in_voltage'] = { "group" : "evolt", "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.818.1.100.1.1", + [ ".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" ] } diff --git a/checks/ups_out_load b/checks/ups_out_load index 031e776..04395ef 100644 --- a/checks/ups_out_load +++ b/checks/ups_out_load @@ -56,7 +56,7 @@ check_info['ups_out_load'] = { "has_perfdata" : True, "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.818.1.100.1.1", + [ ".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" ] } diff --git a/checks/ups_out_voltage b/checks/ups_out_voltage index 41cb751..8d84881 100644 --- a/checks/ups_out_voltage +++ b/checks/ups_out_voltage @@ -57,7 +57,7 @@ check_info['ups_out_voltage'] = { "group" : "evolt", "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.818.1.100.1.1", + [ ".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" ] } diff --git a/checks/ups_power b/checks/ups_power index f27b1e2..68876e1 100644 --- a/checks/ups_power +++ b/checks/ups_power @@ -60,7 +60,7 @@ check_info['ups_power'] = { "group" : "epower", "snmp_info" : ( ".1.3.6.1.2.1.33.1.4.4.1", [ 0, 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.705.1", ".1.3.6.1.4.1.818.1.100.1.1", + [ ".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" ] }