From b449a5beeb9e9142ded1c5ea21c6195e79f455fd Mon Sep 17 00:00:00 2001 From: Robin Gierse Date: Mon, 19 Feb 2024 14:09:40 -0500 Subject: [PATCH 1/5] Bugfix bakery integration tests. --- tests/integration/targets/bakery/tasks/main.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/integration/targets/bakery/tasks/main.yml b/tests/integration/targets/bakery/tasks/main.yml index bbb3963bc..de3aba5ec 100644 --- a/tests/integration/targets/bakery/tasks/main.yml +++ b/tests/integration/targets/bakery/tasks/main.yml @@ -5,6 +5,16 @@ - name: "Run Preparations." ansible.builtin.include_tasks: /root/ansible_collections/checkmk/general/tests/integration/files/includes/tasks/prep.yml +- name: "Inject a Key into the Sites." # This is a hack and should never be done in production! + ansible.builtin.copy: + src: agent_signature_keys.mk + dest: "/omd/sites/{{ item.site }}/etc/check_mk/multisite.d/wato/agent_signature_keys.mk" + owner: "{{ item.site }}" + group: "{{ item.site }}" + mode: "0660" + loop: "{{ test_sites }}" + when: (download_pass is defined and download_pass | length) or item.edition == "cre" + - name: "Testing." ansible.builtin.include_tasks: test.yml loop: "{{ test_sites }}" From ad44786ddf5680cd6937ab363b52c72e15c53885 Mon Sep 17 00:00:00 2001 From: Mik3yZ Date: Tue, 20 Feb 2024 17:04:34 +0100 Subject: [PATCH 2/5] Update rule.py rule.py always overwrites rule["conditions"] when conditions are given, and doesn't fill it with an empty dict when no conditions are given --- plugins/modules/rule.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/modules/rule.py b/plugins/modules/rule.py index a446c98a2..238dbd8cd 100644 --- a/plugins/modules/rule.py +++ b/plugins/modules/rule.py @@ -583,7 +583,7 @@ def run_module(): if not rule.get("value_raw"): exit_failed(module, "Rule value_raw is required") # Default to all hosts if conditions arent given - if rule.get("conditions"): + if not rule.get("conditions"): rule["conditions"] = { "host_tags": [], "host_labels": [], From ebbc087882cceb3cca7f396ddd95b4fcdbd5b80b Mon Sep 17 00:00:00 2001 From: Mik3yZ Date: Wed, 21 Feb 2024 10:00:11 +0100 Subject: [PATCH 3/5] Create fix_rule_conditions_missing.yml --- changelogs/fragments/fix_rule_conditions_missing.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 changelogs/fragments/fix_rule_conditions_missing.yml diff --git a/changelogs/fragments/fix_rule_conditions_missing.yml b/changelogs/fragments/fix_rule_conditions_missing.yml new file mode 100644 index 000000000..341b85838 --- /dev/null +++ b/changelogs/fragments/fix_rule_conditions_missing.yml @@ -0,0 +1,2 @@ +bugfixes: + - Rule module - Fix empty rule conditions. From 3a031c984553fd165c5848326d020476acb5bda1 Mon Sep 17 00:00:00 2001 From: Robin Gierse Date: Wed, 21 Feb 2024 08:26:44 -0500 Subject: [PATCH 4/5] Bump collection version. --- SUPPORT.md | 1 + galaxy.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/SUPPORT.md b/SUPPORT.md index 8700749a5..0cfd59c95 100644 --- a/SUPPORT.md +++ b/SUPPORT.md @@ -50,3 +50,4 @@ Collection Version | Checkmk Versions | Ansible Versions | Remarks 4.1.0 | 2.0.0p39, 2.1.0p37, 2.2.0p17 | 2.14, 2.15, 2.16 | None 4.2.0 | 2.0.0p39, 2.1.0p38, 2.2.0p19 | 2.14, 2.15, 2.16 | None 4.3.0 | 2.0.0p39, 2.1.0p39, 2.2.0p22 | 2.14, 2.15, 2.16 | None +4.3.1 | 2.0.0p39, 2.1.0p39, 2.2.0p22 | 2.14, 2.15, 2.16 | None diff --git a/galaxy.yml b/galaxy.yml index 028a6ee41..f4f35b8cd 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -10,7 +10,7 @@ name: general # The version of the collection. Must be compatible with semantic versioning -version: 4.3.0 +version: 4.3.1 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection readme: README.md From a1d8c357ed6c91df8e4e2303b73f93d9f63be2b2 Mon Sep 17 00:00:00 2001 From: Robin Gierse Date: Wed, 21 Feb 2024 08:28:35 -0500 Subject: [PATCH 5/5] Add release summary. --- changelogs/fragments/release_summary.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelogs/fragments/release_summary.yml diff --git a/changelogs/fragments/release_summary.yml b/changelogs/fragments/release_summary.yml new file mode 100644 index 000000000..b345fa2b5 --- /dev/null +++ b/changelogs/fragments/release_summary.yml @@ -0,0 +1 @@ +release_summary: "Bugfix Release."