From eb82f2dcbb0008004b5757be3cd2dae6d68e8740 Mon Sep 17 00:00:00 2001 From: Robin Gierse Date: Mon, 4 Dec 2023 09:17:30 +0100 Subject: [PATCH 01/11] Typo. --- playbooks/demo/lookup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbooks/demo/lookup.yml b/playbooks/demo/lookup.yml index d31496d7a..e0061f50e 100644 --- a/playbooks/demo/lookup.yml +++ b/playbooks/demo/lookup.yml @@ -40,7 +40,7 @@ delegate_to: localhost run_once: true # noqa run-once[task] -## TODO: @lgetwan: Please take a look at these tasks and fix them. Bonus: Add the new lookup modules. :) + ## TODO: @lgetwan: Please take a look at these tasks and fix them. Bonus: Add the new lookup modules. :) # - name: "Get all hosts of the folder /test recursively" # ansible.builtin.debug: From 8a260994b12f5e275f1f3e24c0ace1f29b10da05 Mon Sep 17 00:00:00 2001 From: Robin Gierse Date: Mon, 4 Dec 2023 09:17:41 +0100 Subject: [PATCH 02/11] Bump Checkmk versions. --- tests/integration/targets/lookup_bakery/vars/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integration/targets/lookup_bakery/vars/main.yml b/tests/integration/targets/lookup_bakery/vars/main.yml index de19e3308..e6eb16e7a 100644 --- a/tests/integration/targets/lookup_bakery/vars/main.yml +++ b/tests/integration/targets/lookup_bakery/vars/main.yml @@ -1,9 +1,9 @@ --- test_sites: - - version: "2.2.0p12" + - version: "2.2.0p14" edition: "cee" site: "stable_ent" - - version: "2.1.0p35" + - version: "2.1.0p36" edition: "cee" site: "old_ent" From 4719e6c1681860528433aa2eca241a21d5fcb4a0 Mon Sep 17 00:00:00 2001 From: Robin Gierse Date: Mon, 4 Dec 2023 09:17:51 +0100 Subject: [PATCH 03/11] Add missing changelogs. --- changelogs/fragments/activation.yml | 4 ++++ changelogs/fragments/lookups.yml | 5 +++++ 2 files changed, 9 insertions(+) create mode 100644 changelogs/fragments/activation.yml create mode 100644 changelogs/fragments/lookups.yml diff --git a/changelogs/fragments/activation.yml b/changelogs/fragments/activation.yml new file mode 100644 index 000000000..d2154f0f9 --- /dev/null +++ b/changelogs/fragments/activation.yml @@ -0,0 +1,4 @@ +minor_changes: + - Activation module - Implement proper support for `redirect` paramter. + This means, the activation module can now optionally wait for a completed + activation or just trigger it and move on. diff --git a/changelogs/fragments/lookups.yml b/changelogs/fragments/lookups.yml new file mode 100644 index 000000000..92750d933 --- /dev/null +++ b/changelogs/fragments/lookups.yml @@ -0,0 +1,5 @@ +major_changes: + - Bakery lookup plugin - Get the status of the Checkmk Agent Bakery. + +minor_changes: + - Lookup API - Add improved error handling. From dc357bb5fbb314c026e35d5d315fafbb5502543c Mon Sep 17 00:00:00 2001 From: Robin Gierse Date: Mon, 4 Dec 2023 09:22:18 +0100 Subject: [PATCH 04/11] Bugfix hardcoded `no_log` parameter. --- roles/server/tasks/sites.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/server/tasks/sites.yml b/roles/server/tasks/sites.yml index 7652fd0e6..ded1c4622 100644 --- a/roles/server/tasks/sites.yml +++ b/roles/server/tasks/sites.yml @@ -43,7 +43,7 @@ omd config {{ item.name }} AUTOSTART on args: executable: /bin/bash - no_log: true + no_log: "{{ checkmk_agent_no_log | bool }}" loop: "{{ checkmk_server_sites }}" when: (item.state == "enabled") or (item.state == "started") register: checkmk_server_sites_stopped @@ -87,7 +87,7 @@ omd config {{ item.name }} AUTOSTART off args: executable: /bin/bash - no_log: true + no_log: "{{ checkmk_agent_no_log | bool }}" loop: "{{ checkmk_server_sites }}" when: (item.state == "disabled") or (item.state == "present") or (item.state == "stopped") register: checkmk_server_sites_stopped From 358e09338523b4b91312e754dd47ba04956ca973 Mon Sep 17 00:00:00 2001 From: Robin Gierse Date: Mon, 4 Dec 2023 09:40:35 +0100 Subject: [PATCH 05/11] Update README. --- CODE_OF_CONDUCT.md | 2 +- README.md | 1 + SECURITY.md | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index de5f65a07..e8c4cf7df 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,3 +1,3 @@ # Code of Conduct The `checkmk.general` collection follows the Ansible project's -[Code of Conduct](https://docs.ansible.com/ansible/devel/community/code_of_conduct.html). \ No newline at end of file +[Code of Conduct](https://docs.ansible.com/ansible/devel/community/code_of_conduct.html). diff --git a/README.md b/README.md index a91618f8d..a00b84c69 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,7 @@ Name | Description Name | Description | Tests --- | --- | --- +[checkmk.general.bakery](https://github.com/Checkmk/ansible-collection-checkmk.general/blob/main/plugins/lookup/bakery.py)|Look up the status pf the Checkmk agent bakery.|[![Integration Tests for bakery Lookup Module](https://github.com/Checkmk/ansible-collection-checkmk.general/actions/workflows/ans-int-test-lkp-bakery.yaml/badge.svg)](https://github.com/Checkmk/ansible-collection-checkmk.general/actions/workflows/ans-int-test-lkp-bakery.yaml) [checkmk.general.folder](https://github.com/Checkmk/ansible-collection-checkmk.general/blob/main/plugins/lookup/folder.py)|Look up folder attributes.|[![Integration Tests for Folder Lookup Module](https://github.com/Checkmk/ansible-collection-checkmk.general/actions/workflows/ans-int-test-lkp-folder.yaml/badge.svg)](https://github.com/Checkmk/ansible-collection-checkmk.general/actions/workflows/ans-int-test-lkp-folder.yaml) [checkmk.general.folders](https://github.com/Checkmk/ansible-collection-checkmk.general/blob/main/plugins/lookup/folders.py)|Look up all folders.|[![Integration Tests for Folders Lookup Module](https://github.com/Checkmk/ansible-collection-checkmk.general/actions/workflows/ans-int-test-lkp-folders.yaml/badge.svg)](https://github.com/Checkmk/ansible-collection-checkmk.general/actions/workflows/ans-int-test-lkp-folders.yaml) [checkmk.general.host](https://github.com/Checkmk/ansible-collection-checkmk.general/blob/main/plugins/lookup/host.py)|Look up host attributes.|[![Integration Tests for Host Lookup Module](https://github.com/Checkmk/ansible-collection-checkmk.general/actions/workflows/ans-int-test-lkp-host.yaml/badge.svg)](https://github.com/Checkmk/ansible-collection-checkmk.general/actions/workflows/ans-int-test-lkp-host.yaml) diff --git a/SECURITY.md b/SECURITY.md index c9a5470f1..998af2e58 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -17,4 +17,4 @@ and we will do our best to fix it as soon as possible. ## Reporting a Vulnerability For now, please open a normal [issue](https://github.com/Checkmk/ansible-collection-checkmk.general/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc) -in the repository but try to disclose the vulnerability as reasonable as possible. \ No newline at end of file +in the repository but try to disclose the vulnerability as reasonable as possible. From 864299f1aa653b55e38236b95d4f29ca85fc140e Mon Sep 17 00:00:00 2001 From: "max.sickora" Date: Mon, 4 Dec 2023 11:44:01 +0100 Subject: [PATCH 06/11] Added error when using tabula_rasa in bulkmode --- changelogs/fragments/discovery.yml | 2 ++ plugins/modules/discovery.py | 11 +++++++++++ 2 files changed, 13 insertions(+) create mode 100644 changelogs/fragments/discovery.yml diff --git a/changelogs/fragments/discovery.yml b/changelogs/fragments/discovery.yml new file mode 100644 index 000000000..099e6bf51 --- /dev/null +++ b/changelogs/fragments/discovery.yml @@ -0,0 +1,2 @@ +minor_changes: + - Added Error when using state "tabula_rasa" in bulk discovery mode. diff --git a/plugins/modules/discovery.py b/plugins/modules/discovery.py index 177c54043..3dbbe729c 100644 --- a/plugins/modules/discovery.py +++ b/plugins/modules/discovery.py @@ -350,6 +350,17 @@ def run_module(): ) module.fail_json(**result_as_dict(result)) + if not single_mode and module.params.get("state") == "tabula_rasa": + result = RESULT( + http_code=0, + msg="State 'tabula_rasa' does not exist in bulk_discovery, please use refresh!", + content="", + etag="", + failed=True, + changed=False, + ) + module.fail_json(**result_as_dict(result)) + result = wait_for_completion(single_mode, servicecompletion) result = discovery.post() From 75eb4e388078f3099f1a8943ced9b5439b4f43e8 Mon Sep 17 00:00:00 2001 From: "max.sickora" Date: Mon, 4 Dec 2023 12:10:38 +0100 Subject: [PATCH 07/11] Removed test for tabula_rasa in bulk --- tests/integration/targets/discovery/tasks/test.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/tests/integration/targets/discovery/tasks/test.yml b/tests/integration/targets/discovery/tasks/test.yml index 7717fff66..2f07cb510 100644 --- a/tests/integration/targets/discovery/tasks/test.yml +++ b/tests/integration/targets/discovery/tasks/test.yml @@ -145,7 +145,7 @@ run_once: true # noqa run-once[task] loop: "{{ checkmk_hosts }}" - - name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Bulk: Rescan services." + - name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Bulk: Refresh (tabula_rasa) services." discovery: server_url: "{{ checkmk_var_server_url }}" site: "{{ outer_item.site }}" @@ -189,18 +189,6 @@ bulk_size: 5 delegate_to: localhost - - name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Bulk: Tabula Rasa. (Only 2.2)." - discovery: - server_url: "{{ checkmk_var_server_url }}" - site: "{{ outer_item.site }}" - automation_user: "{{ checkmk_var_automation_user }}" - automation_secret: "{{ checkmk_var_automation_secret }}" - hosts: "{{ checkmk_host_names }}" - state: "tabula_rasa" - bulk_size: 5 - delegate_to: localhost - when: "'2.2' in outer_item.version" - - name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Bulk: Discover hosts (fix_all)." discovery: server_url: "{{ checkmk_var_server_url }}" From fdb86d375c923d2de7e63261bfcf1ceba427bb6e Mon Sep 17 00:00:00 2001 From: Robin Gierse Date: Mon, 4 Dec 2023 13:39:40 +0100 Subject: [PATCH 08/11] Bugfix bugfixed `no_log` parameter. --- roles/server/tasks/sites.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/server/tasks/sites.yml b/roles/server/tasks/sites.yml index ded1c4622..bafdf56e4 100644 --- a/roles/server/tasks/sites.yml +++ b/roles/server/tasks/sites.yml @@ -43,7 +43,7 @@ omd config {{ item.name }} AUTOSTART on args: executable: /bin/bash - no_log: "{{ checkmk_agent_no_log | bool }}" + no_log: "{{ checkmk_server_no_log | bool }}" loop: "{{ checkmk_server_sites }}" when: (item.state == "enabled") or (item.state == "started") register: checkmk_server_sites_stopped @@ -87,7 +87,7 @@ omd config {{ item.name }} AUTOSTART off args: executable: /bin/bash - no_log: "{{ checkmk_agent_no_log | bool }}" + no_log: "{{ checkmk_server_no_log | bool }}" loop: "{{ checkmk_server_sites }}" when: (item.state == "disabled") or (item.state == "present") or (item.state == "stopped") register: checkmk_server_sites_stopped From a77d81a5eafc689a189dcbb7dc510573573b03ad Mon Sep 17 00:00:00 2001 From: Robin Gierse Date: Mon, 4 Dec 2023 13:39:56 +0100 Subject: [PATCH 09/11] Clean up variables. --- roles/server/defaults/main.yml | 1 + .../server/molecule/2.0.0/group_vars/all.yml | 22 +++++++++++++------ .../server/molecule/2.1.0/group_vars/all.yml | 22 +++++++++++++------ .../server/molecule/2.2.0/group_vars/all.yml | 22 +++++++++++++------ 4 files changed, 46 insertions(+), 21 deletions(-) diff --git a/roles/server/defaults/main.yml b/roles/server/defaults/main.yml index d89281dfd..1c4647712 100644 --- a/roles/server/defaults/main.yml +++ b/roles/server/defaults/main.yml @@ -43,6 +43,7 @@ checkmk_server_sites: [] # value: "on" # - var: LIVESTATUS_TCP_PORT # value: "6557" + checkmk_server_configure_firewall: 'true' checkmk_server_backup_on_update: 'true' # Not recommended to disable this option diff --git a/roles/server/molecule/2.0.0/group_vars/all.yml b/roles/server/molecule/2.0.0/group_vars/all.yml index abceac570..5c2ad9d54 100644 --- a/roles/server/molecule/2.0.0/group_vars/all.yml +++ b/roles/server/molecule/2.0.0/group_vars/all.yml @@ -2,6 +2,7 @@ # General checkmk_var_version: "2.0.0p39" checkmk_var_edition: "cre" +checkmk_server_verify_setup: 'true' checkmk_var_server_url: "http://127.0.0.1/" checkmk_var_automation_user: "cmkadmin" checkmk_var_automation_secret: "d7589df1" @@ -9,14 +10,9 @@ checkmk_var_automation_secret: "d7589df1" # Server Role checkmk_server_edition: "{{ checkmk_var_edition }}" checkmk_server_version: "{{ checkmk_var_version }}" -checkmk_server_verify_setup: 'true' -checkmk_server_configure_firewall: 'false' - -checkmk_server_backup_on_update: 'true' # Not recommended to disable this option -checkmk_server_backup_dir: /tmp -checkmk_server_backup_opts: '--no-past' -checkmk_server_allow_downgrades: 'true' +checkmk_server_download_user: [] +checkmk_server_download_pass: [] checkmk_server_sites: - name: "started" @@ -67,3 +63,15 @@ checkmk_server_sites: state: absent admin_pw: "{{ checkmk_var_automation_secret }}" update_conflict_resolution: install + +checkmk_server_configure_firewall: 'true' + +checkmk_server_backup_on_update: 'true' # Not recommended to disable this option +checkmk_server_backup_dir: /tmp +checkmk_server_backup_opts: '--no-past' +checkmk_server_allow_downgrades: 'false' + +checkmk_server_epel_gpg_check: 'true' + +checkmk_server_cleanup: 'false' +checkmk_server_no_log: 'false' 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 7e2b9ae8f..30fde9f1f 100644 --- a/roles/server/molecule/2.1.0/group_vars/all.yml +++ b/roles/server/molecule/2.1.0/group_vars/all.yml @@ -2,6 +2,7 @@ # General checkmk_var_version: "2.1.0p36" checkmk_var_edition: "cre" +checkmk_server_verify_setup: 'true' checkmk_var_server_url: "http://127.0.0.1/" checkmk_var_automation_user: "cmkadmin" checkmk_var_automation_secret: "d7589df1" @@ -9,14 +10,9 @@ checkmk_var_automation_secret: "d7589df1" # Server Role checkmk_server_edition: "{{ checkmk_var_edition }}" checkmk_server_version: "{{ checkmk_var_version }}" -checkmk_server_verify_setup: 'true' -checkmk_server_configure_firewall: 'false' - -checkmk_server_backup_on_update: 'true' # Not recommended to disable this option -checkmk_server_backup_dir: /tmp -checkmk_server_backup_opts: '--no-past' -checkmk_server_allow_downgrades: 'true' +checkmk_server_download_user: [] +checkmk_server_download_pass: [] checkmk_server_sites: - name: "started" @@ -67,3 +63,15 @@ checkmk_server_sites: state: absent admin_pw: "{{ checkmk_var_automation_secret }}" update_conflict_resolution: install + +checkmk_server_configure_firewall: 'true' + +checkmk_server_backup_on_update: 'true' # Not recommended to disable this option +checkmk_server_backup_dir: /tmp +checkmk_server_backup_opts: '--no-past' +checkmk_server_allow_downgrades: 'false' + +checkmk_server_epel_gpg_check: 'true' + +checkmk_server_cleanup: 'false' +checkmk_server_no_log: 'false' 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 b55318f54..6f5b1dc92 100644 --- a/roles/server/molecule/2.2.0/group_vars/all.yml +++ b/roles/server/molecule/2.2.0/group_vars/all.yml @@ -2,6 +2,7 @@ # General checkmk_var_version: "2.2.0p14" checkmk_var_edition: "cre" +checkmk_server_verify_setup: 'true' checkmk_var_server_url: "http://127.0.0.1/" checkmk_var_automation_user: "cmkadmin" checkmk_var_automation_secret: "d7589df1" @@ -9,14 +10,9 @@ checkmk_var_automation_secret: "d7589df1" # Server Role checkmk_server_edition: "{{ checkmk_var_edition }}" checkmk_server_version: "{{ checkmk_var_version }}" -checkmk_server_verify_setup: 'true' -checkmk_server_configure_firewall: 'false' - -checkmk_server_backup_on_update: 'true' # Not recommended to disable this option -checkmk_server_backup_dir: /tmp -checkmk_server_backup_opts: '--no-past' -checkmk_server_allow_downgrades: 'true' +checkmk_server_download_user: [] +checkmk_server_download_pass: [] checkmk_server_sites: - name: "started" @@ -67,3 +63,15 @@ checkmk_server_sites: state: absent admin_pw: "{{ checkmk_var_automation_secret }}" update_conflict_resolution: install + +checkmk_server_configure_firewall: 'true' + +checkmk_server_backup_on_update: 'true' # Not recommended to disable this option +checkmk_server_backup_dir: /tmp +checkmk_server_backup_opts: '--no-past' +checkmk_server_allow_downgrades: 'false' + +checkmk_server_epel_gpg_check: 'true' + +checkmk_server_cleanup: 'false' +checkmk_server_no_log: 'false' From 046584a731c0916b8f0c75ed50d6ede98fe48678 Mon Sep 17 00:00:00 2001 From: Robin Gierse Date: Mon, 4 Dec 2023 16:24:19 +0100 Subject: [PATCH 10/11] Bugfix changelogs. --- changelogs/fragments/activation.yml | 2 +- changelogs/fragments/discovery.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/changelogs/fragments/activation.yml b/changelogs/fragments/activation.yml index d2154f0f9..fdaccdc32 100644 --- a/changelogs/fragments/activation.yml +++ b/changelogs/fragments/activation.yml @@ -1,4 +1,4 @@ minor_changes: - - Activation module - Implement proper support for `redirect` paramter. + - Activation module - Implement proper support for `redirect` parameter. This means, the activation module can now optionally wait for a completed activation or just trigger it and move on. diff --git a/changelogs/fragments/discovery.yml b/changelogs/fragments/discovery.yml index 099e6bf51..6f7f187be 100644 --- a/changelogs/fragments/discovery.yml +++ b/changelogs/fragments/discovery.yml @@ -1,2 +1,3 @@ minor_changes: - - Added Error when using state "tabula_rasa" in bulk discovery mode. + - Discovery module - Print error message, when using state "tabula_rasa" + in bulk discovery mode, because that state is not supported by the API. From 81467362dd24b5909e92657c5def03cecd89c7f6 Mon Sep 17 00:00:00 2001 From: Robin Gierse Date: Mon, 4 Dec 2023 16:34:35 +0100 Subject: [PATCH 11/11] Bump Checkmk version. --- SUPPORT.md | 2 +- roles/agent/README.md | 2 +- roles/agent/defaults/main.yml | 2 +- roles/agent/molecule/2.2.0/group_vars/all.yml | 2 +- roles/server/README.md | 2 +- roles/server/defaults/main.yml | 2 +- roles/server/molecule/2.2.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 | 4 ++-- 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_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 +++--- 28 files changed, 51 insertions(+), 51 deletions(-) diff --git a/SUPPORT.md b/SUPPORT.md index 5004f5372..6de1f1e93 100644 --- a/SUPPORT.md +++ b/SUPPORT.md @@ -45,4 +45,4 @@ Collection Version | Checkmk Versions | Ansible Versions | Remarks 3.2.0 | 2.0.0p38, 2.1.0p32, 2.2.0p8 | 2.13, 2.14, 2.15 | None 3.3.0 | 2.0.0p39, 2.1.0p35, 2.2.0p12 | 2.13, 2.14, 2.15 | None 3.4.0 | 2.0.0p39, 2.1.0p36, 2.2.0p14 | 2.13, 2.14, 2.15 | None -4.0.0 | 2.0.0p39, 2.1.0p36, 2.2.0p14 | 2.14, 2.15, 2.16 | Breaking changes to the following roles: `agent`, `server`. +4.0.0 | 2.0.0p39, 2.1.0p36, 2.2.0p16 | 2.14, 2.15, 2.16 | Breaking changes to the following roles: `agent`, `server`. diff --git a/roles/agent/README.md b/roles/agent/README.md index 8e206579e..d87a41c31 100644 --- a/roles/agent/README.md +++ b/roles/agent/README.md @@ -13,7 +13,7 @@ It can be installed as easy as running: ## Role Variables - checkmk_agent_version: "2.2.0p14" + checkmk_agent_version: "2.2.0p16" 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 2d3481469..80b087153 100644 --- a/roles/agent/defaults/main.yml +++ b/roles/agent/defaults/main.yml @@ -1,5 +1,5 @@ --- -checkmk_agent_version: "2.2.0p14" +checkmk_agent_version: "2.2.0p16" checkmk_agent_edition: cre checkmk_agent_server_protocol: http checkmk_agent_server: localhost 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 e13dc23c1..411e34e0b 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.0p14" +checkmk_var_version: "2.2.0p16" checkmk_var_edition: "cre" checkmk_var_checkmk_site: "my_site" checkmk_var_automation_user: "cmkadmin" diff --git a/roles/server/README.md b/roles/server/README.md index 0965ab44c..0dbdfa75a 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.2.0p14" + checkmk_server_version: "2.2.0p16" 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 1c4647712..94c72fcbf 100644 --- a/roles/server/defaults/main.yml +++ b/roles/server/defaults/main.yml @@ -24,7 +24,7 @@ checkmk_server_server_stable_os: - Ubuntu-20 - Ubuntu-22 -checkmk_server_version: "2.2.0p14" +checkmk_server_version: "2.2.0p16" checkmk_server_edition: cre checkmk_server_verify_setup: 'true' 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 6f5b1dc92..a528f67fc 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.0p14" +checkmk_var_version: "2.2.0p16" 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 59da8d016..4c96a5678 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -17,7 +17,7 @@ collection_dir="${script_dir%/*}" # Update these as necessary: checkmk_ancient="2.0.0p39" checkmk_oldstable="2.1.0p36" -checkmk_stable="2.2.0p14" +checkmk_stable="2.2.0p16" 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 62943138f..e2d496de2 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.2.0p14" + - version: "2.2.0p16" edition: "cre" site: "stable_raw" - - version: "2.2.0p14" + - version: "2.2.0p16" edition: "cee" site: "stable_ent" - version: "2.1.0p36" diff --git a/tests/integration/targets/bakery/vars/main.yml b/tests/integration/targets/bakery/vars/main.yml index 5496a11cd..36ecdd5b7 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.2.0p14" + - version: "2.2.0p16" edition: "cee" site: "stable_ent" - version: "2.1.0p36" diff --git a/tests/integration/targets/contact_group/vars/main.yml b/tests/integration/targets/contact_group/vars/main.yml index 2dadc0188..e6c34b18f 100644 --- a/tests/integration/targets/contact_group/vars/main.yml +++ b/tests/integration/targets/contact_group/vars/main.yml @@ -1,9 +1,9 @@ --- test_sites: - - version: "2.2.0p14" + - version: "2.2.0p16" edition: "cre" site: "stable_raw" - - version: "2.2.0p14" + - version: "2.2.0p16" edition: "cee" site: "stable_ent" - version: "2.1.0p36" diff --git a/tests/integration/targets/discovery/vars/main.yml b/tests/integration/targets/discovery/vars/main.yml index 939ad3ed6..58535e347 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.2.0p14" + - version: "2.2.0p16" edition: "cre" site: "stable_raw" - - version: "2.2.0p14" + - version: "2.2.0p16" edition: "cee" site: "stable_ent" - version: "2.1.0p36" diff --git a/tests/integration/targets/downtime/vars/main.yml b/tests/integration/targets/downtime/vars/main.yml index 62943138f..e2d496de2 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.2.0p14" + - version: "2.2.0p16" edition: "cre" site: "stable_raw" - - version: "2.2.0p14" + - version: "2.2.0p16" edition: "cee" site: "stable_ent" - version: "2.1.0p36" diff --git a/tests/integration/targets/folder/vars/main.yml b/tests/integration/targets/folder/vars/main.yml index d801922bb..f192d2ad8 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.2.0p14" + - version: "2.2.0p16" edition: "cre" site: "stable_raw" - - version: "2.2.0p14" + - version: "2.2.0p16" edition: "cee" site: "stable_ent" - version: "2.1.0p36" diff --git a/tests/integration/targets/host/vars/main.yml b/tests/integration/targets/host/vars/main.yml index 064cfd6fd..029c753ab 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.2.0p14" + - version: "2.2.0p16" edition: "cre" site: "stable_raw" - - version: "2.2.0p14" + - version: "2.2.0p16" edition: "cee" site: "stable_ent" - version: "2.1.0p36" diff --git a/tests/integration/targets/host_group/vars/main.yml b/tests/integration/targets/host_group/vars/main.yml index b0eabe859..0e3a769db 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.2.0p14" + - version: "2.2.0p16" edition: "cme" site: "stable_cme" - - version: "2.2.0p14" + - version: "2.2.0p16" edition: "cre" site: "stable_raw" - - version: "2.2.0p14" + - version: "2.2.0p16" edition: "cee" site: "stable_ent" - version: "2.1.0p36" diff --git a/tests/integration/targets/lookup_bakery/vars/main.yml b/tests/integration/targets/lookup_bakery/vars/main.yml index e6eb16e7a..2f0327157 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.2.0p14" + - version: "2.2.0p16" edition: "cee" site: "stable_ent" - version: "2.1.0p36" diff --git a/tests/integration/targets/lookup_folder/vars/main.yml b/tests/integration/targets/lookup_folder/vars/main.yml index bc47bb817..2be172ed9 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.2.0p14" + - version: "2.2.0p16" edition: "cre" site: "stable_raw" - - version: "2.2.0p14" + - version: "2.2.0p16" edition: "cee" site: "stable_ent" - version: "2.1.0p36" diff --git a/tests/integration/targets/lookup_folders/vars/main.yml b/tests/integration/targets/lookup_folders/vars/main.yml index b40b448e9..662f533a3 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.2.0p14" + - version: "2.2.0p16" edition: "cre" site: "stable_raw" - - version: "2.2.0p14" + - version: "2.2.0p16" edition: "cee" site: "stable_ent" - version: "2.1.0p36" diff --git a/tests/integration/targets/lookup_host/vars/main.yml b/tests/integration/targets/lookup_host/vars/main.yml index 84a66729e..21504475f 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.2.0p14" + - version: "2.2.0p16" edition: "cre" site: "stable_raw" - - version: "2.2.0p14" + - version: "2.2.0p16" edition: "cee" site: "stable_ent" - version: "2.1.0p36" diff --git a/tests/integration/targets/lookup_hosts/vars/main.yml b/tests/integration/targets/lookup_hosts/vars/main.yml index 95b98db17..7ac6a115b 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.2.0p14" + - version: "2.2.0p16" edition: "cre" site: "stable_raw" - - version: "2.2.0p14" + - version: "2.2.0p16" edition: "cee" site: "stable_ent" - version: "2.1.0p36" diff --git a/tests/integration/targets/lookup_version/vars/main.yml b/tests/integration/targets/lookup_version/vars/main.yml index 7abdbd7c4..5bd6d332e 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.2.0p14" + - version: "2.2.0p16" edition: "cre" site: "stable_raw" - - version: "2.2.0p14" + - version: "2.2.0p16" edition: "cee" site: "stable_ent" - version: "2.1.0p36" diff --git a/tests/integration/targets/password/vars/main.yml b/tests/integration/targets/password/vars/main.yml index aada4dbc0..a42de7713 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.2.0p14" + - version: "2.2.0p16" edition: "cme" site: "stable_cme" - - version: "2.2.0p14" + - version: "2.2.0p16" edition: "cre" site: "stable_raw" - - version: "2.2.0p14" + - version: "2.2.0p16" edition: "cee" site: "stable_ent" - version: "2.1.0p36" diff --git a/tests/integration/targets/rule/vars/main.yml b/tests/integration/targets/rule/vars/main.yml index 0d86af019..d7fcd6879 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.2.0p14" + - version: "2.2.0p16" edition: "cre" site: "stable_raw" - - version: "2.2.0p14" + - version: "2.2.0p16" edition: "cee" site: "stable_ent" - version: "2.1.0p36" diff --git a/tests/integration/targets/service_group/vars/main.yml b/tests/integration/targets/service_group/vars/main.yml index 9bcf526a8..5179eea1e 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.2.0p14" + - version: "2.2.0p16" edition: "cme" site: "stable_cme" - - version: "2.2.0p14" + - version: "2.2.0p16" edition: "cre" site: "stable_raw" - - version: "2.2.0p14" + - version: "2.2.0p16" edition: "cee" site: "stable_ent" - version: "2.1.0p36" diff --git a/tests/integration/targets/tag_group/vars/main.yml b/tests/integration/targets/tag_group/vars/main.yml index 566e3a908..395a172be 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.2.0p14" + - version: "2.2.0p16" edition: "cme" site: "stable_cme" - - version: "2.2.0p14" + - version: "2.2.0p16" edition: "cre" site: "stable_raw" - - version: "2.2.0p14" + - version: "2.2.0p16" edition: "cee" site: "stable_ent" - version: "2.1.0p36" diff --git a/tests/integration/targets/timeperiod/vars/main.yml b/tests/integration/targets/timeperiod/vars/main.yml index 309afbacb..47332ef45 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.2.0p14" + - version: "2.2.0p16" edition: "cre" site: "stable_raw" - - version: "2.2.0p14" + - version: "2.2.0p16" edition: "cee" site: "stable_ent" - version: "2.1.0p36" diff --git a/tests/integration/targets/user/vars/main.yml b/tests/integration/targets/user/vars/main.yml index 666cedc8a..5a4b7bd6a 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.2.0p14" + - version: "2.2.0p16" edition: "cme" site: "stable_cme" - - version: "2.2.0p14" + - version: "2.2.0p16" edition: "cre" site: "stable_raw" - - version: "2.2.0p14" + - version: "2.2.0p16" edition: "cee" site: "stable_ent" - version: "2.1.0p36"