Module: check_mk
Branch: master
Commit: c3497f7dc79bcb713c47624cf4b5e2d91c23a64e
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3497f7dc79bcb…
Author: Florian Heigl <fh(a)mathias-kettner.de>
Date: Tue Oct 9 14:18:14 2012 +0200
checks/ups* now recognize more device oids
---
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 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/checks/ups_bat_temp b/checks/ups_bat_temp
index 1404ee0..00dae3c 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.4.1.818.1.100.1.1",
".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 9ea822d..0e3684c 100644
--- a/checks/ups_capacity
+++ b/checks/ups_capacity
@@ -74,5 +74,5 @@ check_info["ups_capacity"] = {
"has_perfdata" : True,
"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.818.1.100.1.1",
".1.3.6.1.2.1.33" ]
+ [ ".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" ]
}
diff --git a/checks/ups_in_freq b/checks/ups_in_freq
index c9f1cfb..fb9bbac 100644
--- a/checks/ups_in_freq
+++ b/checks/ups_in_freq
@@ -57,5 +57,5 @@ check_info['ups_in_freq'] = {
"has_perfdata" : True,
"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.818.1.100.1.1",
".1.3.6.1.2.1.33" ] \
+ [ ".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" ] \
}
diff --git a/checks/ups_in_voltage b/checks/ups_in_voltage
index 4168ae2..ae86dbc 100644
--- a/checks/ups_in_voltage
+++ b/checks/ups_in_voltage
@@ -56,5 +56,5 @@ check_info['ups_in_voltage'] = {
"has_perfdata" : True,
"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.818.1.100.1.1",
".1.3.6.1.2.1.33" ] \
+ [ ".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" ]
}
diff --git a/checks/ups_out_load b/checks/ups_out_load
index 59e06c1..686412e 100644
--- a/checks/ups_out_load
+++ b/checks/ups_out_load
@@ -56,5 +56,5 @@ 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.818.1.100.1.1",
".1.3.6.1.2.1.33" ] \
+ [ ".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" ]
}
diff --git a/checks/ups_out_voltage b/checks/ups_out_voltage
index d1fe868..f29764b 100644
--- a/checks/ups_out_voltage
+++ b/checks/ups_out_voltage
@@ -56,5 +56,5 @@ check_info['ups_out_voltage'] = {
"has_perfdata" : True,
"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.818.1.100.1.1",
".1.3.6.1.2.1.33" ] \
+ [ ".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" ]
}
diff --git a/checks/ups_power b/checks/ups_power
index 9d0d417..53434e4 100644
--- a/checks/ups_power
+++ b/checks/ups_power
@@ -60,5 +60,5 @@ check_info['ups_power'] = {
"group" : "hw_temperature",
"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.818.1.100.1.1",
".1.3.6.1.2.1.33" ]
+ [ ".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" ]
}