19 Nov
2018
19 Nov
'18
5:21 a.m.
Module: check_mk
Branch: master
Commit: 0fd5c2f047487b96173ffcf94f5552649ac87fde
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0fd5c2f047487b…
Author: Konstantin Büttner <kb(a)mathias-kettner.de>
Date: Mon Nov 19 11:12:28 2018 +0100
6638 FIX if_fortigate: Fix incorrect usage of Name as Alias
Werk #4539 introduced special handling for interfaces of
Fortigate firewalls, but incorrectly substituted the ifName
for the ifAlias, leading to incompatibilities for users
using the alias as an item. Rediscovery is required
to get the proper alias back as an item. If you do not
use the alias, this does not affect you.
Change-Id: I85d394291ce800fe012d91fe59b8e0841674a6ad
---
.werks/6638 | 16 +++++++++++++
checks/if_fortigate | 68 ++++++++++++++++++++++++++---------------------------
2 files changed, 49 insertions(+), 35 deletions(-)
diff --git a/.werks/6638 b/.werks/6638
new file mode 100644
index 0000000..a3eadcf
--- /dev/null
+++ b/.werks/6638
@@ -0,0 +1,16 @@
+Title: if_fortigate: Fix incorrect usage of Name as Alias
+Level: 1
+Component: checks
+Class: fix
+Compatible: incomp
+Edition: cre
+State: unknown
+Version: 1.6.0i1
+Date: 1542291923
+
+Werk #4539 introduced special handling for interfaces of
+Fortigate firewalls, but incorrectly substituted the ifName
+for the ifAlias, leading to incompatibilities for users
+using the alias as an item. Rediscovery is required
+to get the proper alias back as an item. If you do not
+use the alias, this does not affect you.
diff --git a/checks/if_fortigate b/checks/if_fortigate
index fe32c31..725628d 100644
--- a/checks/if_fortigate
+++ b/checks/if_fortigate
@@ -34,39 +34,37 @@ def check_if_fortigate(item, params, parsed):
check_info["if_fortigate"] = {
- 'parse_function': parse_if64,
- 'inventory_function': inventory_if_fortigate,
- 'check_function': check_if_fortigate,
- 'service_description': 'Interface %s',
- 'snmp_info': (
- ".1.3.6.1.2.1",
- [
- "2.2.1.1", # ifIndex 0
- "2.2.1.2", # ifDescr 1
- "2.2.1.3", # ifType 2
- "2.2.1.5", # ifSpeed 3
- "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.1", # ifName 18
- BINARY("2.2.1.6"), # ifPhysAddress 19
- "31.1.1.1.15", # ifHighSpeed -1 (parse_if64 assumes
this is the last element)
- ]),
- 'snmp_scan_function': lambda oid:
oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.12356"),
- 'has_perfdata': True,
- 'includes': ["if.include", "if64.include"],
- 'group': 'if',
- 'node_info': True,
- 'default_levels_variable': 'if_default_levels',
+ 'parse_function' : parse_if64,
+ 'inventory_function' : inventory_if_fortigate,
+ 'check_function' : check_if_fortigate,
+ 'service_description' : 'Interface %s',
+ 'snmp_info' : ( ".1.3.6.1.2.1", [
+ "2.2.1.1", # ifIndex
0
+ "2.2.1.2", # ifDescr
1
+ "2.2.1.3", # ifType
2
+ "2.2.1.5", # ifSpeed
3
+ "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
+ BINARY("2.2.1.6"), # ifPhysAddress
19
+ "31.1.1.1.15", # ifHighSpeed
-1 (parse_if64 assumes this is the last element)
+ ]),
+ 'snmp_scan_function' : lambda oid:
oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.12356"),
+ 'has_perfdata' : True,
+ 'includes' : [ "if.include",
"if64.include" ],
+ 'group' : 'if',
+ 'node_info' : True,
+ 'default_levels_variable' : 'if_default_levels',
}