From f26f7f3d04d5fc25d73bc477b58136a4671b977a Mon Sep 17 00:00:00 2001 From: Robin Gierse Date: Wed, 7 Aug 2024 15:05:52 +0200 Subject: [PATCH 1/6] Bump Checkmk Version. --- roles/agent/README.md | 2 +- roles/agent/defaults/main.yml | 2 +- roles/agent/molecule/2.3.0/group_vars/all.yml | 2 +- roles/server/README.md | 2 +- roles/server/defaults/main.yml | 2 +- roles/server/molecule/2.3.0/group_vars/all.yml | 2 +- scripts/release.sh | 2 +- tests/integration/targets/activation/vars/main.yml | 4 ++-- tests/integration/targets/bakery/vars/main.yml | 2 +- tests/integration/targets/contact_group/vars/main.yml | 6 +++--- tests/integration/targets/discovery/vars/main.yml | 4 ++-- tests/integration/targets/downtime/vars/main.yml | 4 ++-- tests/integration/targets/folder/vars/main.yml | 4 ++-- tests/integration/targets/host/vars/main.yml | 4 ++-- tests/integration/targets/host_group/vars/main.yml | 6 +++--- tests/integration/targets/lookup_bakery/vars/main.yml | 2 +- tests/integration/targets/lookup_folder/vars/main.yml | 4 ++-- tests/integration/targets/lookup_folders/vars/main.yml | 4 ++-- tests/integration/targets/lookup_host/vars/main.yml | 4 ++-- tests/integration/targets/lookup_hosts/vars/main.yml | 4 ++-- tests/integration/targets/lookup_rules/vars/main.yml | 4 ++-- tests/integration/targets/lookup_rulesets/vars/main.yml | 4 ++-- tests/integration/targets/lookup_version/vars/main.yml | 4 ++-- tests/integration/targets/password/vars/main.yml | 6 +++--- tests/integration/targets/rule/vars/main.yml | 4 ++-- tests/integration/targets/service_group/vars/main.yml | 6 +++--- tests/integration/targets/tag_group/vars/main.yml | 6 +++--- tests/integration/targets/timeperiod/vars/main.yml | 4 ++-- tests/integration/targets/user/vars/main.yml | 6 +++--- 29 files changed, 55 insertions(+), 55 deletions(-) diff --git a/roles/agent/README.md b/roles/agent/README.md index 046f73ccf..11a34009b 100644 --- a/roles/agent/README.md +++ b/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. diff --git a/roles/agent/defaults/main.yml b/roles/agent/defaults/main.yml index eee1ee160..ad14e376e 100644 --- a/roles/agent/defaults/main.yml +++ b/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 diff --git a/roles/agent/molecule/2.3.0/group_vars/all.yml b/roles/agent/molecule/2.3.0/group_vars/all.yml index f6e4ccda5..28d4a071f 100644 --- a/roles/agent/molecule/2.3.0/group_vars/all.yml +++ b/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" diff --git a/roles/server/README.md b/roles/server/README.md index 51b8303ca..5daff0e77 100644 --- a/roles/server/README.md +++ b/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`. diff --git a/roles/server/defaults/main.yml b/roles/server/defaults/main.yml index 3731fc730..aab5e8759 100644 --- a/roles/server/defaults/main.yml +++ b/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' diff --git a/roles/server/molecule/2.3.0/group_vars/all.yml b/roles/server/molecule/2.3.0/group_vars/all.yml index 30fb2b777..49b2d148a 100644 --- a/roles/server/molecule/2.3.0/group_vars/all.yml +++ b/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/" diff --git a/scripts/release.sh b/scripts/release.sh index 2310e2497..eb04e271f 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -17,7 +17,7 @@ collection_dir="${script_dir%/*}" # Update these as necessary: checkmk_ancient="2.1.0p46" checkmk_oldstable="2.2.0p31" -checkmk_stable="2.3.0p11" +checkmk_stable="2.3.0p12" while getopts 's:t:' OPTION; do case "$OPTION" in diff --git a/tests/integration/targets/activation/vars/main.yml b/tests/integration/targets/activation/vars/main.yml index 68f3527dc..b2bdd44d1 100644 --- a/tests/integration/targets/activation/vars/main.yml +++ b/tests/integration/targets/activation/vars/main.yml @@ -1,9 +1,9 @@ --- 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" diff --git a/tests/integration/targets/bakery/vars/main.yml b/tests/integration/targets/bakery/vars/main.yml index fa834455a..c0716620c 100644 --- a/tests/integration/targets/bakery/vars/main.yml +++ b/tests/integration/targets/bakery/vars/main.yml @@ -1,6 +1,6 @@ --- test_sites: - - version: "2.3.0p11" + - version: "2.3.0p12" edition: "cee" site: "stable_cee" - version: "2.2.0p31" diff --git a/tests/integration/targets/contact_group/vars/main.yml b/tests/integration/targets/contact_group/vars/main.yml index 66ec1d624..57fdc8c29 100644 --- a/tests/integration/targets/contact_group/vars/main.yml +++ b/tests/integration/targets/contact_group/vars/main.yml @@ -1,12 +1,12 @@ --- 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" diff --git a/tests/integration/targets/discovery/vars/main.yml b/tests/integration/targets/discovery/vars/main.yml index f2e0ea5d5..8b6e21c75 100644 --- a/tests/integration/targets/discovery/vars/main.yml +++ b/tests/integration/targets/discovery/vars/main.yml @@ -1,9 +1,9 @@ --- 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" diff --git a/tests/integration/targets/downtime/vars/main.yml b/tests/integration/targets/downtime/vars/main.yml index 0690fc13b..fc83af66d 100644 --- a/tests/integration/targets/downtime/vars/main.yml +++ b/tests/integration/targets/downtime/vars/main.yml @@ -1,9 +1,9 @@ --- 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" diff --git a/tests/integration/targets/folder/vars/main.yml b/tests/integration/targets/folder/vars/main.yml index 55bf19ed1..33c6996b3 100644 --- a/tests/integration/targets/folder/vars/main.yml +++ b/tests/integration/targets/folder/vars/main.yml @@ -1,9 +1,9 @@ --- 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" diff --git a/tests/integration/targets/host/vars/main.yml b/tests/integration/targets/host/vars/main.yml index a177038c1..7cb488fe8 100644 --- a/tests/integration/targets/host/vars/main.yml +++ b/tests/integration/targets/host/vars/main.yml @@ -1,9 +1,9 @@ --- 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" diff --git a/tests/integration/targets/host_group/vars/main.yml b/tests/integration/targets/host_group/vars/main.yml index 81a07d4b3..d2553cdb7 100644 --- a/tests/integration/targets/host_group/vars/main.yml +++ b/tests/integration/targets/host_group/vars/main.yml @@ -1,12 +1,12 @@ --- 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" diff --git a/tests/integration/targets/lookup_bakery/vars/main.yml b/tests/integration/targets/lookup_bakery/vars/main.yml index a04ed7252..c4dda6966 100644 --- a/tests/integration/targets/lookup_bakery/vars/main.yml +++ b/tests/integration/targets/lookup_bakery/vars/main.yml @@ -1,6 +1,6 @@ --- test_sites: - - version: "2.3.0p11" + - version: "2.3.0p12" edition: "cee" site: "stable_cee" - version: "2.2.0p31" diff --git a/tests/integration/targets/lookup_folder/vars/main.yml b/tests/integration/targets/lookup_folder/vars/main.yml index b75be1905..54a8183c5 100644 --- a/tests/integration/targets/lookup_folder/vars/main.yml +++ b/tests/integration/targets/lookup_folder/vars/main.yml @@ -1,9 +1,9 @@ --- 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" diff --git a/tests/integration/targets/lookup_folders/vars/main.yml b/tests/integration/targets/lookup_folders/vars/main.yml index 7d9f6d02c..2c38a3e38 100644 --- a/tests/integration/targets/lookup_folders/vars/main.yml +++ b/tests/integration/targets/lookup_folders/vars/main.yml @@ -1,9 +1,9 @@ --- 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" diff --git a/tests/integration/targets/lookup_host/vars/main.yml b/tests/integration/targets/lookup_host/vars/main.yml index a29f4e24a..37e4bd917 100644 --- a/tests/integration/targets/lookup_host/vars/main.yml +++ b/tests/integration/targets/lookup_host/vars/main.yml @@ -1,9 +1,9 @@ --- 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" diff --git a/tests/integration/targets/lookup_hosts/vars/main.yml b/tests/integration/targets/lookup_hosts/vars/main.yml index dd04c74c6..6616306b6 100644 --- a/tests/integration/targets/lookup_hosts/vars/main.yml +++ b/tests/integration/targets/lookup_hosts/vars/main.yml @@ -1,9 +1,9 @@ --- 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" diff --git a/tests/integration/targets/lookup_rules/vars/main.yml b/tests/integration/targets/lookup_rules/vars/main.yml index 259849651..bd510001b 100644 --- a/tests/integration/targets/lookup_rules/vars/main.yml +++ b/tests/integration/targets/lookup_rules/vars/main.yml @@ -1,9 +1,9 @@ --- 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" diff --git a/tests/integration/targets/lookup_rulesets/vars/main.yml b/tests/integration/targets/lookup_rulesets/vars/main.yml index f55f77a81..32ff6afa9 100644 --- a/tests/integration/targets/lookup_rulesets/vars/main.yml +++ b/tests/integration/targets/lookup_rulesets/vars/main.yml @@ -1,9 +1,9 @@ --- 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" diff --git a/tests/integration/targets/lookup_version/vars/main.yml b/tests/integration/targets/lookup_version/vars/main.yml index 1d5b1b7a1..185e529f3 100644 --- a/tests/integration/targets/lookup_version/vars/main.yml +++ b/tests/integration/targets/lookup_version/vars/main.yml @@ -1,9 +1,9 @@ --- 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" diff --git a/tests/integration/targets/password/vars/main.yml b/tests/integration/targets/password/vars/main.yml index 803adad38..f89165857 100644 --- a/tests/integration/targets/password/vars/main.yml +++ b/tests/integration/targets/password/vars/main.yml @@ -1,12 +1,12 @@ --- 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" diff --git a/tests/integration/targets/rule/vars/main.yml b/tests/integration/targets/rule/vars/main.yml index 1d5b1b7a1..185e529f3 100644 --- a/tests/integration/targets/rule/vars/main.yml +++ b/tests/integration/targets/rule/vars/main.yml @@ -1,9 +1,9 @@ --- 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" diff --git a/tests/integration/targets/service_group/vars/main.yml b/tests/integration/targets/service_group/vars/main.yml index 757a489fb..dfea43422 100644 --- a/tests/integration/targets/service_group/vars/main.yml +++ b/tests/integration/targets/service_group/vars/main.yml @@ -1,12 +1,12 @@ --- 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" diff --git a/tests/integration/targets/tag_group/vars/main.yml b/tests/integration/targets/tag_group/vars/main.yml index fb1ed4578..407bd897e 100644 --- a/tests/integration/targets/tag_group/vars/main.yml +++ b/tests/integration/targets/tag_group/vars/main.yml @@ -1,12 +1,12 @@ --- 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" diff --git a/tests/integration/targets/timeperiod/vars/main.yml b/tests/integration/targets/timeperiod/vars/main.yml index 8e8f7d0a3..c8ab33d15 100644 --- a/tests/integration/targets/timeperiod/vars/main.yml +++ b/tests/integration/targets/timeperiod/vars/main.yml @@ -1,9 +1,9 @@ --- 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" diff --git a/tests/integration/targets/user/vars/main.yml b/tests/integration/targets/user/vars/main.yml index 93c0b0b93..f959b33de 100644 --- a/tests/integration/targets/user/vars/main.yml +++ b/tests/integration/targets/user/vars/main.yml @@ -1,12 +1,12 @@ --- 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" From 791b4a2028722301919b46ae48ffbbb61c498cce Mon Sep 17 00:00:00 2001 From: Robin Gierse Date: Tue, 13 Aug 2024 11:08:39 +0200 Subject: [PATCH 2/6] Bump Checkmk version. --- roles/agent/molecule/2.2.0/group_vars/all.yml | 2 +- roles/server/molecule/2.2.0/group_vars/all.yml | 2 +- scripts/release.sh | 2 +- tests/integration/targets/activation/vars/main.yml | 2 +- tests/integration/targets/bakery/vars/main.yml | 2 +- tests/integration/targets/contact_group/vars/main.yml | 2 +- tests/integration/targets/discovery/vars/main.yml | 2 +- tests/integration/targets/downtime/vars/main.yml | 2 +- tests/integration/targets/folder/vars/main.yml | 2 +- tests/integration/targets/host/vars/main.yml | 2 +- tests/integration/targets/host_group/vars/main.yml | 2 +- tests/integration/targets/lookup_bakery/vars/main.yml | 2 +- tests/integration/targets/lookup_folder/vars/main.yml | 2 +- tests/integration/targets/lookup_folders/vars/main.yml | 2 +- tests/integration/targets/lookup_host/vars/main.yml | 2 +- tests/integration/targets/lookup_hosts/vars/main.yml | 2 +- tests/integration/targets/lookup_rules/vars/main.yml | 2 +- tests/integration/targets/lookup_rulesets/vars/main.yml | 2 +- tests/integration/targets/lookup_version/vars/main.yml | 2 +- tests/integration/targets/password/vars/main.yml | 2 +- tests/integration/targets/rule/vars/main.yml | 2 +- tests/integration/targets/service_group/vars/main.yml | 2 +- tests/integration/targets/tag_group/vars/main.yml | 2 +- tests/integration/targets/timeperiod/vars/main.yml | 2 +- tests/integration/targets/user/vars/main.yml | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/roles/agent/molecule/2.2.0/group_vars/all.yml b/roles/agent/molecule/2.2.0/group_vars/all.yml index 6024116f8..7f4c94d44 100644 --- a/roles/agent/molecule/2.2.0/group_vars/all.yml +++ b/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" diff --git a/roles/server/molecule/2.2.0/group_vars/all.yml b/roles/server/molecule/2.2.0/group_vars/all.yml index 8ea5afac0..30262e8d8 100644 --- a/roles/server/molecule/2.2.0/group_vars/all.yml +++ b/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/" diff --git a/scripts/release.sh b/scripts/release.sh index eb04e271f..ec42142a8 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -16,7 +16,7 @@ collection_dir="${script_dir%/*}" # Update these as necessary: checkmk_ancient="2.1.0p46" -checkmk_oldstable="2.2.0p31" +checkmk_oldstable="2.2.0p32" checkmk_stable="2.3.0p12" while getopts 's:t:' OPTION; do diff --git a/tests/integration/targets/activation/vars/main.yml b/tests/integration/targets/activation/vars/main.yml index b2bdd44d1..e5d4f52a2 100644 --- a/tests/integration/targets/activation/vars/main.yml +++ b/tests/integration/targets/activation/vars/main.yml @@ -6,7 +6,7 @@ test_sites: - 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" diff --git a/tests/integration/targets/bakery/vars/main.yml b/tests/integration/targets/bakery/vars/main.yml index c0716620c..9a2b4ab7b 100644 --- a/tests/integration/targets/bakery/vars/main.yml +++ b/tests/integration/targets/bakery/vars/main.yml @@ -3,7 +3,7 @@ test_sites: - 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" diff --git a/tests/integration/targets/contact_group/vars/main.yml b/tests/integration/targets/contact_group/vars/main.yml index 57fdc8c29..91cd97521 100644 --- a/tests/integration/targets/contact_group/vars/main.yml +++ b/tests/integration/targets/contact_group/vars/main.yml @@ -9,7 +9,7 @@ test_sites: - 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" diff --git a/tests/integration/targets/discovery/vars/main.yml b/tests/integration/targets/discovery/vars/main.yml index 8b6e21c75..a6d7c4936 100644 --- a/tests/integration/targets/discovery/vars/main.yml +++ b/tests/integration/targets/discovery/vars/main.yml @@ -6,7 +6,7 @@ test_sites: - 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" diff --git a/tests/integration/targets/downtime/vars/main.yml b/tests/integration/targets/downtime/vars/main.yml index fc83af66d..fd377db58 100644 --- a/tests/integration/targets/downtime/vars/main.yml +++ b/tests/integration/targets/downtime/vars/main.yml @@ -6,7 +6,7 @@ test_sites: - 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" diff --git a/tests/integration/targets/folder/vars/main.yml b/tests/integration/targets/folder/vars/main.yml index 33c6996b3..a07327a23 100644 --- a/tests/integration/targets/folder/vars/main.yml +++ b/tests/integration/targets/folder/vars/main.yml @@ -6,7 +6,7 @@ test_sites: - 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" diff --git a/tests/integration/targets/host/vars/main.yml b/tests/integration/targets/host/vars/main.yml index 7cb488fe8..520da9632 100644 --- a/tests/integration/targets/host/vars/main.yml +++ b/tests/integration/targets/host/vars/main.yml @@ -6,7 +6,7 @@ test_sites: - 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" diff --git a/tests/integration/targets/host_group/vars/main.yml b/tests/integration/targets/host_group/vars/main.yml index d2553cdb7..f6644fd59 100644 --- a/tests/integration/targets/host_group/vars/main.yml +++ b/tests/integration/targets/host_group/vars/main.yml @@ -9,7 +9,7 @@ test_sites: - 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" diff --git a/tests/integration/targets/lookup_bakery/vars/main.yml b/tests/integration/targets/lookup_bakery/vars/main.yml index c4dda6966..72e0fb20d 100644 --- a/tests/integration/targets/lookup_bakery/vars/main.yml +++ b/tests/integration/targets/lookup_bakery/vars/main.yml @@ -3,7 +3,7 @@ test_sites: - 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" diff --git a/tests/integration/targets/lookup_folder/vars/main.yml b/tests/integration/targets/lookup_folder/vars/main.yml index 54a8183c5..67bf8af88 100644 --- a/tests/integration/targets/lookup_folder/vars/main.yml +++ b/tests/integration/targets/lookup_folder/vars/main.yml @@ -6,7 +6,7 @@ test_sites: - 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" diff --git a/tests/integration/targets/lookup_folders/vars/main.yml b/tests/integration/targets/lookup_folders/vars/main.yml index 2c38a3e38..105c9e313 100644 --- a/tests/integration/targets/lookup_folders/vars/main.yml +++ b/tests/integration/targets/lookup_folders/vars/main.yml @@ -6,7 +6,7 @@ test_sites: - 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" diff --git a/tests/integration/targets/lookup_host/vars/main.yml b/tests/integration/targets/lookup_host/vars/main.yml index 37e4bd917..111e29959 100644 --- a/tests/integration/targets/lookup_host/vars/main.yml +++ b/tests/integration/targets/lookup_host/vars/main.yml @@ -6,7 +6,7 @@ test_sites: - 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" diff --git a/tests/integration/targets/lookup_hosts/vars/main.yml b/tests/integration/targets/lookup_hosts/vars/main.yml index 6616306b6..4cfdf791c 100644 --- a/tests/integration/targets/lookup_hosts/vars/main.yml +++ b/tests/integration/targets/lookup_hosts/vars/main.yml @@ -6,7 +6,7 @@ test_sites: - 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" diff --git a/tests/integration/targets/lookup_rules/vars/main.yml b/tests/integration/targets/lookup_rules/vars/main.yml index bd510001b..10de491cb 100644 --- a/tests/integration/targets/lookup_rules/vars/main.yml +++ b/tests/integration/targets/lookup_rules/vars/main.yml @@ -6,7 +6,7 @@ test_sites: - 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" diff --git a/tests/integration/targets/lookup_rulesets/vars/main.yml b/tests/integration/targets/lookup_rulesets/vars/main.yml index 32ff6afa9..754963c1f 100644 --- a/tests/integration/targets/lookup_rulesets/vars/main.yml +++ b/tests/integration/targets/lookup_rulesets/vars/main.yml @@ -6,7 +6,7 @@ test_sites: - 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" diff --git a/tests/integration/targets/lookup_version/vars/main.yml b/tests/integration/targets/lookup_version/vars/main.yml index 185e529f3..766766053 100644 --- a/tests/integration/targets/lookup_version/vars/main.yml +++ b/tests/integration/targets/lookup_version/vars/main.yml @@ -6,7 +6,7 @@ test_sites: - 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" diff --git a/tests/integration/targets/password/vars/main.yml b/tests/integration/targets/password/vars/main.yml index f89165857..f5bd53349 100644 --- a/tests/integration/targets/password/vars/main.yml +++ b/tests/integration/targets/password/vars/main.yml @@ -9,7 +9,7 @@ test_sites: - 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" diff --git a/tests/integration/targets/rule/vars/main.yml b/tests/integration/targets/rule/vars/main.yml index 185e529f3..766766053 100644 --- a/tests/integration/targets/rule/vars/main.yml +++ b/tests/integration/targets/rule/vars/main.yml @@ -6,7 +6,7 @@ test_sites: - 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" diff --git a/tests/integration/targets/service_group/vars/main.yml b/tests/integration/targets/service_group/vars/main.yml index dfea43422..f1e51a23e 100644 --- a/tests/integration/targets/service_group/vars/main.yml +++ b/tests/integration/targets/service_group/vars/main.yml @@ -9,7 +9,7 @@ test_sites: - 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" diff --git a/tests/integration/targets/tag_group/vars/main.yml b/tests/integration/targets/tag_group/vars/main.yml index 407bd897e..387992c56 100644 --- a/tests/integration/targets/tag_group/vars/main.yml +++ b/tests/integration/targets/tag_group/vars/main.yml @@ -9,7 +9,7 @@ test_sites: - 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" diff --git a/tests/integration/targets/timeperiod/vars/main.yml b/tests/integration/targets/timeperiod/vars/main.yml index c8ab33d15..278b978f4 100644 --- a/tests/integration/targets/timeperiod/vars/main.yml +++ b/tests/integration/targets/timeperiod/vars/main.yml @@ -6,7 +6,7 @@ test_sites: - 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" diff --git a/tests/integration/targets/user/vars/main.yml b/tests/integration/targets/user/vars/main.yml index f959b33de..01d9bd68c 100644 --- a/tests/integration/targets/user/vars/main.yml +++ b/tests/integration/targets/user/vars/main.yml @@ -9,7 +9,7 @@ test_sites: - 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" From 35039890a0fa81338259d0ae6657c6cd2d627f20 Mon Sep 17 00:00:00 2001 From: Lars Getwan Date: Wed, 14 Aug 2024 12:56:08 +0200 Subject: [PATCH 3/6] Looks like it is fixed NOW. --- plugins/modules/folder.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/modules/folder.py b/plugins/modules/folder.py index efebd552b..b3657e99f 100644 --- a/plugins/modules/folder.py +++ b/plugins/modules/folder.py @@ -384,13 +384,15 @@ def _get_current(self): self.current["title"] = content["title"] extensions = content["extensions"] + self.module.warn("current: %s" % str(extensions)) 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.module.warn("current after pop: %s" % str(self.current)) self.etag = result.etag else: From a36a3bff3c02a556b0bf4943810625e561e89286 Mon Sep 17 00:00:00 2001 From: Lars Getwan Date: Wed, 14 Aug 2024 13:00:26 +0200 Subject: [PATCH 4/6] Removed debugging. --- plugins/modules/folder.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugins/modules/folder.py b/plugins/modules/folder.py index b3657e99f..929a2f61e 100644 --- a/plugins/modules/folder.py +++ b/plugins/modules/folder.py @@ -384,7 +384,6 @@ def _get_current(self): self.current["title"] = content["title"] extensions = content["extensions"] - self.module.warn("current: %s" % str(extensions)) for key, value in extensions.items(): if key == "attributes": value.pop("meta_data") @@ -392,7 +391,6 @@ def _get_current(self): value.pop("network_scan_result") self.current[key] = value - self.module.warn("current after pop: %s" % str(self.current)) self.etag = result.etag else: From 112e68c940578ab11bd328b0da9a09a5de80f79c Mon Sep 17 00:00:00 2001 From: Robin Gierse Date: Wed, 14 Aug 2024 14:14:56 +0200 Subject: [PATCH 5/6] Prepare release. --- .gitignore | 3 ++- SUPPORT.md | 1 + galaxy.yml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2effe2425..44e80362a 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,5 @@ build/ tests/output playbooks/vars/config.yml playbooks/test*.yml -venv/ \ No newline at end of file +venv/ +.direnv/ \ No newline at end of file diff --git a/SUPPORT.md b/SUPPORT.md index 39385e581..2a255bdd8 100644 --- a/SUPPORT.md +++ b/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 diff --git a/galaxy.yml b/galaxy.yml index 0e90ffb39..8dfa2acca 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: 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 From 2501b85ba63c43a178116afa5855f39f4b0a9703 Mon Sep 17 00:00:00 2001 From: Robin Gierse Date: Wed, 14 Aug 2024 14:19:12 +0200 Subject: [PATCH 6/6] Add changelogs. --- changelogs/fragments/folder.yml | 3 +++ changelogs/fragments/release_summary.yml | 1 + 2 files changed, 4 insertions(+) create mode 100644 changelogs/fragments/folder.yml create mode 100644 changelogs/fragments/release_summary.yml diff --git a/changelogs/fragments/folder.yml b/changelogs/fragments/folder.yml new file mode 100644 index 000000000..eb74e83f2 --- /dev/null +++ b/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. 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."