Merge pull request #649 from Checkmk/devel

Release 5.2.1

.gitignore

@@ -10,4 +10,5 @@ build/
 tests/output
 playbooks/vars/config.yml
 playbooks/test*.yml
-venv/
+venv/
+.direnv/

SUPPORT.md

@@ -56,3 +56,4 @@ Collection Version | Checkmk Versions | Ansible Versions | Remarks
 5.0.0 | 2.1.0p44, 2.2.0p27, 2.3.0p5 | 2.15, 2.16, 2.17 | Breaking changes to the following modules: `lookup_folder`, `rule` and role: `agent`.
 5.1.0 | 2.1.0p44, 2.2.0p27, 2.3.0p6 | 2.15, 2.16, 2.17 | None
 5.2.0 | 2.1.0p46, 2.2.0p31, 2.3.0p11 | 2.15, 2.16, 2.17 | None
+5.2.1 | 2.1.0p46, 2.2.0p32, 2.3.0p12 | 2.15, 2.16, 2.17 | None

changelogs/fragments/folder.yml

@@ -0,0 +1,3 @@
+bugfixes:
+  - Folder module - Fix bug, where `update_attributes` failed on a folder with
+    the Network Scan enabled.

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: 5.2.0
+version: 5.2.1
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md

plugins/modules/folder.py

@@ -387,8 +387,8 @@ def _get_current(self):
             for key, value in extensions.items():
                 if key == "attributes":
                     value.pop("meta_data")
-                    if "network_scan_results" in value:
-                        value.pop("network_scan_results")
+                    if "network_scan_result" in value:
+                        value.pop("network_scan_result")
                 self.current[key] = value
 
             self.etag = result.etag

roles/agent/README.md

@@ -16,7 +16,7 @@ Please make sure it is installed on your system and available for Ansible.
 
 ## Role Variables
 
-    checkmk_agent_version: "2.3.0p11"
+    checkmk_agent_version: "2.3.0p12"
 
 The Checkmk version of the site your agents will talk to.
 

roles/agent/defaults/main.yml

@@ -1,5 +1,5 @@
 ---
-checkmk_agent_version: "2.3.0p11"
+checkmk_agent_version: "2.3.0p12"
 checkmk_agent_edition: cre
 checkmk_agent_server_protocol: http
 checkmk_agent_server: localhost

roles/agent/molecule/2.2.0/group_vars/all.yml

@@ -1,6 +1,6 @@
 ---
 # General
-checkmk_var_version: "2.2.0p31"
+checkmk_var_version: "2.2.0p32"
 checkmk_var_edition: "cre"
 checkmk_var_checkmk_site: "mysite"
 checkmk_var_automation_user: "cmkadmin"

roles/agent/molecule/2.3.0/group_vars/all.yml

@@ -1,6 +1,6 @@
 ---
 # General
-checkmk_var_version: "2.3.0p11"
+checkmk_var_version: "2.3.0p12"
 checkmk_var_edition: "cre"
 checkmk_var_checkmk_site: "mysite"
 checkmk_var_automation_user: "cmkadmin"

roles/server/README.md

@@ -25,7 +25,7 @@ To learn about the distributions used in automated tests, inspect the correspond
 
 ## Role Variables
 
-    checkmk_server_version: "2.3.0p11"
+    checkmk_server_version: "2.3.0p12"
 
 The global Checkmk version. This is used for installing Checkmk.
 To manage sites and their version, see `checkmk_server_sites`.

roles/server/defaults/main.yml

@@ -25,7 +25,7 @@ checkmk_server_server_stable_os:
   - Ubuntu-22
   - Ubuntu-24
 
-checkmk_server_version: "2.3.0p11"
+checkmk_server_version: "2.3.0p12"
 checkmk_server_edition: cre
 checkmk_server_verify_setup: 'true'
 

roles/server/molecule/2.2.0/group_vars/all.yml

@@ -1,6 +1,6 @@
 ---
 # General
-checkmk_var_version: "2.2.0p31"
+checkmk_var_version: "2.2.0p32"
 checkmk_var_edition: "cre"
 checkmk_server_verify_setup: 'true'
 checkmk_var_server_url: "http://127.0.0.1/"

roles/server/molecule/2.3.0/group_vars/all.yml

@@ -1,6 +1,6 @@
 ---
 # General
-checkmk_var_version: "2.3.0p11"
+checkmk_var_version: "2.3.0p12"
 checkmk_var_edition: "cre"
 checkmk_server_verify_setup: 'true'
 checkmk_var_server_url: "http://127.0.0.1/"

scripts/release.sh

@@ -16,8 +16,8 @@ collection_dir="${script_dir%/*}"
 
 # Update these as necessary:
 checkmk_ancient="2.1.0p46"
-checkmk_oldstable="2.2.0p31"
-checkmk_stable="2.3.0p11"
+checkmk_oldstable="2.2.0p32"
+checkmk_stable="2.3.0p12"
 
 while getopts 's:t:' OPTION; do
   case "$OPTION" in

tests/integration/targets/activation/vars/main.yml

@@ -1,12 +1,12 @@
 ---
 test_sites:
-  - version: "2.3.0p11"
+  - version: "2.3.0p12"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.3.0p11"
+  - version: "2.3.0p12"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.2.0p31"
+  - version: "2.2.0p32"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p46"

tests/integration/targets/bakery/vars/main.yml

@@ -1,9 +1,9 @@
 ---
 test_sites:
-  - version: "2.3.0p11"
+  - version: "2.3.0p12"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.2.0p31"
+  - version: "2.2.0p32"
     edition: "cee"
     site: "old_cee"
   # - version: "2.1.0p46"

tests/integration/targets/contact_group/vars/main.yml

@@ -1,15 +1,15 @@
 ---
 test_sites:
-  - version: "2.3.0p11"
+  - version: "2.3.0p12"
     edition: "cme"
     site: "stable_cme"
-  - version: "2.3.0p11"
+  - version: "2.3.0p12"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p11"
+  - version: "2.3.0p12"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p31"
+  - version: "2.2.0p32"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p46"

tests/integration/targets/discovery/vars/main.yml

@@ -1,12 +1,12 @@
 ---
 test_sites:
-  - version: "2.3.0p11"
+  - version: "2.3.0p12"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p11"
+  - version: "2.3.0p12"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p31"
+  - version: "2.2.0p32"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p46"

tests/integration/targets/downtime/vars/main.yml

@@ -1,12 +1,12 @@
 ---
 test_sites:
-  - version: "2.3.0p11"
+  - version: "2.3.0p12"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p11"
+  - version: "2.3.0p12"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p31"
+  - version: "2.2.0p32"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p46"

tests/integration/targets/folder/vars/main.yml

@@ -1,12 +1,12 @@
 ---
 test_sites:
-  - version: "2.3.0p11"
+  - version: "2.3.0p12"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p11"
+  - version: "2.3.0p12"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p31"
+  - version: "2.2.0p32"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p46"

tests/integration/targets/host/vars/main.yml

@@ -1,12 +1,12 @@
 ---
 test_sites:
-  - version: "2.3.0p11"
+  - version: "2.3.0p12"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.3.0p11"
+  - version: "2.3.0p12"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.2.0p31"
+  - version: "2.2.0p32"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p46"

tests/integration/targets/host_group/vars/main.yml

@@ -1,15 +1,15 @@
 ---
 test_sites:
-  - version: "2.3.0p11"
+  - version: "2.3.0p12"
     edition: "cme"
     site: "stable_cme"
-  - version: "2.3.0p11"
+  - version: "2.3.0p12"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p11"
+  - version: "2.3.0p12"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p31"
+  - version: "2.2.0p32"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p46"

tests/integration/targets/lookup_bakery/vars/main.yml

@@ -1,9 +1,9 @@
 ---
 test_sites:
-  - version: "2.3.0p11"
+  - version: "2.3.0p12"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.2.0p31"
+  - version: "2.2.0p32"
     edition: "cee"
     site: "old_cee"
   # - version: "2.1.0p46"

tests/integration/targets/lookup_folder/vars/main.yml

@@ -1,12 +1,12 @@
 ---
 test_sites:
-  - version: "2.3.0p11"
+  - version: "2.3.0p12"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p11"
+  - version: "2.3.0p12"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p31"
+  - version: "2.2.0p32"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p46"

tests/integration/targets/lookup_folders/vars/main.yml

@@ -1,12 +1,12 @@
 ---
 test_sites:
-  - version: "2.3.0p11"
+  - version: "2.3.0p12"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p11"
+  - version: "2.3.0p12"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p31"
+  - version: "2.2.0p32"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p46"

tests/integration/targets/lookup_host/vars/main.yml

@@ -1,12 +1,12 @@
 ---
 test_sites:
-  - version: "2.3.0p11"
+  - version: "2.3.0p12"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p11"
+  - version: "2.3.0p12"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p31"
+  - version: "2.2.0p32"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p46"

tests/integration/targets/lookup_hosts/vars/main.yml

@@ -1,12 +1,12 @@
 ---
 test_sites:
-  - version: "2.3.0p11"
+  - version: "2.3.0p12"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p11"
+  - version: "2.3.0p12"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p31"
+  - version: "2.2.0p32"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p46"

tests/integration/targets/lookup_rules/vars/main.yml

@@ -1,12 +1,12 @@
 ---
 test_sites:
-  - version: "2.3.0p11"
+  - version: "2.3.0p12"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p11"
+  - version: "2.3.0p12"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p31"
+  - version: "2.2.0p32"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p46"

tests/integration/targets/lookup_rulesets/vars/main.yml

@@ -1,12 +1,12 @@
 ---
 test_sites:
-  - version: "2.3.0p11"
+  - version: "2.3.0p12"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p11"
+  - version: "2.3.0p12"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p31"
+  - version: "2.2.0p32"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p46"

tests/integration/targets/lookup_version/vars/main.yml

@@ -1,12 +1,12 @@
 ---
 test_sites:
-  - version: "2.3.0p11"
+  - version: "2.3.0p12"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p11"
+  - version: "2.3.0p12"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p31"
+  - version: "2.2.0p32"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p46"

tests/integration/targets/password/vars/main.yml

@@ -1,15 +1,15 @@
 ---
 test_sites:
-  - version: "2.3.0p11"
+  - version: "2.3.0p12"
     edition: "cme"
     site: "stable_cme"
-  - version: "2.3.0p11"
+  - version: "2.3.0p12"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p11"
+  - version: "2.3.0p12"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p31"
+  - version: "2.2.0p32"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p46"