From f7e80b4e41b27a8a3718c1ca975c568541dd6f57 Mon Sep 17 00:00:00 2001 From: Robert Sander Date: Wed, 4 Dec 2024 17:42:24 +0100 Subject: [PATCH] adds possibility for pre-configured tags --- holidays/bin/holidays.py | 15 ++++++++++++--- holidays/holidays-2.2.0.mkp | Bin 5704 -> 0 bytes holidays/holidays-2.2.1.mkp | Bin 0 -> 5787 bytes 3 files changed, 12 insertions(+), 3 deletions(-) delete mode 100644 holidays/holidays-2.2.0.mkp create mode 100644 holidays/holidays-2.2.1.mkp diff --git a/holidays/bin/holidays.py b/holidays/bin/holidays.py index 5c30878c..79a0741c 100755 --- a/holidays/bin/holidays.py +++ b/holidays/bin/holidays.py @@ -404,11 +404,20 @@ def add_holiday_timeperiod(country=default_country, state=None, all_states=False 'documentation_url': '', }, } - for key1, value1 in config["notification_rule_config"].items(): if key1 in rule_config: for key2, value2 in value1.items(): - rule_config[key1][key2] = value2 + if key2 in rule_config[key1]: + if key1 == "conditions": + if rule_config[key1][key2]["state"] == "disabled": + rule_config[key1][key2] = value2 + else: + if key2 == "match_host_tags": + rule_config[key1][key2]["value"].extend(value2["value"]) + else: + rule_config[key1][key2] = value2 + else: + rule_config[key1][key2] = value2 else: rule_config[key1] = value1 @@ -439,7 +448,7 @@ def add_holiday_timeperiod(country=default_country, state=None, all_states=False if args.func == "cleanup": nrs, etag = cmk.get_all_notification_rules() for nr in nrs['value']: - if nr['extensions']['rule_config']['rule_properties']['comment'] == created_by: + if nr['extensions']['rule_config']['rule_properties']['comment'].strip() == created_by: if args.debug: print(f"removing notification rule {nr['id']}") cmk.delete_notification_rule(nr['id']) diff --git a/holidays/holidays-2.2.0.mkp b/holidays/holidays-2.2.0.mkp deleted file mode 100644 index 55b3c22875f84afd8e517fa03e2edc50642883d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5704 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