Merge branch 'devel' of github.com:Checkmk/ansible-collection-checkmk…

….general into feature/module-inventory

.ansible-lint

@@ -32,7 +32,7 @@ exclude_paths:
 # requirements, like avoiding python identifiers. To disable add `var-naming`
 # to skip_list.
 # var_naming_pattern: "^[a-z_][a-z0-9_]*$"
-var_naming_pattern: "^checkmk_(server|agent|var)_.*$"
+var_naming_pattern: "^(__)?checkmk_(server|agent|var)_.*$"
 
 use_default_rules: true
 # Load custom rules from this specific folder

.github/workflows/cla.yaml

@@ -18,7 +18,7 @@ jobs:
     steps:
       - name: 'CLA Assistant'
         if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA or my organization already has a signed CLA.') || github.event_name == 'pull_request_target'
-        uses: contributor-assistant/github-action@v2.5.1
+        uses: contributor-assistant/github-action@v2.5.2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           # the below token should have repo scope and must be manually added by you in the repository's secret

.github/workflows/release.yaml

@@ -111,7 +111,7 @@ jobs:
         run: antsibull-docs collection --use-current --squash-hierarchy --fail-on-error --dest-dir ./docs/ ${{env.NAMESPACE}}.${{env.COLLECTION_NAME}}
 
       - name: "Create Pull Request for Docs and Changelog against devel branch"
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           commit-message: Update Docs and Changelogs upon Release
           signoff: false

CODEOWNERS

@@ -1,14 +1,19 @@
 * @robin-checkmk
-/tests/ @robin-checkmk
-/roles/ @robin-checkmk
-/playbooks/ @robin-checkmk
-/plugins/inventory/ @Max-checkmk
-/plugins/lookup/version.py @lgetwan
+*.md @robin-checkmk
+/plugins/ @lgetwan
+/plugins/doc_fragments/ @robin-checkmk
+/plugins/lookup/ @lgetwan
+/plugins/lookup/bakery.py @Max-checkmk
+/plugins/module_utils/ @lgetwan
 /plugins/modules/ @lgetwan
-/plugins/module_utils/ @godspeed-you
-/plugins/modules/user.py @lgetwan
 /plugins/modules/bakery.py @Max-checkmk
+/plugins/modules/contact_group.py @msekania
+/plugins/modules/discovery.py @Max-checkmk
+/plugins/modules/host_group.py @msekania
+/plugins/modules/tag_group.py @Max-checkmk
+/plugins/modules/timeperiod.py @Max-checkmk
 /plugins/modules/password.py @Max-checkmk
+/plugins/modules/service_group.py @msekania
 /roles/agent/tasks/Windows.yml @Max-checkmk
 /roles/agent/vars/Windows.yml @Max-checkmk
 /roles/agent/tasks/Win32NT.yml @Max-checkmk

playbooks/demo/lookup.yml

@@ -13,14 +13,31 @@
         msg: "Version is {{ checkmk_var_version }}"
       vars:
         checkmk_var_version: "{{ lookup('checkmk.general.version',
-                       checkmk_var_server_url + '/' + checkmk_var_site,
-                       validate_certs=False,
+                       server_url=checkmk_var_server_url,
+                       site=checkmk_var_site,
                        automation_user=checkmk_var_automation_user,
-                       automation_secret=checkmk_var_automation_secret)
+                       automation_secret=checkmk_var_automation_secret,
+                       validate_certs=False)
                    }}"
       delegate_to: localhost
       run_once: true  # noqa run-once[task]
 
+    - name: "Get the attributes of the main folder."
+      ansible.builtin.debug:
+        msg: "Attributes of main folder: {{ checkmk_var_attributes }}"
+      vars:
+        checkmk_var_attributes: "{{
+                    lookup('checkmk.general.folder',
+                        '~',
+                        server_url=checkmk_var_server_url,
+                        site=checkmk_var_site,
+                        automation_user=checkmk_var_automation_user,
+                        automation_secret=checkmk_var_automation_secret,
+                        validate_certs=False)
+                    }}"
+      delegate_to: localhost
+      run_once: true  # noqa run-once[task]
+
     - name: "Get all subfolders of the main folder recursively"
       ansible.builtin.debug:
         msg: "Folder tree: {{ item.id }}"
@@ -40,41 +57,85 @@
       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. :)
+    - name: "Get all hosts of the main directory recursively."
+      ansible.builtin.debug:
+        msg: "Host found in {{ item.0.id }}: {{ item.1.title }}"
+      vars:
+        checkmk_var_looping: "{{
+                    lookup('checkmk.general.folders',
+                        '~',
+                        show_hosts=True,
+                        recursive=True,
+                        server_url=checkmk_var_server_url,
+                        site=checkmk_var_site,
+                        automation_user=checkmk_var_automation_user,
+                        automation_secret=checkmk_var_automation_secret,
+                        validate_certs=False)
+                  }}"
+      loop: "{{ checkmk_var_looping | subelements('members.hosts.value') }}"
+      loop_control:
+        label: "{{ item.0.id }}"
+      delegate_to: localhost
+      run_once: true  # noqa run-once[task]
+
+    ## TODO: @lgetwan: Please take a look at these tasks and beautify/fix them. Bonus: Add the new lookup modules. :)
+
+    # - name: "Get all Checkmk Sites."
+    #   ansible.builtin.debug:
+    #     msg: "Sites found: {{ checkmk_var_sites }}"
+    #   vars:
+    #     checkmk_var_sites: "{{ lookup('checkmk.general.sites',
+    #                    server_url=checkmk_var_server_url,
+    #                    site=checkmk_var_site,
+    #                    automation_user=checkmk_var_automation_user,
+    #                    automation_secret=checkmk_var_automation_secret,
+    #                    validate_certs=False)
+    #                }}"
+    #   delegate_to: localhost
+    #   run_once: true  # noqa run-once[task]
 
-# - name: "Get all hosts of the folder /test recursively"
-#   ansible.builtin.debug:
-#     msg: "Host found in {{ item.0.id }}: {{ item.1.title }}"
-#   vars:
-#     checkmk_var_looping: "{{
-#                  lookup('checkmk.general.folders',
-#                      '~tests',
-#                      show_hosts=True,
-#                      recursive=True,
-#                      server_url=checkmk_var_server_url,
-#                      site=checkmk_var_site,
-#                      automation_user=checkmk_var_automation_user,
-#                      automation_secret=checkmk_var_automation_secret,
-#                      validate_certs=False)
-#               }}"
-#   loop: "{{ checkmk_var_looping | subelements('members.hosts.value') }}"
-#   loop_control:
-#     label: "{{ item.0.id }}"
-#   delegate_to: localhost
-#   run_once: true  # noqa run-once[task]
+    # - name: "Get a single site."
+    #   ansible.builtin.debug:
+    #     msg: "Site: {{ checkmk_var_looping }}"
+    #   vars:
+    #     checkmk_var_looping: "{{
+    #                 lookup('checkmk.general.site',
+    #                     'mysite',
+    #                     show_hosts=True,
+    #                     recursive=True,
+    #                     server_url=checkmk_var_server_url,
+    #                     site=checkmk_var_site,
+    #                     automation_user=checkmk_var_automation_user,
+    #                     automation_secret=checkmk_var_automation_secret,
+    #                     validate_certs=False)
+    #               }}"
+    #   delegate_to: localhost
+    #   run_once: true  # noqa run-once[task]
 
-# - name: "Get the attributes of folder /tests"
-#   ansible.builtin.debug:
-#     msg: "Attributes of folder /network: {{ checkmk_var_attributes }}"
-#   vars:
-#     checkmk_var_attributes: "{{
-#                     lookup('checkmk.general.folder',
-#                         '~tests',
-#                         server_url=checkmk_var_server_url,
-#                         site=checkmk_var_site,
-#                         automation_user=checkmk_var_automation_user,
-#                         automation_secret=checkmk_var_automation_secret,
-#                         validate_certs=False)
-#                  }}"
-#   delegate_to: localhost
-#   run_once: true  # noqa run-once[task]
+    # - name: "Get all sites recursively."
+    #   ansible.builtin.debug:
+    #     msg: "Site ID {{ item.0.id }}: {{ item.1.title }}"
+    #   vars:
+    #     checkmk_var_sites: "{{ lookup('checkmk.general.sites',
+    #                    server_url=checkmk_var_server_url,
+    #                    site=checkmk_var_site,
+    #                    automation_user=checkmk_var_automation_user,
+    #                    automation_secret=checkmk_var_automation_secret,
+    #                    validate_certs=False)
+    #                }}"
+    #     checkmk_var_looping: "{{
+    #                 lookup('checkmk.general.site',
+    #                     item.0.id,
+    #                     show_hosts=True,
+    #                     recursive=True,
+    #                     server_url=checkmk_var_server_url,
+    #                     site=checkmk_var_site,
+    #                     automation_user=checkmk_var_automation_user,
+    #                     automation_secret=checkmk_var_automation_secret,
+    #                     validate_certs=False)
+    #               }}"
+    #   loop: "{{ checkmk_var_sites }}"
+    #   loop_control:
+    #     label: "{{ item.0.id }}"
+    #   delegate_to: localhost
+    #   run_once: true  # noqa run-once[task]

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.0p13"
+    checkmk_agent_version: "2.3.0p16"
 
 The Checkmk version of the site your agents will talk to.
 

roles/agent/defaults/main.yml

@@ -1,5 +1,5 @@
 ---
-checkmk_agent_version: "2.3.0p13"
+checkmk_agent_version: "2.3.0p16"
 checkmk_agent_edition: 'cre'
 checkmk_agent_server_protocol: 'http'
 checkmk_agent_server: 'localhost'

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

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

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

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

roles/server/README.md

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

roles/server/defaults/main.yml

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

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

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

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

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

scripts/release.sh

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

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

@@ -1,12 +1,12 @@
 ---
 test_sites:
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.2.0p32"
+  - version: "2.2.0p33"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p47"

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

@@ -1,9 +1,9 @@
 ---
 test_sites:
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.2.0p32"
+  - version: "2.2.0p33"
     edition: "cee"
     site: "old_cee"
   # - version: "2.1.0p47"

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

@@ -1,15 +1,15 @@
 ---
 test_sites:
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cme"
     site: "stable_cme"
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p32"
+  - version: "2.2.0p33"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p47"

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

@@ -1,12 +1,12 @@
 ---
 test_sites:
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p32"
+  - version: "2.2.0p33"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p47"

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

@@ -1,12 +1,12 @@
 ---
 test_sites:
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p32"
+  - version: "2.2.0p33"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p47"

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

@@ -1,12 +1,12 @@
 ---
 test_sites:
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p32"
+  - version: "2.2.0p33"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p47"