28 Jan
2011
28 Jan
'11
6:15 p.m.
Module: check_mk
Branch: master
Commit: ba6ecb22f0ea6c3f0319fc07d783aeaa2bfab156
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba6ecb22f0ea6c…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Jan 27 09:40:04 2011 +0100
Removed obsolete SNMP misc checks blade_misc, ironport_misc and snial_sml
---
.bugs/110 | 10 ++++++++++
ChangeLog | 4 ++++
checks/blade_misc | 12 ++++++++----
checks/ironport_misc | 28 ++++++----------------------
checks/snia_sml | 25 +++++++------------------
5 files changed, 35 insertions(+), 44 deletions(-)
diff --git a/.bugs/110 b/.bugs/110
new file mode 100644
index 0000000..5583786
--- /dev/null
+++ b/.bugs/110
@@ -0,0 +1,10 @@
+Title: Remove obsolete code of snmp_info_single
+Component: core
+Benefit: 1
+State: open
+Cost: 1
+Date: 2011-01-27 09:39:10
+Class: cleanup
+
+Obsolete code formerly used by snmp_info_single should be removed
+from the code.
diff --git a/ChangeLog b/ChangeLog
index 64f540e..73bcea5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
1.1.9i6:
+ INCOMPATIBLE CHANGES:
+ * Removed out-dated checks blade_misc, ironport_misc and snia_sml. Replaced
+ with dummy checks begin always UNKNOWN.
+
Core, Setup, etc.:
* cmk -D: show ip address of host
* Fix SNMP inventory find snmp misc checks inspite of negative scan function
diff --git a/checks/blade_misc b/checks/blade_misc
index 9f468f7..52f183e 100644
--- a/checks/blade_misc
+++ b/checks/blade_misc
@@ -25,8 +25,12 @@
# Boston, MA 02110-1301 USA.
-check_info['blade_misc'] = (check_snmp_misc, "SENSOR %s", 1,
inventory_snmp_misc)
-snmp_info_single['blade_misc'] = ( "BLADE-MIB",
"1.3.6.1.4.1.2.3.51.2.2", [ "1", "2", "3.1",
"3.2" ] )
+def check_blade_misc(item, params, info):
+ return (3, "UNKNOWN - Sorry. Check not implemented in this version.")
+
+check_info['blade_misc'] = (
+ check_blade_misc,
+ "%s",
+ 0,
+ no_inventory_possible)
-snmp_scan_functions['blade_misc'] = \
- lambda oid: oid("1.3.6.1.2.1.1.1.0") == '"BladeCenter Management
Module"'
diff --git a/checks/ironport_misc b/checks/ironport_misc
index 859f42f..afd436c 100644
--- a/checks/ironport_misc
+++ b/checks/ironport_misc
@@ -25,28 +25,12 @@
# Boston, MA 02110-1301 USA.
+def check_ironport_misc(item, params, info):
+ return (3, "UNKNOWN - Sorry. Check not implemented in this version.")
+
check_info['ironport_misc'] = (
- check_snmp_misc,
+ check_ironport_misc,
"%s",
- 1,
- inventory_snmp_misc)
+ 0,
+ no_inventory_possible)
-snmp_info_single['ironport_misc'] = (
- "ASYNCOS-MAIL-MIB",
- "1.3.6.1.4.1.15497.1.1.1",
- [ "1.0",
- "2.0",
- "3.0",
- "4.0",
- "9.1.2.1",
- "10.1.2.1",
- "10.1.2.2",
- "13.1.3.1",
- "13.1.3.2",
- "13.1.3.3",
- "15.0",
- "16.0",
- "18.1.2.1",
- "18.1.2.2",
- "19.0",
- "20.0" ] )
diff --git a/checks/snia_sml b/checks/snia_sml
index b4b8407..58c0d83 100644
--- a/checks/snia_sml
+++ b/checks/snia_sml
@@ -25,23 +25,12 @@
# Boston, MA 02110-1301 USA.
-# This inventory collects the current state of several SNMP
-# variables. The check monitors if they are unchanged
+def check_snia_sml(item, params, info):
+ return (3, "UNKNOWN - Sorry. Check not implemented in this version.")
-check_info['snia_sml'] = (check_snmp_fixed, "SNMP %s", 0,
inventory_snmp_fixed)
-# e.g. IBM TAPELIB 3584
+check_info['snia_sml'] = (
+ check_snia_sml,
+ "%s",
+ 0,
+ no_inventory_possible)
-snmp_info_single['snia_sml'] = ( "SNIA-SML-MIB",
"1.3.6.1.4.1.14851.3.1",
- [ "4.5", # SNIA-SML-MIB::chassis-SecurityBreach
- "4.6", # SNIA-SML-MIB::chassis-IsLocked
- "4.10.1.5", # SNIA-SML-MIB::subChassis-LockPresent
- "4.10.1.6", # SNIA-SML-MIB::subChassis-SecurityBreach
- "4.10.1.7", # SNIA-SML-MIB::subChassis-IsLocked
- "6.2.1.5", # SNIA-SML-MIB::mediaAccessDevice-Availability
- "6.2.1.11", # SNIA-SML-MIB::mediaAccessDevice-OperationalStatus
- "11.2.1.8", # SNIA-SML-MIB::changerDevice-Availability
- "11.2.1.9", # SNIA-SML-MIB::changerDevice-OperationalStatus
- "12.2.1.6", # SNIA-SML-MIB::scsiProtocolController-Availability
- "12.2.1.4", # SNIA-SML-MIB::scsiProtocolController-OperationalStatus
- "15.2.1.6", # SNIA-SML-MIB::fCPortController-OperationalStatus
- ] )