Module: check_mk
Branch: master
Commit: e29800b832b3187ad3e7efc22523ddd08abe974d
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e29800b832b318…
Author: Konstantin Büttner <kb(a)mathias-kettner.de>
Date: Fri Jun 19 16:41:34 2015 +0200
Made several generic UPS checks inventorize on HP UPSs
---
checks/ups_capacity | 3 ++-
checks/ups_in_voltage | 2 +-
checks/ups_out_load | 2 +-
checks/ups_out_voltage | 4 ++--
checks/ups_power | 2 +-
checks/ups_test | 3 ++-
6 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/checks/ups_capacity b/checks/ups_capacity
index de15dfe..c31e6ca 100644
--- a/checks/ups_capacity
+++ b/checks/ups_capacity
@@ -60,6 +60,7 @@ 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.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",
+ ".1.3.6.1.4.1.232.165.3" ] \
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 f56b169..e5935a1 100644
--- a/checks/ups_in_voltage
+++ b/checks/ups_in_voltage
@@ -41,7 +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.2",
".1.3.6.1.4.1.5491.6",
+ ".1.3.6.1.2.1.33.2",
".1.3.6.1.4.1.5491.6", ".1.3.6.1.4.1.232.165.3",
".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 88a2658..15ae898 100644
--- a/checks/ups_out_load
+++ b/checks/ups_out_load
@@ -57,7 +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.2",
".1.3.6.1.4.1.5491.6",
+ ".1.3.6.1.2.1.33.2",
".1.3.6.1.4.1.5491.6", ".1.3.6.1.4.1.232.165.3",
".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 3190a68..a3a87be 100644
--- a/checks/ups_out_voltage
+++ b/checks/ups_out_voltage
@@ -40,8 +40,8 @@ check_info['ups_out_voltage'] = {
"includes" : [ 'ups_out_voltage.include' ],
"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.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.705.1.2",
".1.3.6.1.4.1.818.1.100.1.1",
+ ".1.3.6.1.2.1.33.2",
".1.3.6.1.4.1.5491.6", ".1.3.6.1.4.1.232.165.3",
".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_power b/checks/ups_power
index 76ade5b..3db48f1 100644
--- a/checks/ups_power
+++ b/checks/ups_power
@@ -61,6 +61,6 @@ check_info['ups_power'] = {
"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.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.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.232.165.3",
".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 b192efd..43bae67 100644
--- a/checks/ups_test
+++ b/checks/ups_test
@@ -122,6 +122,7 @@ check_info['ups_test'] = {
('.1.3.6.1.2.1.1', ['3.0']), #
sysUptime
( ".1.3.6.1.2.1.33.1.7", [ 3, 5, 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.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.2",
+ ".1.3.6.1.4.1.232.165.3",],
"includes" : [ 'uptime.include' ],
}