Fix task names.

Author: robin-checkmk

roles/server/tasks/Debian.yml

@@ -1,5 +1,5 @@
 ---
-- name: "Install Checkmk Server."
+- name: "{{ ansible_os_family }} Derivatives: Install Checkmk Server."
   when: not 'check-mk-' + __checkmk_server_edition_mapping[checkmk_server_edition] + '-' +checkmk_server_version in ansible_facts.packages
   become: true
   ansible.builtin.package:

roles/server/tasks/RedHat.yml

@@ -1,10 +1,10 @@
 ---
-- name: "Enable repositories on CentOS & RHEL 8."
+- name: "{{ ansible_os_family }} Derivatives: Enable repositories on CentOS & RHEL 8."
   when: |
     (ansible_facts.distribution == "RedHat" or ansible_facts.distribution == "CentOS" or ansible_facts.distribution == "OracleLinux")
     and ansible_facts.distribution_major_version == "8"
   block:
-    - name: "Download EPEL GPG Key on CentOS & RHEL 8."
+    - name: "{{ ansible_os_family }} Derivatives: Download EPEL GPG Key on CentOS & RHEL 8."
       ansible.builtin.get_url:
         url: "{{ __checkmk_server_epel_gpg_key }}"
         dest: "{{ __checkmk_server_tmp_dir }}/EPEL-pubkey.gpg"
@@ -14,7 +14,7 @@
         - download-gpg-key
         - enable-repos
 
-    - name: "Import Checkmk GPG Key on RHEL 8."
+    - name: "{{ ansible_os_family }} Derivatives: Import Checkmk GPG Key on RHEL 8."
       become: true
       ansible.builtin.rpm_key:
         key: "{{ __checkmk_server_tmp_dir }}/EPEL-pubkey.gpg"
@@ -24,7 +24,7 @@
         - import-gpg-key
         - enable-repos
 
-    - name: "Install epel-release from URL on CentOS & RHEL 8."
+    - name: "{{ ansible_os_family }} Derivatives: Install epel-release from URL on CentOS & RHEL 8."
       become: true
       ansible.builtin.package:
         name: "{{ __checkmk_server_epel_url }}"
@@ -33,7 +33,7 @@
       tags:
         - enable-repos
 
-- name: "Enable CodeReady Linux Builder repo on RHEL 8."
+- name: "{{ ansible_os_family }} Derivatives: Enable CodeReady Linux Builder repo on RHEL 8."
   become: true
   community.general.rhsm_repository:
     name: "codeready-builder-for-rhel-{{ ansible_facts.distribution_major_version }}-x86_64-rpms"
@@ -44,7 +44,7 @@
     ansible_facts.distribution == "RedHat"
     and ansible_facts.distribution_major_version == "8"
 
-- name: "Enable powertools repository on CentOS 8."  # noqa no-changed-when
+- name: "{{ ansible_os_family }} Derivatives: Enable powertools repository on CentOS 8."  # noqa no-changed-when
   become: true
   ansible.builtin.shell: dnf config-manager --set-enabled powertools  # noqa command-instead-of-shell
   when: | # RHEL needs epel and a package URL
@@ -53,7 +53,7 @@
   tags:
     - enable-repos
 
-- name: "Enable codeready builder repository on OracleLinux 8."  # noqa no-changed-when
+- name: "{{ ansible_os_family }} Derivatives: Enable codeready builder repository on OracleLinux 8."  # noqa no-changed-when
   become: true
   ansible.builtin.shell: dnf config-manager --set-enabled ol8_codeready_builder  # noqa command-instead-of-shell
   when: | # RHEL needs epel and a package URL
@@ -62,7 +62,7 @@
   tags:
     - enable-repos
 
-- name: "Enable powertools repository on RHEL 7."
+- name: "{{ ansible_os_family }} Derivatives: Enable powertools repository on RHEL 7."
   become: true
   community.general.rhsm_repository:
     name: "{{ item }}"
@@ -76,7 +76,7 @@
   tags:
     - enable-repos
 
-- name: "Install Checkmk Server."
+- name: "{{ ansible_os_family }} Derivatives: Install Checkmk Server."
   when: not 'check-mk-' + __checkmk_server_edition_mapping[checkmk_server_edition] + '-' +checkmk_server_version in ansible_facts.packages
   become: true
   ansible.builtin.package:
@@ -87,7 +87,7 @@
   tags:
     - install-package
 
-- name: "Enable httpd can network connect selinux boolean."
+- name: "{{ ansible_os_family }} Derivatives: Enable httpd can network connect selinux boolean."
   become: true
   ansible.posix.seboolean:
     name: httpd_can_network_connect

roles/server/tasks/configure-site.yml

@@ -1,5 +1,5 @@
 ---
-- name: "Stop Site."
+- name: "{{ outer_item.name }}: Stop Site."
   become: true
   ansible.builtin.shell: |
     set -o pipefail
@@ -11,7 +11,7 @@
   tags:
     - configure-sites
 
-- name: "Configure Site '{{ outer_item.name }}'."  # noqa no-changed-when
+- name: "{{ outer_item.name }}: Configure Site '{{ outer_item.name }}'."  # noqa no-changed-when
   become: true
   ansible.builtin.shell: |
     set -o pipefail
@@ -23,7 +23,7 @@
   tags:
     - configure-sites
 
-- name: "Start Site."
+- name: "{{ outer_item.name }}: Start Site."
   become: true
   ansible.builtin.shell: |
     set -o pipefail

roles/server/tasks/main.yml

@@ -15,7 +15,7 @@
   tags:
     - always
 
-- name: "Include OS Family specific Variables."
+- name: "{{ ansible_system }}: Include OS Family specific Variables."
   ansible.builtin.include_vars: "{{ ansible_os_family }}.yml"
   tags:
     - include-os-family-vars
@@ -32,7 +32,7 @@
 - name: "{{ ansible_system }}: Populate service facts."
   ansible.builtin.service_facts:
 
-- name: "Update APT Cache."
+- name: "{{ ansible_os_family }} Derivatives: Update APT Cache."
   become: true
   ansible.builtin.package:
     update_cache: true
@@ -41,7 +41,7 @@
     - install-package
     - install-prerequisites
 
-- name: "Install Checkmk Prerequisites."
+- name: "{{ ansible_system }}: Install Checkmk Prerequisites."
   become: true
   ansible.builtin.package:
     name: "{{ item }}"
@@ -52,11 +52,11 @@
     - install-package
     - install-prerequisites
 
-- name: "Downloads Management."
+- name: "{{ ansible_system }}: Downloads Management."
   when: not 'check-mk-' + __checkmk_server_edition_mapping[checkmk_server_edition] + '-' +checkmk_server_version in ansible_facts.packages
   block:
 
-    - name: "Download Checkmk Server Setup."
+    - name: "{{ ansible_system }}: Download Checkmk Server Setup."
       ansible.builtin.get_url:
         url: "{{ checkmk_server_download_url }}"
         dest: "{{ __checkmk_server_tmp_dir }}/{{ __checkmk_server_setup_file }}"
@@ -67,7 +67,7 @@
       tags:
         - download-package
 
-    - name: "Download Checkmk GPG Key."
+    - name: "{{ ansible_system }}: Download Checkmk GPG Key."
       ansible.builtin.get_url:
         url: "{{ checkmk_server_gpg_download_url }}"
         dest: "{{ __checkmk_server_tmp_dir }}/Check_MK-pubkey.gpg"
@@ -79,7 +79,7 @@
       tags:
         - download-gpg-key
 
-    - name: "GPG Verification on Debian Derivatives."
+    - name: "{{ ansible_system }}: GPG Verification on Debian Derivatives."
       when: checkmk_server_verify_setup | bool and ansible_os_family == "Debian"
       block:
         - name: "Import Checkmk GPG Key."
@@ -90,7 +90,7 @@
           tags:
             - import-gpg-key
 
-        - name: "Verify Checkmk Setup."
+        - name: "{{ ansible_system }}: Verify Checkmk Setup."
           ansible.builtin.command: gpg --verify "{{ __checkmk_server_tmp_dir }}/{{ __checkmk_server_setup_file }}"
           register: __checkmk_server_verify_state
           changed_when: false
@@ -99,7 +99,7 @@
             - download-package
             - install-package
 
-    - name: "Import Checkmk GPG Key."
+    - name: "{{ ansible_system }}: Import Checkmk GPG Key."
       become: true
       ansible.builtin.rpm_key:
         key: "{{ __checkmk_server_tmp_dir }}/Check_MK-pubkey.gpg"
@@ -108,18 +108,18 @@
       tags:
         - import-gpg-key
 
-- name: Include OS Family specific Playbook.
+- name: "{{ ansible_system }}: Include OS Family specific Playbook."
   ansible.builtin.include_tasks: "{{ ansible_os_family }}.yml"
   tags:
     - always
 
-- name: Include Site Management Playbook.
+- name: "{{ ansible_system }}: Include Site Management Playbook."
   ansible.builtin.include_tasks: "sites.yml"
   when: checkmk_server_sites is defined
   tags:
     - always
 
-- name: "Cleanup unused Checkmk Versions."
+- name: "{{ ansible_system }}: Cleanup unused Checkmk Versions."
   become: true
   ansible.builtin.shell: |
     set -o pipefail
@@ -132,7 +132,7 @@
   tags:
     - cleanup
 
-- name: "Cleanup Checkmk Server Setup."
+- name: "{{ ansible_system }}: Cleanup Checkmk Server Setup."
   ansible.builtin.file:
     path: "{{ __checkmk_server_tmp_dir }}/{{ __checkmk_server_setup_file }}"
     state: absent

roles/server/tasks/mkp.yml

@@ -1,5 +1,5 @@
 ---
-- name: "Download MKP Packages."
+- name: "{{ __site.name }}: Download MKP Packages."
   become: true
   ansible.builtin.get_url:
     url: "{{ __mkp.url }}"
@@ -18,7 +18,7 @@
   tags:
     - manage-mkp-packages
 
-- name: "Transfer MKP Packages."
+- name: "{{ __site.name }}: Transfer MKP Packages."
   become: true
   ansible.builtin.copy:
     src: "{{ __mkp.src }}"
@@ -33,7 +33,7 @@
   tags:
     - manage-mkp-packages
 
-- name: "Install MKP packages."
+- name: "{{ __site.name }}: Install MKP packages."
   become: true
   become_user: "{{ __site.name }}"
   ansible.builtin.command: "/bin/bash -l -c 'mkp add {{ __checkmk_server_tmp_dir }}/{{ __mkp.name }}-{{ __mkp.version }}.mkp'"
@@ -47,7 +47,7 @@
   tags:
     - manage-mkp-packages
 
-- name: "Enable MKP packages."
+- name: "{{ __site.name }}: Enable MKP packages."
   become: true
   become_user: "{{ __site.name }}"
   ansible.builtin.command: "/bin/bash -l -c 'mkp enable {{ __mkp.name }} {{ __mkp.version }}'"
@@ -60,7 +60,7 @@
   tags:
     - manage-mkp-packages
 
-- name: "Disable MKP packages."
+- name: "{{ __site.name }}: Disable MKP packages."
   become: true
   become_user: "{{ __site.name }}"
   ansible.builtin.command: "/bin/bash -l -c 'mkp disable {{ __mkp.name }} {{ __mkp.version }}'"
@@ -73,7 +73,7 @@
   tags:
     - manage-mkp-packages
 
-- name: "Remove MKP packages."
+- name: "{{ __site.name }}: Remove MKP packages."
   become: true
   become_user: "{{ __site.name }}"
   ansible.builtin.command: "/bin/bash -l -c 'mkp remove {{ __mkp.name }} {{ __mkp.version }}'"
@@ -86,7 +86,7 @@
   tags:
     - manage-mkp-packages
 
-- name: "Cleanup MKP Packages."
+- name: "{{ __site.name }}: Cleanup MKP Packages."
   become: true
   ansible.builtin.file:
     path: "{{ __checkmk_server_tmp_dir }}/{{ __mkp.name }}-{{ __mkp.version }}.mkp"

roles/server/tasks/sites.yml

@@ -16,7 +16,7 @@
   tags:
     - create-sites
 
-- name: "Get site version."
+- name: "Get Site Versions."
   become: true
   ansible.builtin.shell: |
     set -o pipefail
@@ -33,7 +33,7 @@
   tags:
     - update-sites
 
-- name: "Include update site tasks."  # noqa no-handler
+- name: "Include Site Update Management."  # noqa no-handler
   ansible.builtin.include_tasks: update-site.yml
   loop: "{{ __checkmk_server_sites_versions.results }}"
   loop_control:
@@ -136,7 +136,7 @@
   tags:
     - destroy-sites
 
-- name: "Include site configuration tasks."
+- name: "Include Site Configuration Management."
   ansible.builtin.include_tasks: configure-site.yml
   loop: "{{ checkmk_server_sites }}"
   loop_control:
@@ -149,7 +149,7 @@
   tags:
     - configure-sites
 
-- name: "Include MKP management tasks."
+- name: "Include MKP Management."
   ansible.builtin.include_tasks: mkp.yml
   loop: "{{ checkmk_server_sites }}"
   loop_control:

roles/server/tasks/update-site.yml

@@ -1,13 +1,13 @@
 ---
-- name: "Fail if update conflict resolution method is not given."
+- name: "{{ item.item.name }}: Fail if update conflict resolution method is not given."
   ansible.builtin.fail:
     msg: |
       variable `update_conflict_resolution` is not given. See `omd update --help` for more information.
   when: item.item.update_conflict_resolution is undefined
   tags:
     - update-sites
 
-- name: "Check if desired version is installed."
+- name: "{{ item.item.name }}: Check if desired version is installed."
   ansible.builtin.shell: |
     set -o pipefail
     omd versions | egrep -o '{{ item.item.version }}.{{ item.item.edition | lower }}'
@@ -18,7 +18,7 @@
   tags:
     - update-sites
 
-- name: "Fail if this is a downgrade."
+- name: "{{ item.item.name }}: Fail if this is a downgrade."
   ansible.builtin.fail:
     msg: |
       Downgrading is not allowed since checkmk_server_allow_downgrades is set to false.
@@ -29,7 +29,7 @@
   tags:
     - update-sites
 
-- name: "Short pause for patch update."
+- name: "{{ item.item.name }}: Short pause for patch update."
   ansible.builtin.pause:
     seconds: 5
     prompt: |
@@ -41,7 +41,7 @@
   tags:
     - update-pause
 
-- name: "Long pause for major update."
+- name: "{{ item.item.name }}: Long pause for major update."
   ansible.builtin.pause:
     seconds: 60
     prompt: >
@@ -55,7 +55,7 @@
   tags:
     - update-pause
 
-- name: "Create backup of site."  # noqa no-changed-when
+- name: "{{ item.item.name }}: Create Site Backup."  # noqa no-changed-when
   become: true
   ansible.builtin.shell: |
     omd backup {{ checkmk_server_backup_opts }} {{ item.item.name }} {{ checkmk_server_backup_dir }}/{{ item.item.name }}-{{ item.item.version }}.{{ item.item.edition | lower }}-backup-$(date +%Y%m%d-%H%M%S).tar.gz
@@ -65,7 +65,7 @@
   tags:
     - update-sites
 
-- name: "Update Site."
+- name: "{{ item.item.name }}: Update Site."
   become: true
   ansible.builtin.shell: |
     omd stop {{ item.item.name }}