Module: check_mk
Branch: master
Commit: a597485b10f21a4d99b618108c6ab9cefcabe2b2
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a597485b10f21a…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Mar 25 10:09:30 2013 +0100
FIX: UPS checks support Eaton Evolution
---
ChangeLog | 1 +
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(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 293545f..7f073bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -86,6 +86,7 @@
* ADD: tcp_conn_stats: now additionally uses /proc/net/tcp6
* ADD: wmic_processs: cpucores now being considered when calculating
user/kernel percentages. (thanks to William Baum)
+ * FIX: UPS checks support Eaton Evolution
Notifications:
* FIX: fixed crash on host notification when contact had explicit services set
diff --git a/checks/ups_capacity b/checks/ups_capacity
index 561a29a..c064d42 100644
--- a/checks/ups_capacity
+++ b/checks/ups_capacity
@@ -76,5 +76,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.534.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.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" ]
}
diff --git a/checks/ups_eaton_enviroment b/checks/ups_eaton_enviroment
index 1efcaed..e5907d6 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"]
+ "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"]
}
diff --git a/checks/ups_in_freq b/checks/ups_in_freq
index 5209fa7..ab0062c 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.534.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.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" ] \
}
diff --git a/checks/ups_in_voltage b/checks/ups_in_voltage
index 36833ad..c8ea68d 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.534.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.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" ]
}
diff --git a/checks/ups_out_load b/checks/ups_out_load
index a644534..402c659 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.534.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.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" ]
}
diff --git a/checks/ups_out_voltage b/checks/ups_out_voltage
index d33a2dd..6167f30 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.534.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.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" ]
}
diff --git a/checks/ups_power b/checks/ups_power
index 0b7aa11..ed1c9a4 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.534.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.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" ]
}