Module: check_mk Branch: master Commit: 2912cd1097c694a3585ed3651038c4b472bd657d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2912cd1097c694… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Dec 20 09:40:28 2016 +0100 4173 FIX if.include: ignore some more keys in 'Network interfaces and switch ports' rule which are only used for interface grouping Change-Id: I8d55574ce0c25fbd48cc2935b96d54917252b5d7 --- .werks/4173 | 10 ++++++++++ ChangeLog | 3 +++ web/plugins/wato/check_parameters.py | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/4173 b/.werks/4173 new file mode 100644 index 0000000..f55a014 --- /dev/null +++ b/.werks/4173 @@ -0,0 +1,10 @@ +Title: if.include: ignore some more keys in 'Network interfaces and switch ports' rule which are only used for interface grouping +Level: 1 +Component: check +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1482223101 + + diff --git a/ChangeLog b/ChangeLog index fc25104..f4ec358 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,9 @@ * 4155 FIX: Do not perform actions on events if overflow limit is active... * 4156 FIX: Fix off-by-one error in EC limit handling... + check: + * 4173 FIX: if.include: ignore some more keys in 'Network interfaces and switch ports' rule which are only used for interface grouping + 1.4.0i3: Core & Setup: diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 92a622e..0df53e0 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6189,7 +6189,7 @@ register_check_parameters( # Transform old traffic related levels which used "traffic" and "traffic_minimum" # keys where each was configured with an Alternative valuespec Transform(Dictionary( - ignored_keys = [ "aggr_member_item", "aggregate" ], # Created by discovery when using interface grouping + ignored_keys = [ "include_items", "iftype", "aggr_member_item", "aggregate" ], # Created by discovery when using interface grouping elements = [ ( "errors", Alternative(