[checkmk-commits] 5748 FIX cisco_cpu, cisco_nexus_cpu: improve snmp_scan_functions

Module: check_mk Branch: master Commit: efff5b417da80bc7be122483b09b0a96e1da174e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=efff5b417da80b… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Mar 9 11:28:17 2018 +0100 5748 FIX cisco_cpu, cisco_nexus_cpu: improve snmp_scan_functions Exclude "NX-OS" systems explicitly in cisco_cpu and remove the check for 1.3.6.1.4.1.9.9.109.1.1.1.1.* in cisco_nexus_cpu. Thanks to Ricardo Fribeiro for the patch. Change-Id: Ib49ace43fca41a65f07a82d8c158665f7667f3cd --- .werks/5748 | 13 +++++++++++++ checks/cisco_cpu | 1 + checks/cisco_nexus_cpu | 1 - 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/5748 b/.werks/5748 new file mode 100644 index 0000000..3e5b26d --- /dev/null +++ b/.werks/5748 @@ -0,0 +1,13 @@ +Title: cisco_cpu, cisco_nexus_cpu: improve snmp_scan_functions +Level: 1 +Component: checks +Compatible: incomp +Edition: cre +Version: 1.5.0i4 +Date: 1520592742 +Class: fix + +Exclude "NX-OS" systems explicitly in cisco_cpu and remove the +check for 1.3.6.1.4.1.9.9.109.1.1.1.1.* in cisco_nexus_cpu. + +Thanks to Ricardo Fribeiro for the patch. diff --git a/checks/cisco_cpu b/checks/cisco_cpu index bc56745..823efa5 100644 --- a/checks/cisco_cpu +++ b/checks/cisco_cpu @@ -70,6 +70,7 @@ check_info["cisco_cpu"] = { "has_perfdata" : True, "group" : "cpu_utilization", "snmp_scan_function" : lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() \ + and "nx-os" not in oid(".1.3.6.1.2.1.1.1.0").lower() \ and oid(".1.3.6.1.4.1.9.9.109.1.1.1.1.*"), "snmp_info" : ( ".1.3.6.1.4.1.9.9.109.1.1.1.1", [ 5, 8 ]), } diff --git a/checks/cisco_nexus_cpu b/checks/cisco_nexus_cpu index ca078d0..06822f2 100644 --- a/checks/cisco_nexus_cpu +++ b/checks/cisco_nexus_cpu @@ -48,7 +48,6 @@ check_info['cisco_nexus_cpu'] = { 'snmp_info' : (".1.3.6.1.4.1.9.9.305.1.1.1.0", [ "" ]), 'snmp_scan_function' : lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() \ and "nx-os" in oid(".1.3.6.1.2.1.1.1.0").lower() \ - and not oid(".1.3.6.1.4.1.9.9.109.1.1.1.1.*") \ and oid(".1.3.6.1.4.1.9.9.305.1.1.1.0"), 'group' : "cpu_utilization", 'includes' : [ "cpu_util.include" ],