Module: check_mk
Branch: master
Commit: 9cf8ef5019dbac2872ddadcecdde48d3e36c33cc
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9cf8ef5019dbac…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Oct 21 15:00:06 2010 +0200
wut_webtherm: handle more variants
---
ChangeLog | 1 +
checks/wut_webtherm | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0e81b14..5ee535a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
Checks & Agents:
* megaraid_pdisks: Using the real enclosure number as check item now
* if/if64: Added expected interface speed to warning output
+ * wut_webtherm: handle more variants of WuT Webtherms (thanks to Lefty)
Multisite:
* The custom open/close states of custom links are now stored for each
diff --git a/checks/wut_webtherm b/checks/wut_webtherm
index 5a27213..a5b9536 100644
--- a/checks/wut_webtherm
+++ b/checks/wut_webtherm
@@ -27,7 +27,7 @@
wut_webtherm_defaultlevels = (30, 35)
def inventory_webtherm(checkname, info):
- # line[0] is 3.1 or 8.1 depending on MIB variant. We chop
+ # line[0] is 1.1, 2.1, 3.1, 6.1, 8.1 or 16.1 depending on MIB variant. We chop
# of the first part in order to get independent of that.
return [ (line[0].split(".")[1], "",
"wut_webtherm_defaultlevels") for
line in info if len(line) == 2 ]
@@ -49,12 +49,12 @@ def check_webtherm(item, params, info):
def detect_webtherm(oid):
return oid(".1.3.6.1.2.1.1.2.0") in \
- [ ".1.3.6.1.4.1.5040.1.2.3", ".1.3.6.1.4.1.5040.1.2.8" ]
+ [ ".1.3.6.1.4.1.5040.1.2.1", ".1.3.6.1.4.1.5040.1.2.2",
".1.3.6.1.4.1.5040.1.2.3", ".1.3.6.1.4.1.5040.1.2.6",
".1.3.6.1.4.1.5040.1.2.8" ".1.3.6.1.4.1.5040.1.2.16" ]
check_info['wut_webtherm'] = ( check_webtherm, "Thermograph Sensor %s",
1, inventory_webtherm)
snmp_info['wut_webtherm'] = (
- "1.3.6.1.4.1.5040.1.2", ["3", "8"], [
"1.2.1.1.1", "1.3.1.1.1" ])
+ "1.3.6.1.4.1.5040.1.2", ["1", "2", "3",
"6", "8", "16"], [ "1.2.1.1", "1.3.1.1"
])
snmp_scan_functions['wut_webtherm'] = detect_webtherm