[checkmk-commits] Load EC rule-related config files in a fixed order.

Module: check_mk Branch: master Commit: 41c27134eeb3ba38c576b66afd9748974769bbc8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41c27134eeb3ba… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Mar 23 15:08:20 2018 +0100 Load EC rule-related config files in a fixed order. Change-Id: Ib974f5064fdb760ab327731ad3a6caabf298fee2 --- cmk/ec/export.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/cmk/ec/export.py b/cmk/ec/export.py index 958a92c..23863bd 100644 --- a/cmk/ec/export.py +++ b/cmk/ec/export.py @@ -218,10 +218,8 @@ def load_rule_packs(): "rule_packs": [], "mkp_rule_packs": {} } # type: Dict[str, Any] - - rules_file = rule_pack_dir() / "rules.mk" - if rules_file.is_file(): - cmk.store.load_mk_file(str(rules_file), context) + for path in [rule_pack_dir() / "rules.mk"] + sorted(mkp_rule_pack_dir().glob('*.mk')): + cmk.store.load_mk_file(str(path), context) # Convert some data fields into a new format for rule in context["rules"]: @@ -235,9 +233,6 @@ def load_rule_packs(): context["rule_packs"] = [ cmk.ec.defaults.default_rule_pack(context["rules"])] - for file_ in mkp_rule_pack_dir().glob('*.mk'): - cmk.store.load_mk_file(str(file_), context) - bind_to_rule_pack_proxies(context['rule_packs'], context['mkp_rule_packs']) return context['rules'], context['rule_packs']