From ec1191ad1146dc03cff3a6197f5cef2af33e9aa7 Mon Sep 17 00:00:00 2001 From: Robin Gierse Date: Tue, 27 Aug 2024 07:48:05 +0200 Subject: [PATCH] Bump Checkmk Versions. --- galaxy.yml | 2 +- roles/agent/README.md | 2 +- roles/agent/defaults/main.yml | 2 +- roles/agent/molecule/2.1.0/group_vars/all.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.1.0/group_vars/all.yml | 2 +- roles/server/molecule/2.3.0/group_vars/all.yml | 2 +- scripts/release.sh | 4 ++-- tests/integration/targets/activation/vars/main.yml | 6 +++--- tests/integration/targets/bakery/vars/main.yml | 4 ++-- tests/integration/targets/contact_group/vars/main.yml | 8 ++++---- tests/integration/targets/discovery/vars/main.yml | 6 +++--- tests/integration/targets/downtime/vars/main.yml | 6 +++--- tests/integration/targets/folder/vars/main.yml | 6 +++--- tests/integration/targets/host/vars/main.yml | 6 +++--- tests/integration/targets/host_group/vars/main.yml | 8 ++++---- tests/integration/targets/lookup_bakery/vars/main.yml | 4 ++-- tests/integration/targets/lookup_folder/vars/main.yml | 6 +++--- tests/integration/targets/lookup_folders/vars/main.yml | 6 +++--- tests/integration/targets/lookup_host/vars/main.yml | 6 +++--- tests/integration/targets/lookup_hosts/vars/main.yml | 6 +++--- tests/integration/targets/lookup_rules/vars/main.yml | 6 +++--- tests/integration/targets/lookup_rulesets/vars/main.yml | 6 +++--- tests/integration/targets/lookup_version/vars/main.yml | 6 +++--- tests/integration/targets/password/vars/main.yml | 8 ++++---- tests/integration/targets/rule/vars/main.yml | 6 +++--- tests/integration/targets/service_group/vars/main.yml | 8 ++++---- tests/integration/targets/tag_group/vars/main.yml | 8 ++++---- tests/integration/targets/timeperiod/vars/main.yml | 6 +++--- tests/integration/targets/user/vars/main.yml | 8 ++++---- 32 files changed, 81 insertions(+), 81 deletions(-) diff --git a/galaxy.yml b/galaxy.yml index 8dfa2acca..57b401ee9 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.1 +version: 5.3.0 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection readme: README.md diff --git a/roles/agent/README.md b/roles/agent/README.md index 6be11b99e..fb9372790 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.0p12' + checkmk_agent_version: '2.3.0p13" 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 925b1029f..8f4ef6c4c 100644 --- a/roles/agent/defaults/main.yml +++ b/roles/agent/defaults/main.yml @@ -1,5 +1,5 @@ --- -checkmk_agent_version: '2.3.0p12' +checkmk_agent_version: '2.3.0p13" checkmk_agent_edition: 'cre' checkmk_agent_server_protocol: 'http' checkmk_agent_server: 'localhost' diff --git a/roles/agent/molecule/2.1.0/group_vars/all.yml b/roles/agent/molecule/2.1.0/group_vars/all.yml index fde0ebf8e..3f43b2788 100644 --- a/roles/agent/molecule/2.1.0/group_vars/all.yml +++ b/roles/agent/molecule/2.1.0/group_vars/all.yml @@ -1,6 +1,6 @@ --- # General -checkmk_var_version: "2.1.0p46" +checkmk_var_version: "2.1.0p47" checkmk_var_edition: "cre" checkmk_var_checkmk_site: "mysite" checkmk_var_automation_user: "cmkadmin" 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 28d4a071f..1c8b0ee95 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.0p12" +checkmk_var_version: "2.3.0p13" 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 2d596ad96..d191abef2 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.0p12' + checkmk_server_version: '2.3.0p13" 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 3ae2b2b93..fd2b91b81 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.0p12' +checkmk_server_version: '2.3.0p13" checkmk_server_edition: 'cre' checkmk_server_verify_setup: 'true' diff --git a/roles/server/molecule/2.1.0/group_vars/all.yml b/roles/server/molecule/2.1.0/group_vars/all.yml index 3bbc9d767..a7b43e2b5 100644 --- a/roles/server/molecule/2.1.0/group_vars/all.yml +++ b/roles/server/molecule/2.1.0/group_vars/all.yml @@ -1,6 +1,6 @@ --- # General -checkmk_var_version: "2.1.0p46" +checkmk_var_version: "2.1.0p47" checkmk_var_edition: "cre" checkmk_server_verify_setup: 'true' checkmk_var_server_url: "http://127.0.0.1/" 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 49b2d148a..fa447dde0 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.0p12" +checkmk_var_version: "2.3.0p13" 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 ec42142a8..d21860a1e 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -15,9 +15,9 @@ script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) collection_dir="${script_dir%/*}" # Update these as necessary: -checkmk_ancient="2.1.0p46" +checkmk_ancient="2.1.0p47" checkmk_oldstable="2.2.0p32" -checkmk_stable="2.3.0p12" +checkmk_stable="2.3.0p13" 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 e5d4f52a2..f158a0e52 100644 --- a/tests/integration/targets/activation/vars/main.yml +++ b/tests/integration/targets/activation/vars/main.yml @@ -1,15 +1,15 @@ --- test_sites: - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cre" site: "stable_cre" - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cee" site: "stable_cee" - version: "2.2.0p32" edition: "cre" site: "old_cre" - # - version: "2.1.0p46" + # - version: "2.1.0p47" # edition: "cre" # site: "ancient_cre" diff --git a/tests/integration/targets/bakery/vars/main.yml b/tests/integration/targets/bakery/vars/main.yml index 9a2b4ab7b..ac7cff7fe 100644 --- a/tests/integration/targets/bakery/vars/main.yml +++ b/tests/integration/targets/bakery/vars/main.yml @@ -1,12 +1,12 @@ --- test_sites: - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cee" site: "stable_cee" - version: "2.2.0p32" edition: "cee" site: "old_cee" - # - version: "2.1.0p46" + # - version: "2.1.0p47" # edition: "cee" # site: "ancient_cee" diff --git a/tests/integration/targets/contact_group/vars/main.yml b/tests/integration/targets/contact_group/vars/main.yml index 91cd97521..10350bf54 100644 --- a/tests/integration/targets/contact_group/vars/main.yml +++ b/tests/integration/targets/contact_group/vars/main.yml @@ -1,18 +1,18 @@ --- test_sites: - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cme" site: "stable_cme" - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cee" site: "stable_cee" - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cre" site: "stable_cre" - version: "2.2.0p32" edition: "cre" site: "old_cre" - # - version: "2.1.0p46" + # - version: "2.1.0p47" # edition: "cre" # site: "ancient_cre" diff --git a/tests/integration/targets/discovery/vars/main.yml b/tests/integration/targets/discovery/vars/main.yml index a6d7c4936..b8dbfef02 100644 --- a/tests/integration/targets/discovery/vars/main.yml +++ b/tests/integration/targets/discovery/vars/main.yml @@ -1,15 +1,15 @@ --- test_sites: - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cee" site: "stable_cee" - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cre" site: "stable_cre" - version: "2.2.0p32" edition: "cre" site: "old_cre" - # - version: "2.1.0p46" + # - version: "2.1.0p47" # edition: "cre" # site: "ancient_cre" diff --git a/tests/integration/targets/downtime/vars/main.yml b/tests/integration/targets/downtime/vars/main.yml index fd377db58..c4d73cd6e 100644 --- a/tests/integration/targets/downtime/vars/main.yml +++ b/tests/integration/targets/downtime/vars/main.yml @@ -1,15 +1,15 @@ --- test_sites: - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cee" site: "stable_cee" - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cre" site: "stable_cre" - version: "2.2.0p32" edition: "cre" site: "old_cre" - # - version: "2.1.0p46" + # - version: "2.1.0p47" # edition: "cre" # site: "ancient_cre" diff --git a/tests/integration/targets/folder/vars/main.yml b/tests/integration/targets/folder/vars/main.yml index a07327a23..e95ae93f3 100644 --- a/tests/integration/targets/folder/vars/main.yml +++ b/tests/integration/targets/folder/vars/main.yml @@ -1,15 +1,15 @@ --- test_sites: - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cee" site: "stable_cee" - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cre" site: "stable_cre" - version: "2.2.0p32" edition: "cre" site: "old_cre" - # - version: "2.1.0p46" + # - version: "2.1.0p47" # edition: "cre" # site: "ancient_cre" diff --git a/tests/integration/targets/host/vars/main.yml b/tests/integration/targets/host/vars/main.yml index 520da9632..ae003bd9c 100644 --- a/tests/integration/targets/host/vars/main.yml +++ b/tests/integration/targets/host/vars/main.yml @@ -1,15 +1,15 @@ --- test_sites: - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cre" site: "stable_cre" - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cee" site: "stable_cee" - version: "2.2.0p32" edition: "cre" site: "old_cre" - # - version: "2.1.0p46" + # - version: "2.1.0p47" # edition: "cre" # site: "ancient_cre" diff --git a/tests/integration/targets/host_group/vars/main.yml b/tests/integration/targets/host_group/vars/main.yml index f6644fd59..e8965f3a2 100644 --- a/tests/integration/targets/host_group/vars/main.yml +++ b/tests/integration/targets/host_group/vars/main.yml @@ -1,18 +1,18 @@ --- test_sites: - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cme" site: "stable_cme" - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cee" site: "stable_cee" - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cre" site: "stable_cre" - version: "2.2.0p32" edition: "cre" site: "old_cre" - # - version: "2.1.0p46" + # - version: "2.1.0p47" # edition: "cre" # site: "ancient_cre" diff --git a/tests/integration/targets/lookup_bakery/vars/main.yml b/tests/integration/targets/lookup_bakery/vars/main.yml index 72e0fb20d..996a79994 100644 --- a/tests/integration/targets/lookup_bakery/vars/main.yml +++ b/tests/integration/targets/lookup_bakery/vars/main.yml @@ -1,11 +1,11 @@ --- test_sites: - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cee" site: "stable_cee" - version: "2.2.0p32" edition: "cee" site: "old_cee" - # - version: "2.1.0p46" + # - version: "2.1.0p47" # edition: "cee" # site: "ancient_cee" diff --git a/tests/integration/targets/lookup_folder/vars/main.yml b/tests/integration/targets/lookup_folder/vars/main.yml index 67bf8af88..a49337ac7 100644 --- a/tests/integration/targets/lookup_folder/vars/main.yml +++ b/tests/integration/targets/lookup_folder/vars/main.yml @@ -1,15 +1,15 @@ --- test_sites: - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cee" site: "stable_cee" - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cre" site: "stable_cre" - version: "2.2.0p32" edition: "cre" site: "old_cre" - # - version: "2.1.0p46" + # - version: "2.1.0p47" # edition: "cre" # site: "ancient_cre" diff --git a/tests/integration/targets/lookup_folders/vars/main.yml b/tests/integration/targets/lookup_folders/vars/main.yml index 105c9e313..0042d466e 100644 --- a/tests/integration/targets/lookup_folders/vars/main.yml +++ b/tests/integration/targets/lookup_folders/vars/main.yml @@ -1,15 +1,15 @@ --- test_sites: - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cee" site: "stable_cee" - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cre" site: "stable_cre" - version: "2.2.0p32" edition: "cre" site: "old_cre" - # - version: "2.1.0p46" + # - version: "2.1.0p47" # edition: "cre" # site: "ancient_cre" diff --git a/tests/integration/targets/lookup_host/vars/main.yml b/tests/integration/targets/lookup_host/vars/main.yml index 111e29959..27b310ada 100644 --- a/tests/integration/targets/lookup_host/vars/main.yml +++ b/tests/integration/targets/lookup_host/vars/main.yml @@ -1,15 +1,15 @@ --- test_sites: - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cee" site: "stable_cee" - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cre" site: "stable_cre" - version: "2.2.0p32" edition: "cre" site: "old_cre" - # - version: "2.1.0p46" + # - version: "2.1.0p47" # edition: "cre" # site: "ancient_cre" diff --git a/tests/integration/targets/lookup_hosts/vars/main.yml b/tests/integration/targets/lookup_hosts/vars/main.yml index 4cfdf791c..9fb8a1860 100644 --- a/tests/integration/targets/lookup_hosts/vars/main.yml +++ b/tests/integration/targets/lookup_hosts/vars/main.yml @@ -1,15 +1,15 @@ --- test_sites: - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cee" site: "stable_cee" - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cre" site: "stable_cre" - version: "2.2.0p32" edition: "cre" site: "old_cre" - # - version: "2.1.0p46" + # - version: "2.1.0p47" # edition: "cre" # site: "ancient_cre" diff --git a/tests/integration/targets/lookup_rules/vars/main.yml b/tests/integration/targets/lookup_rules/vars/main.yml index 10de491cb..7a7175ae6 100644 --- a/tests/integration/targets/lookup_rules/vars/main.yml +++ b/tests/integration/targets/lookup_rules/vars/main.yml @@ -1,15 +1,15 @@ --- test_sites: - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cee" site: "stable_cee" - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cre" site: "stable_cre" - version: "2.2.0p32" edition: "cre" site: "old_cre" - # - version: "2.1.0p46" + # - version: "2.1.0p47" # edition: "cre" # site: "ancient_cre" diff --git a/tests/integration/targets/lookup_rulesets/vars/main.yml b/tests/integration/targets/lookup_rulesets/vars/main.yml index 754963c1f..8e83b3a5c 100644 --- a/tests/integration/targets/lookup_rulesets/vars/main.yml +++ b/tests/integration/targets/lookup_rulesets/vars/main.yml @@ -1,15 +1,15 @@ --- test_sites: - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cee" site: "stable_cee" - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cre" site: "stable_cre" - version: "2.2.0p32" edition: "cre" site: "old_cre" - # - version: "2.1.0p46" + # - version: "2.1.0p47" # edition: "cre" # site: "ancient_cre" diff --git a/tests/integration/targets/lookup_version/vars/main.yml b/tests/integration/targets/lookup_version/vars/main.yml index 766766053..ea6c78d46 100644 --- a/tests/integration/targets/lookup_version/vars/main.yml +++ b/tests/integration/targets/lookup_version/vars/main.yml @@ -1,14 +1,14 @@ --- test_sites: - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cee" site: "stable_cee" - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cre" site: "stable_cre" - version: "2.2.0p32" edition: "cre" site: "old_cre" - # - version: "2.1.0p46" + # - version: "2.1.0p47" # edition: "cre" # site: "ancient_cre" diff --git a/tests/integration/targets/password/vars/main.yml b/tests/integration/targets/password/vars/main.yml index f5bd53349..d519fe7e7 100644 --- a/tests/integration/targets/password/vars/main.yml +++ b/tests/integration/targets/password/vars/main.yml @@ -1,18 +1,18 @@ --- test_sites: - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cme" site: "stable_cme" - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cee" site: "stable_cee" - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cre" site: "stable_cre" - version: "2.2.0p32" edition: "cre" site: "old_cre" - # - version: "2.1.0p46" + # - version: "2.1.0p47" # edition: "cre" # site: "ancient_cre" diff --git a/tests/integration/targets/rule/vars/main.yml b/tests/integration/targets/rule/vars/main.yml index 766766053..ea6c78d46 100644 --- a/tests/integration/targets/rule/vars/main.yml +++ b/tests/integration/targets/rule/vars/main.yml @@ -1,14 +1,14 @@ --- test_sites: - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cee" site: "stable_cee" - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cre" site: "stable_cre" - version: "2.2.0p32" edition: "cre" site: "old_cre" - # - version: "2.1.0p46" + # - version: "2.1.0p47" # edition: "cre" # site: "ancient_cre" diff --git a/tests/integration/targets/service_group/vars/main.yml b/tests/integration/targets/service_group/vars/main.yml index f1e51a23e..d54df359f 100644 --- a/tests/integration/targets/service_group/vars/main.yml +++ b/tests/integration/targets/service_group/vars/main.yml @@ -1,18 +1,18 @@ --- test_sites: - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cme" site: "stable_cme" - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cee" site: "stable_cee" - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cre" site: "stable_cre" - version: "2.2.0p32" edition: "cre" site: "old_cre" - # - version: "2.1.0p46" + # - version: "2.1.0p47" # edition: "cre" # site: "ancient_cre" diff --git a/tests/integration/targets/tag_group/vars/main.yml b/tests/integration/targets/tag_group/vars/main.yml index 387992c56..cf9f0fefc 100644 --- a/tests/integration/targets/tag_group/vars/main.yml +++ b/tests/integration/targets/tag_group/vars/main.yml @@ -1,18 +1,18 @@ --- test_sites: - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cme" site: "stable_cme" - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cee" site: "stable_cee" - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cre" site: "stable_cre" - version: "2.2.0p32" edition: "cre" site: "old_cre" - # - version: "2.1.0p46" + # - version: "2.1.0p47" # edition: "cre" # site: "ancient_cre" diff --git a/tests/integration/targets/timeperiod/vars/main.yml b/tests/integration/targets/timeperiod/vars/main.yml index 278b978f4..9988f6f89 100644 --- a/tests/integration/targets/timeperiod/vars/main.yml +++ b/tests/integration/targets/timeperiod/vars/main.yml @@ -1,15 +1,15 @@ --- test_sites: - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cee" site: "stable_cee" - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cre" site: "stable_cre" - version: "2.2.0p32" edition: "cre" site: "old_cre" - # - version: "2.1.0p46" + # - version: "2.1.0p47" # edition: "cre" # site: "ancient_cre" diff --git a/tests/integration/targets/user/vars/main.yml b/tests/integration/targets/user/vars/main.yml index 01d9bd68c..dc9fff609 100644 --- a/tests/integration/targets/user/vars/main.yml +++ b/tests/integration/targets/user/vars/main.yml @@ -1,18 +1,18 @@ --- test_sites: - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cme" site: "stable_cme" - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cee" site: "stable_cee" - - version: "2.3.0p12" + - version: "2.3.0p13" edition: "cre" site: "stable_cre" - version: "2.2.0p32" edition: "cre" site: "old_cre" - # - version: "2.1.0p46" + # - version: "2.1.0p47" # edition: "cre" # site: "ancient_cre"