[checkmk-commits] 5909 FIX fortigate_sessions, fortigate_cpu: Fixed duplicated discovery if needed information is at two places

Module: check_mk Branch: master Commit: fbd9ab0690257e08812350135c02ed0d6a01547d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fbd9ab0690257e… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Tue Mar 6 18:11:27 2018 +0100 5909 FIX fortigate_sessions, fortigate_cpu: Fixed duplicated discovery if needed information is at two places Fortigate changed obviously the location of information for cpu utilization and sessions in the past. We support these by using two different check plugins. With this fix the service discovery does not create duplicated services anymore if both paths are present on the device. Instead the newer path will be preferred. Change-Id: I2c4bd51e629c47e14988ba6d4e8d83870b90d64f --- .werks/5909 | 14 ++++++++++++++ checks/fortigate_cpu | 3 ++- checks/fortigate_sessions | 3 ++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.werks/5909 b/.werks/5909 new file mode 100644 index 0000000..ff63039 --- /dev/null +++ b/.werks/5909 @@ -0,0 +1,14 @@ +Title: fortigate_sessions, fortigate_cpu: Fixed duplicated discovery if needed information is at two places +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1520356129 +Class: fix + +Fortigate changed obviously the location of information for cpu utilization +and sessions in the past. We support these by using two different check +plugins. With this fix the service discovery does not create duplicated +services anymore if both paths are present on the device. Instead the newer +path will be preferred. diff --git a/checks/fortigate_cpu b/checks/fortigate_cpu index 5409495..23e403f 100644 --- a/checks/fortigate_cpu +++ b/checks/fortigate_cpu @@ -36,7 +36,8 @@ check_info["fortigate_cpu"] = { "group" : "cpu_utilization", # uses mib FORTINET-MIB-280 "snmp_scan_function" : lambda oid: ".1.3.6.1.4.1.12356.101.1" in oid(".1.3.6.1.2.1.1.2.0") and \ - oid(".1.3.6.1.4.1.12356.1.8.0"), + oid(".1.3.6.1.4.1.12356.1.8.0") and \ + not oid(".1.3.6.1.4.1.12356.101.4.1.3.0"), "snmp_info" : ( ".1.3.6.1.4.1.12356.1", [ 8 ]), "includes" : [ "cpu_util.include", "fortigate_cpu.include" ], } diff --git a/checks/fortigate_sessions b/checks/fortigate_sessions index 6526fb2..c1ff4d3 100644 --- a/checks/fortigate_sessions +++ b/checks/fortigate_sessions @@ -47,7 +47,8 @@ check_info["fortigate_sessions"] = { "has_perfdata" : True, # uses mib FORTINET-MIB-280 "snmp_scan_function" : lambda oid: ".1.3.6.1.4.1.12356.101.1" in oid(".1.3.6.1.2.1.1.2.0") and\ - oid(".1.3.6.1.4.1.12356.1.10.0"), + oid(".1.3.6.1.4.1.12356.1.10.0") and \ + not oid(".1.3.6.1.4.1.12356.101.4.1.8.0"), "snmp_info" : ( ".1.3.6.1.4.1.12356.1", [ 10 ]), "includes" : ["fortigate_sessions.include"], }