Module: check_mk Branch: master Commit: 39152f3272f6236159b16f1fedaaf251819733b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39152f3272f623… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jul 14 14:34:26 2016 +0200 3709 FIX cisco_wlc, cisco_wlc_clients: fixed scan function and incomplete listing of interfaces --- .werks/3709 | 10 ++++++++++ ChangeLog | 1 + checks/cisco_wlc | 13 ++++++++----- checks/cisco_wlc_clients | 11 +++++++++-- 4 files changed, 28 insertions(+), 7 deletions(-) diff --git a/.werks/3709 b/.werks/3709 new file mode 100644 index 0000000..25ba20a --- /dev/null +++ b/.werks/3709 @@ -0,0 +1,10 @@ +Title: cisco_wlc, cisco_wlc_clients: fixed scan function and incomplete listing of interfaces +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1468499605 + + diff --git a/ChangeLog b/ChangeLog index e8e9d8c..8516c23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -308,6 +308,7 @@ * 3707 FIX: oracle_tablespaces: cleanup... * 3708 FIX: cisco_vpn_tunnel: fixed missing phase 2 data * 3556 FIX: agent_vsphere.pysphere: The ESX 4.1 compatible agent version no longer validates the ssl certificate + * 3709 FIX: cisco_wlc, cisco_wlc_clients: fixed scan function and incomplete listing of interfaces Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/cisco_wlc b/checks/cisco_wlc index 2da74cc..0242693 100644 --- a/checks/cisco_wlc +++ b/checks/cisco_wlc @@ -74,11 +74,14 @@ check_info["cisco_wlc"] = { "group" : "cisco_wlc", "service_description" : "AP %s", "node_info" : True, - "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.2.0') in [".1.3.6.1.4.1.9.1.1069", - ".1.3.6.1.4.1.14179.1.1.4.3", - ".1.3.6.1.4.1.9.1.1645", - ".1.3.6.1.4.1.9.1.1631", - ".1.3.6.1.4.1.9.1.1279"], + "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.2.0') in [ + ".1.3.6.1.4.1.9.1.1069", + ".1.3.6.1.4.1.14179.1.1.4.3", + ".1.3.6.1.4.1.9.1.1645", + ".1.3.6.1.4.1.9.1.1631", + ".1.3.6.1.4.1.9.1.1279", + ".1.3.6.1.4.1.9.1.1293", + ], "snmp_info" : [( ".1.3.6.1.4.1.14179.2.2.1.1.3", [ OID_END, '' ]), ( ".1.3.6.1.4.1.14179.2.2.1.1.1", [ OID_END, '' ]), ( ".1.3.6.1.4.1.14179.2.2.1.1.6", [ OID_END, '' ]), diff --git a/checks/cisco_wlc_clients b/checks/cisco_wlc_clients index 6af9257..23e2400 100644 --- a/checks/cisco_wlc_clients +++ b/checks/cisco_wlc_clients @@ -46,8 +46,14 @@ def parse_cisco_wlc_clients(info): parsed = {} sum_clients = 0 for name, interface, num_clients in info: - sum_clients += int(num_clients) - parsed[name] = (int(num_clients), interface) + sum_clients_name = int(num_clients) + sum_clients += sum_clients_name + + if name in parsed: + sum_clients_name += parsed[name][0] + interface = parsed[name][1] + ", " + interface + + parsed[name] = (sum_clients_name, "%s: %s" % (interface, num_clients)) parsed["Summary"] = (sum_clients, "") return parsed @@ -66,6 +72,7 @@ check_info["cisco_wlc_clients"] = { ".1.3.6.1.4.1.9.1.1631", ".1.3.6.1.4.1.14179.1.1.4.3", ".1.3.6.1.4.1.9.1.1279", + ".1.3.6.1.4.1.9.1.1293", ], "snmp_info" : ( ".1.3.6.1.4.1.14179.2.1.1.1", [ "2",