Merge pull request #566 from Checkmk/devel

Release 4.3.1

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

changelogs/fragments/fix_rule_conditions_missing.yml

@@ -0,0 +1,2 @@
+bugfixes:
+ - Rule module - Fix empty rule conditions.

changelogs/fragments/release_summary.yml

@@ -0,0 +1 @@
+release_summary: "Bugfix Release."

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

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": [],

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 }}"