20 Jun
2012
20 Jun
'12
5:09 a.m.
Module: check_mk
Branch: master
Commit: 0f98b3549fa6606b8e309cd5f0f90fe240544b83
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f98b3549fa660…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Jun 20 12:09:44 2012 +0200
if_lancom: add SSID to logical WLAN interface names
---
ChangeLog | 3 +-
checks/if_lancom | 72 +++++++++++++++++++++++++++++++----------------------
2 files changed, 44 insertions(+), 31 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d6fa8db..68b8ccf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
1.2.0p2:
Checks & Agents:
* FIX: Fixed syntax errors in a bunch of man pages
- * if_lancom: silently ignore Logical and Point-To-Point interfaces
+ * if_lancom: silently ignore Point-To-Point interfaces
+ * if_lancom: add SSID to logical WLAN interface names
Multisite:
* Show number of rows and number of selected rows in header line
diff --git a/checks/if_lancom b/checks/if_lancom
index cf1634d..52c5eef 100644
--- a/checks/if_lancom
+++ b/checks/if_lancom
@@ -29,23 +29,33 @@ def fix_if_64_highspeed(info):
if type(line[3]) == str: # not yet converted
line[3] = saveint(line[3]) * 1000000
-def if_lancom_strip_logical(info):
+def if_lancom_convert(info):
+ iftab, ssidtab = info
+ ssid_dict = dict(ssidtab)
new_info = []
- for line in info:
- if line[-1].startswith("Logical Network") or \
- line[-1].startswith("Point-2-Point"):
+ for line in iftab:
+ if line[20].startswith("Point-2-Point"):
continue
else:
- new_info.append(line[:-1])
+ ifName = line[1]
+
+ new_line = line[:-1]
+ if line[20].startswith("Logical Network"):
+ new_line[1] += " Logical"
+ ssid = ssid_dict.get(ifName, "")
+ if ssid:
+ new_line[1] += " " + ssid
+ new_line[1] = new_line[1].strip()
+ new_info.append(new_line)
return new_info
def inventory_if_lancom(info):
- info = if_lancom_strip_logical(info)
+ info = if_lancom_convert(info)
fix_if_64_highspeed(info)
return inventory_if_common(info)
def check_if_lancom(item, params, info):
- info = if_lancom_strip_logical(info)
+ info = if_lancom_convert(info)
fix_if_64_highspeed(info)
return check_if_common(item, params, info)
@@ -54,31 +64,33 @@ check_includes['if_lancom'] = [ "if.include" ]
checkgroup_of['if_lancom'] = "if"
check_default_levels['if_lancom'] = "if_default_levels"
-snmp_info['if_lancom'] = \
+snmp_info['if_lancom'] = [ \
( ".1.3.6.1.2.1", [
- "2.2.1.1", # ifIndex 0
- "31.1.1.1.1", # ifName (LANCOM has no useful information if Descr)
- "2.2.1.3", # ifType 2
- "31.1.1.1.15", # ifHighSpeed .. 1000 means 1GBit
- "2.2.1.8", # ifOperStatus 4
- "31.1.1.1.6", # ifHCInOctets 5
- "31.1.1.1.7", # ifHCInUcastPkts 6
- "31.1.1.1.8", # ifHCInMulticastPkts 7
- "31.1.1.1.9", # ifHCInBroadcastPkts 8
- "2.2.1.13", # ifInDiscards 9
- "2.2.1.14", # ifInErrors 10
- "31.1.1.1.10", # ifHCOutOctets 11
- "31.1.1.1.11", # ifHCOutUcastPkts 12
- "31.1.1.1.12", # ifHCOutMulticastPkts 13
- "31.1.1.1.13", # ifHCOutBroadcastPkts 14
- "2.2.1.19", # ifOutDiscards 15
- "2.2.1.20", # ifOutErrors 16
- "2.2.1.21", # ifOutQLen 17
- "31.1.1.1.18", # ifAlias 18
- "2.2.1.6", # ifPhysAddress 19
+ "2.2.1.1", # ifIndex 0
+ "31.1.1.1.1", # ifName (LANCOM has no useful information if
Descr)
+ "2.2.1.3", # ifType 2
+ "31.1.1.1.15", # ifHighSpeed .. 1000 means 1GBit
+ "2.2.1.8", # ifOperStatus 4
+ "31.1.1.1.6", # ifHCInOctets 5
+ "31.1.1.1.7", # ifHCInUcastPkts 6
+ "31.1.1.1.8", # ifHCInMulticastPkts 7
+ "31.1.1.1.9", # ifHCInBroadcastPkts 8
+ "2.2.1.13", # ifInDiscards 9
+ "2.2.1.14", # ifInErrors 10
+ "31.1.1.1.10", # ifHCOutOctets 11
+ "31.1.1.1.11", # ifHCOutUcastPkts 12
+ "31.1.1.1.12", # ifHCOutMulticastPkts 13
+ "31.1.1.1.13", # ifHCOutBroadcastPkts 14
+ "2.2.1.19", # ifOutDiscards 15
+ "2.2.1.20", # ifOutErrors 16
+ "2.2.1.21", # ifOutQLen 17
+ "31.1.1.1.18", # ifAlias 18
+ "2.2.1.6", # ifPhysAddress 19
# Used in order to ignore some logical NICs
- "2.2.1.2", # ifDescr 1
- ] )
+ "2.2.1.2", # ifDescr 20
+ ]),
+ ( ".1.3.6.1.4.1.2356.11.1.3.56.1", [1, 3] ) # LANCOM: SSID 21
+ ]
# check if number of network interfaces (IF-MIB::ifNumber.0) is at least 2
snmp_scan_functions['if_lancom'] = \