Module: check_mk Branch: master Commit: d8a0e9e14942b06192722aad02df1bb1e5ddba2d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8a0e9e14942b0… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Sep 22 16:05:45 2017 +0200 5223 juniper_alarm, juniper_bgp_state, juniper_cpu, juniper_cpu_util, juniper_fru, juniper_mem: Try discovery also on QFX series devices The scan functions of these checks previously were overly restrictive. Thanks to Ricardo Fribeiro for pointing this out! Change-Id: I77cbd65fa5abd389c57d0b3c6d3e7631d581f7ee --- .werks/5223 | 11 +++++++++++ checks/juniper_alarm | 2 +- checks/juniper_bgp_state | 2 +- checks/juniper_cpu | 2 +- checks/juniper_cpu_util | 2 +- checks/juniper_fru | 2 +- checks/juniper_mem | 2 +- 7 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.werks/5223 b/.werks/5223 new file mode 100644 index 0000000..a228dee --- /dev/null +++ b/.werks/5223 @@ -0,0 +1,11 @@ +Title: juniper_alarm, juniper_bgp_state, juniper_cpu, juniper_cpu_util, juniper_fru, juniper_mem: Try discovery also on QFX series devices +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1506089035 +Class: feature + +The scan functions of these checks previously were overly restrictive. +Thanks to Ricardo Fribeiro for pointing this out! diff --git a/checks/juniper_alarm b/checks/juniper_alarm index 8469aa9..760a395 100644 --- a/checks/juniper_alarm +++ b/checks/juniper_alarm @@ -50,7 +50,7 @@ check_info['juniper_alarm'] = { 'inventory_function' : inventory_juniper_alarm, 'check_function' : check_juniper_alarm, 'service_description' : 'Chassis', - 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.2636.1.1.1.2"), + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.2636.1.1.1"), 'snmp_info' : (".1.3.6.1.4.1.2636.3.1.10.1", [ "8", # jnxLEDState ]), diff --git a/checks/juniper_bgp_state b/checks/juniper_bgp_state index b85588a..2c945c9 100644 --- a/checks/juniper_bgp_state +++ b/checks/juniper_bgp_state @@ -77,5 +77,5 @@ check_info["juniper_bgp_state"] = { 2, # jnxBgpM2PeerState 3 ]), # jnxBgpM2PeerStatus # (like operational status) - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.2636.1.1.1.2"), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.2636.1.1.1"), } diff --git a/checks/juniper_cpu b/checks/juniper_cpu index af9930c..a78fbf0 100644 --- a/checks/juniper_cpu +++ b/checks/juniper_cpu @@ -43,7 +43,7 @@ check_info["juniper_cpu"] = { "inventory_function" : inventory_juniper_cpu, "service_description" : "CPU utilization %s", "has_perfdata" : True, - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.2636.1.1.1.2"), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.2636.1.1.1"), "snmp_info" : (".1.3.6.1.4.1.2636.3.1.13.1",[ 5, #jnxOperatingDescr 20, #jnxOperating1MinLoadAvg diff --git a/checks/juniper_cpu_util b/checks/juniper_cpu_util index a513a46..4902e66 100644 --- a/checks/juniper_cpu_util +++ b/checks/juniper_cpu_util @@ -48,7 +48,7 @@ check_info['juniper_cpu_util'] = { 'group' : 'juniper_cpu_util', 'service_description' : "CPU utilization %s", 'has_perfdata' : True, - 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.2636.1.1.1.2"), + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.2636.1.1.1"), 'snmp_info' : (".1.3.6.1.4.1.2636.3.1.13.1",[ 5, #jnxOperatingDescr 8, #jnxOperatingCPU diff --git a/checks/juniper_fru b/checks/juniper_fru index 645e294..61b0024 100644 --- a/checks/juniper_fru +++ b/checks/juniper_fru @@ -130,7 +130,7 @@ check_info['juniper_fru'] = { 'inventory_function' : lambda info: inventory_juniper_fru(info, "7"), 'check_function' : check_juniper_fru, 'service_description' : 'Power Supply FRU %s', - 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.2636.1.1.1.2"), + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.2636.1.1.1"), 'snmp_info' : (".1.3.6.1.4.1.2636.3.1.15.1", [ "5", # jnxFruName "6", # jnxFruType diff --git a/checks/juniper_mem b/checks/juniper_mem index 97b3200..1607837 100644 --- a/checks/juniper_mem +++ b/checks/juniper_mem @@ -57,7 +57,7 @@ check_info['juniper_mem'] = { 'inventory_function' : inventory_juniper_mem, 'check_function' : check_juniper_mem, 'service_description' : 'Memory Utilization %s', - 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.2636.1.1.1.2"), + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.2636.1.1.1"), 'snmp_info' : (".1.3.6.1.4.1.2636.3.1.13.1", [ "5.9", # jnxOperatingDescr "11.9", # jnxOperatingBuffer