Module: check_mk Branch: master Commit: efd48a084403b485d9f49286cf4dfb465cd6d7b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=efd48a084403b4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Nov 6 13:47:31 2013 +0100 FIX cisco_wlc: removed configuration parameter ap_model --- .werks/24 | 8 ++++++++ ChangeLog | 1 + checkman/cisco_wlc | 13 ++++++------- checks/cisco_wlc | 4 ---- web/plugins/wato/check_parameters.py | 11 ----------- 5 files changed, 15 insertions(+), 22 deletions(-) diff --git a/.werks/24 b/.werks/24 new file mode 100644 index 0000000..29978d2 --- /dev/null +++ b/.werks/24 @@ -0,0 +1,8 @@ +Title: cisco_wlc: removed configuration parameter ap_model +Level: 1 +Component: checks +Version: 1.2.3i7 +Date: 1383741998 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index eb78c38..12b8d93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Checks & Agents: * 0060: cisco_fantray: new check for monitoring fan trays of Cisco Nexus switches... * 0061: cisco_cpu: check now recognizes new object cpmCPUTotal5minRev... + * 0024 FIX: cisco_wlc: removed configuration parameter ap_model... Multisite: * 0001: New filters for selecting several host/service-groups at once... diff --git a/checkman/cisco_wlc b/checkman/cisco_wlc index 659725b..5640809 100644 --- a/checkman/cisco_wlc +++ b/checkman/cisco_wlc @@ -16,16 +16,15 @@ examples: checkgroup_parameters.setdefault('cisco_wlc', []) checkgroup_parameters['cisco_wlc'] = [ - ( {'ap_name': [('HOMEOFFICE', 0), ('FALLBACK', 2)], 'ap_model': [('K7-B30329', 3)]}, [], ALL_HOSTS, ALL_SERVICES ), + ( {'ap_name': [('HOMEOFFICE', 0), ('FALLBACK', 2)]}, [], ALL_HOSTS, ALL_SERVICES ), ] + checkgroup_parameters['cisco_wlc'] [parameters] -parameters(dict): with the keys "ap_model" and "ap_name" +parameters(dict): with the key "ap_name" - The values in this dict are lists of tuples. Each tuple contains - either (ap_name(string), action(int)) or (ap_model(string), action(int)), - where the ap_name is the human readable name of the AP and the ap_model is the model number. - The action represents the outcome when this model is missing and can be - from 0 to 3 (OK, WARN, CRIT, UNKNOWN) + The values in this dict are lists of tuples. Each tuple contains (ap_name(string), action(int)) + where the ap_name is the human readable name of the AP. + The action represents the outcome when this name missing and + ranges from 0 to 3 (OK, WARN, CRIT, UNKNOWN) diff --git a/checks/cisco_wlc b/checks/cisco_wlc index f370532..00b6c0f 100644 --- a/checks/cisco_wlc +++ b/checks/cisco_wlc @@ -54,10 +54,6 @@ def check_cisco_wlc(item, params, info): for ap_name, ap_state in params.get("ap_name", []): if item.startswith(ap_name): return ap_state, "Accesspoint 1 not found (State set to %s by rule)" % nagios_state_names[ap_state] - # If the device is missin, with cannot know the model - #for ap_model, ap_state in params.get("ap_model", []): - # if mode.startswith(ap_model): - # return ap_state, "Accesspoint 2 not found (State set to %s by rule)" % nagios_state_names[ap_state] return 2, "Accesspoint not found" diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index b026456..c19e5e3 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1223,17 +1223,6 @@ register_check_parameters( ), title = _("Access point name"), add_label = _("Add name")) - ), - ( "ap_model", - ListOf( - Tuple( - elements = [ - TextAscii(title = _("AP model")), - MonitoringState( title=_("State when missing"), default_value = 2) - ] - ), - title = _("Access point device id"), - add_label = _("Add id")) ) ] ),