Merge pull request #485 from Checkmk/devel

Release 4.0.0 Addendum
Checkmk · Dec 4, 2023 · e128bbf · e128bbf
2 parents eb4bcd7 + 8146736
commit e128bbf
Show file tree

Hide file tree

Showing 40 changed files with 128 additions and 91 deletions.
diff --git 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).
+[Code of Conduct](https://docs.ansible.com/ansible/devel/community/code_of_conduct.html).
diff --git 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
@@ -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.
+in the repository but try to disclose the vulnerability as reasonable as possible.
diff --git 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/changelogs/fragments/activation.yml b/changelogs/fragments/activation.yml
@@ -0,0 +1,4 @@
+minor_changes:
+  - 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
@@ -0,0 +1,3 @@
+minor_changes:
+  - Discovery module - Print error message, when using state "tabula_rasa"
+    in bulk discovery mode, because that state is not supported by the API.
diff --git a/changelogs/fragments/lookups.yml 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.
diff --git 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:

diff --git 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()

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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'
 
@@ -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
@@ -2,21 +2,17 @@
 # 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"
 
 # 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
@@ -2,21 +2,17 @@
 # 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"
 
 # 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
@@ -1,22 +1,18 @@
 ---
 # 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/"
 checkmk_var_automation_user: "cmkadmin"
 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/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_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: true
+  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

diff --git 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
@@ -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
@@ -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
@@ -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/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 }}"

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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"