chore: Linting 🚨

This caused some issues when used in a delegated fashion.

.ansible-lint

@@ -6,5 +6,6 @@ skip_list: # or 'skip_list' to silence them completely
   - unnamed-task # All tasks should be named
   - fqcn-builtins
   - name[casing]
+  - deprecated-local-action
 
-warn_list: []  # or 'skip_list' to silence them completely  
+warn_list: []  # or 'skip_list' to silence them completely

.gitignore

@@ -1,2 +1,4 @@
 *.pyc
-__pycache__
+__pycache__
+*.secrets
+*.vars

defaults/main.yml

@@ -47,6 +47,9 @@ cmk_secret: some-secret
 # Combined string required for unattended actions
 cmk_auth: '&_username={{ cmk_username }}&_secret={{ cmk_secret }}'
 
+# Complete API URL
+cmk_api_url: "{{ cmk_omd_protocol }}://{{ cmk_omd_host }}/{{ cmk_omd_site }}/check_mk/api/1.0"
+
 # This variable is used to detect whether this is a fresh install
 # Is changed to true if check-mk-agent gets installed
 cmk_fresh_install: false
@@ -55,6 +58,6 @@ cmk_fresh_install: false
 # CheckMK is already installed.
 # Breaks idempotence but allows role to be used to force upgrade agents.
 cmk_force_install: false
-cmk_host_ip: '{{ ansible_host }}'
+#cmk_host_ip: ""
 cmk_dl_needs_auth: true
 cmk_debug: true

molecule/http_direct/converge.yml

@@ -4,13 +4,14 @@
   vars:
     cmk_rpm_agent: https://files.cybercinch.nz/agents/check-mk/linux/check-mk-agent-2.2.0p9-1102045deb7cb781.noarch.rpm
     cmk_dl_needs_auth: false
-    cmk_add_host: false
+    cmk_add_host: true
     cmk_download_mode: inline
     cmk_omd_protocol: "{{ lookup('env', 'CMK_OMD_PROTOCOL')}}"
     cmk_omd_host: "{{ lookup('env', 'CMK_OMD_HOST')}}"
     cmk_omd_site: "{{ lookup('env', 'CMK_OMD_SITE')}}"
     cmk_username: "{{ lookup('env', 'CMK_USERNAME')}}"
     cmk_secret: "{{ lookup('env', 'CMK_SECRET')}}"
+    cmk_host_ip: "172.16.33.4"
   tasks:
     - name: Include {{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}
       include_role:

molecule/http_direct/molecule.yml

@@ -4,7 +4,7 @@ dependency:
 driver:
   name: docker
 platforms:
-  - name: check_mk_agent-test-${MOLECULE_DISTRO:-almalinux8}
+  - name: check-mk-agent-test-${MOLECULE_DISTRO:-almalinux8}
     image: cybercinch/docker-${MOLECULE_DISTRO:-almalinux8}-ansible:latest
     command: ${MOLECULE_DOCKER_COMMAND:-""}
     volumes:

requirements.txt

@@ -1,6 +1,6 @@
-ansible-core<2.17
-ansible-compat<4
-molecule[docker]<5.0.0
-ansible-lint==6.16.2
-yamllint==1.32.0
+ansible-core==2.16.3
+ansible-compat==4.1.11
+molecule[docker]==24.2.1
+ansible-lint==6.22.2
+yamllint==1.35.1
 passlib==1.7.4

tasks/downloads/samba/main.yml

@@ -30,8 +30,9 @@
   debug:
     msg: "{{ msg.split('\n') }}"
   when: cmk_debug
+
 - name: Copy archive from samba_share. (No-Log)
-  command: >
+  shell: >
     smbget 'smb:{{ (cmk_download_path + '/' + cmk_installer) | reslash }}' -U
     '{{ cmk_smb_username }}%{{ cmk_smb_password }}'
   args:
@@ -41,6 +42,7 @@
   no_log: true  # Turn off logging due to password exposure
   when: not cmk_debug | bool
   delegate_to: localhost
+
 - name: Copy archive from samba_share. (Debug)
   command: >
     smbget 'smb:{{ (cmk_download_path + '/' + cmk_installer) | reslash }}' -U '{{ cmk_smb_username | trim }}%{{ cmk_smb_password | trim }}

tasks/host-configure.yml

@@ -1,62 +1,11 @@
 ---
-- name: cmk_discovery
-  uri:
-    method: POST
-    url: '{{ cmk_omd_protocol }}://{{ cmk_omd_host }}/{{ cmk_omd_site }}/check_mk/webapi.py?action=discover_services&mode=refresh{{
-      cmk_auth }}'
-    body: request={"hostname":"{{ instance_name | default(inventory_hostname) }}"}
-    body_format: raw
-    status_code: 200
-    validate_certs: false
-    follow_redirects: true
-  become: false
-  when: cmk_add_host and output.result_code == 0
-  delegate_to: localhost
-  tags: cmk_register
-- name: cmk_apply
-  uri:
-    method: POST
-    url: '{{ cmk_omd_protocol }}://{{ cmk_omd_host }}/{{ cmk_omd_site }}/check_mk/webapi.py?action=activate_changes&mode=specific{{
-      cmk_auth }}'
-    body: request={"sites":["{{ cmk_omd_site }}"]}
-    body_format: raw
-    status_code: 200
-    validate_certs: false
-    follow_redirects: true
-  become: false
-  run_once: true
-  when: cmk_add_host and output.result_code == 0
-  delegate_to: localhost
-  tags: cmk_register
-- name: Wait some time
-  pause:
-    seconds: 10
-- name: cmk_discovery x 2
-  uri:
-    method: POST
-    url: '{{ cmk_omd_protocol }}://{{ cmk_omd_host }}/{{ cmk_omd_site }}/check_mk/webapi.py?action=discover_services&mode=refresh{{
-      cmk_auth }}'
-    body: request={"hostname":"{{ instance_name | default(inventory_hostname) }}"}
-    body_format: raw
-    status_code: 200
-    validate_certs: false
-    follow_redirects: true
-  become: false
-  when: cmk_add_host and output.result_code == 0
-  delegate_to: localhost
-  tags: cmk_register
-- name: cmk_apply
-  uri:
-    method: POST
-    url: '{{ cmk_omd_protocol }}://{{ cmk_omd_host }}/{{ cmk_omd_site }}/check_mk/webapi.py?action=activate_changes&mode=specific{{
-      cmk_auth }}'
-    body: request={"sites":["{{ cmk_omd_site }}"]}
-    body_format: raw
-    status_code: 200
-    validate_certs: false
-    follow_redirects: true
-  become: false
-  run_once: true
-  when: cmk_add_host and output.result_code == 0
-  delegate_to: localhost
-  tags: cmk_register
+- include_tasks: host-configure/legacy.yml
+  when: >
+    cmk_add_host and
+    (cmk_major | int <= 2 and
+    cmk_minor | int < 2 or  cmk_force_install)
+- include_tasks: host-configure/modern.yml
+  when: >
+    cmk_add_host and
+    (cmk_major | int >= 2 and
+    cmk_minor | int >= 2 or  cmk_force_install)

tasks/host-configure/legacy.yml

@@ -0,0 +1,68 @@
+---
+- name: Output contains
+  debug:
+    var: output
+
+- name: cmk_discovery
+  local_action:
+    module: uri
+    method: POST
+    url: '{{ cmk_omd_protocol }}://{{ cmk_omd_host }}/{{ cmk_omd_site }}/check_mk/webapi.py?action=discover_services&mode=refresh{{
+      cmk_auth }}'
+    body: request={"hostname":"{{ instance_name | default(inventory_hostname) }}"}
+    body_format: raw
+    status_code: 200
+    validate_certs: false
+    follow_redirects: true
+  become: false
+  when: cmk_add_host and output.id != ""
+  tags: cmk_register
+
+- name: cmk_apply
+  local_action:
+    module: uri
+    method: POST
+    url: '{{ cmk_omd_protocol }}://{{ cmk_omd_host }}/{{ cmk_omd_site }}/check_mk/webapi.py?action=activate_changes&mode=specific{{
+      cmk_auth }}'
+    body: request={"sites":["{{ cmk_omd_site }}"]}
+    body_format: raw
+    status_code: 200
+    validate_certs: false
+    follow_redirects: true
+  become: false
+  run_once: true
+  when: cmk_add_host and output.result_code == 0
+  delegate_to: localhost
+  tags: cmk_register
+- name: Wait some time
+  pause:
+    seconds: 10
+- name: cmk_discovery x 2
+  local_action:
+    module: uri
+    method: POST
+    url: '{{ cmk_omd_protocol }}://{{ cmk_omd_host }}/{{ cmk_omd_site }}/check_mk/webapi.py?action=discover_services&mode=refresh{{
+      cmk_auth }}'
+    body: request={"hostname":"{{ instance_name | default(inventory_hostname) }}"}
+    body_format: raw
+    status_code: 200
+    validate_certs: false
+    follow_redirects: true
+  become: false
+  when: cmk_add_host and output.result_code == 0
+  tags: cmk_register
+- name: cmk_apply
+  local_action:
+    module: uri
+    method: POST
+    url: '{{ cmk_omd_protocol }}://{{ cmk_omd_host }}/{{ cmk_omd_site }}/check_mk/webapi.py?action=activate_changes&mode=specific{{
+      cmk_auth }}'
+    body: request={"sites":["{{ cmk_omd_site }}"]}
+    body_format: raw
+    status_code: 200
+    validate_certs: false
+    follow_redirects: true
+  become: false
+  run_once: true
+  when: cmk_add_host and output.result_code == 0
+  tags: cmk_register

tasks/host-configure/modern.yml

@@ -0,0 +1,57 @@
+---
+- name: Output contains
+  debug:
+    var: output
+
+- name: cmk_discovery
+  local_action:
+    module: uri
+    method: POST
+    url: "{{ cmk_api_url }}/domain-types/service_discovery_run/actions/start/invoke"
+    headers:
+      Authorization: "Bearer {{ cmk_username }} {{ cmk_secret }}"
+      Accept: application/json
+      Content-Type: application/json
+    body_format: raw
+    body: |
+      {
+        "host_name": "{{ inventory_hostname | upper }}",
+        "mode": "fix_all"
+      }
+    status_code: 200
+    validate_certs: false
+    follow_redirects: true
+  become: false
+  when: cmk_add_host and res_add.status != 400 and output.id != ""
+  tags: cmk_register
+
+- name: Just Waiting
+  pause:
+    seconds: 20
+
+- name: cmk_apply
+  local_action:
+    module: uri
+    method: POST
+    url: '{{ cmk_omd_protocol }}://{{ cmk_omd_host }}/{{ cmk_omd_site }}/check_mk/api/1.0/domain-types/activation_run/actions/activate-changes/invoke'
+    headers:
+      Authorization: Bearer {{ cmk_username }} {{ cmk_secret }}
+      Accept: application/json
+      If-Match: "*"
+    body_format: json
+    body:
+      redirect: false
+      sites:
+       - "{{ cmk_omd_site }}"
+      force_foreign_changes: false
+    status_code: [200]
+    validate_certs: false
+    follow_redirects: true
+  become: false
+  run_once: true
+  when: cmk_add_host and res_add.status != 400 and output.id != ""
+  tags: cmk_register
+
+- name: Wait some time
+  pause:
+    seconds: 10

tasks/host-management.yml

@@ -1,13 +1,7 @@
 ---
-- name: Retrieve checkmk version
-  uri:
-    method: GET
-    headers:
-      Authorization: Bearer {{ cmk_username }} {{ cmk_secret }}
-      Accept: application/json
-    url: '{{ cmk_omd_protocol }}://{{ cmk_omd_host }}/{{ cmk_omd_site }}/check_mk/api/1.0/version'
-    return_content: true
-  register: cmk_output
+
+- include_tasks: host-management/{{ ansible_os_family }}/check.yml
+
 - name: Set facts # noqa jinja[spacing]
   set_fact:
     cmk_major: "{{ cmk_output.json.versions.checkmk | regex_search('(?P<major>\\\
@@ -18,16 +12,19 @@
       d+)\\.(?P<minor>\\d+).(?P<patch>[\\d\\w]+).(?P<edition>\\w+)', '\\g<patch>') | first }}"
     cmk_edition: "{{ cmk_output.json.versions.checkmk | regex_search('(?P<major>\\\
       d+)\\.(?P<minor>\\d+).(?P<patch>[\\d\\w]+).(?P<edition>\\w+)','\\g<edition>') | first }}"
+
 - name: Output vars
   debug:
     var: '{{ item }}'
   with_items: [cmk_major, cmk_minor, cmk_patch, cmk_edition]
-- include_tasks: host-management/legacy.yml
+
+- include_tasks: host-management/{{ ansible_os_family }}/legacy.yml
   when: >
     cmk_add_host and
     (cmk_major | int <= 2 and
     cmk_minor | int < 2 or  cmk_force_install)
-- include_tasks: host-management/modern.yml
+
+- include_tasks: host-management/{{ ansible_os_family }}/modern.yml
   when: >-
     cmk_add_host and
     (cmk_major | int >= 2 and

tasks/host-management/RedHat/check.yml

@@ -0,0 +1,11 @@
+---
+
+- name: Retrieve checkmk version
+  uri:
+    method: GET
+    headers:
+      Authorization: Bearer {{ cmk_username }} {{ cmk_secret }}
+      Accept: application/json
+    url: '{{ cmk_omd_protocol }}://{{ cmk_omd_host }}/{{ cmk_omd_site }}/check_mk/api/1.0/version'
+    return_content: true
+  register: cmk_output

tasks/host-management/RedHat/legacy.yml

@@ -0,0 +1,51 @@
+---
+- name: add host to omd (legacy)
+  uri:
+    method: POST
+    url: '{{ cmk_omd_protocol }}://{{ cmk_omd_host }}/{{ cmk_omd_site }}/check_mk/webapi.py?action=add_host{{
+      cmk_auth }}'
+    body: |
+      request={
+        "attributes": {
+        "tag_criticality": "prod",
+        "tag_agent": "cmk-agent",
+        "ipaddress": "{{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }}"
+      },
+      "folder": "{{ cmk_folder | default('Unsorted') }}",
+      "hostname": "{{ inventory_hostname | upper }}"
+      }
+    body_format: raw
+    return_content: true
+  register: res
+  become: false
+  when: >
+    cmk_add_host
+- name: Parse result
+  set_fact:
+    output: '{{ res.content | from_json }}'
+  when: cmk_add_host
+
+- name: cmk_discovery (legacy)
+  uri:
+    method: POST
+    url: '{{ cmk_omd_protocol }}://{{ cmk_omd_host }}/{{ cmk_omd_site }}/check_mk/webapi.py?action=discover_services&mode=refresh{{
+      cmk_auth }}'
+    body: request={"hostname":"{{ inventory_hostname }}"}
+    body_format: raw
+    status_code: 200
+  become: false
+  when: >
+    cmk_add_host and  output.result_code == 0 or  cmk_force_install
+
+- name: cmk_apply (legacy)
+  uri:
+    method: POST
+    url: '{{ cmk_omd_protocol }}://{{ cmk_omd_host }}/{{ cmk_omd_site }}/check_mk/webapi.py?action=activate_changes&mode=specific{{
+      cmk_auth }}'
+    body: request={"sites":["{{ cmk_omd_site }}"]}
+    body_format: raw
+    status_code: 200
+  become: false
+  run_once: true
+  when: >
+    output.result_code == 0 or  cmk_force_install

tasks/host-management/RedHat/modern.yml

@@ -0,0 +1,123 @@
+---
+- name: add host to omd (new)
+  uri:
+    method: POST
+    headers:
+      Authorization: Bearer {{ cmk_username }} {{ cmk_secret }}
+      Accept: application/json
+    url: '{{ cmk_api_url }}/domain-types/host_config/collections/all'
+    body:
+      folder: "{{ cmk_folder | default('~Unsorted') }}"
+      host_name: '{{ inventory_hostname | upper }}'
+      attributes:
+        tag_criticality: prod
+        tag_agent: cmk-agent
+        ipaddress: "{{ cmk_host_ip | default(hostvars[inventory_hostname]['ansible_default_ipv4']['address'], true) }}"
+    body_format: json
+    return_content: true
+    status_code: [200, 400]
+  register: res_add
+  become: false
+  delegate_to: localhost
+  when: >
+    cmk_add_host and cmk_major | int >= 2 and cmk_minor | int >= 2
+
+- name: Parse result
+  set_fact:
+    output: '{{ res_add.content | from_json }}'
+  when: cmk_add_host
+
+- name: Host exists fetch etag (new)  # noqa command-instead-of-module
+  shell:
+    cmd: |
+      curl \
+      -G \
+      -i \
+      --request GET \
+      --write-out "\nxxx-status_code=%{http_code}\n" \
+      --header "Authorization: Bearer {{ cmk_username }} {{ cmk_secret }}" \
+      --header "Accept: application/json" \
+      "{{ cmk_omd_protocol }}://{{ cmk_omd_host }}/{{ cmk_omd_site }}/check_mk/api/v0/objects/host_config/{{ inventory_hostname | upper }}"
+  register: res_host_exists
+  become: false
+  delegate_to: localhost
+  when: >
+    cmk_add_host and (cmk_major | int >= 2 and cmk_minor | int >= 2) and
+    (res_add.status == 400 and output.fields.host_name | first | regex_search('already
+    exists.$'))
+
+- name: Unpick response
+  set_fact:
+    etag: "{{ res_host_exists.stdout | regex_search('.*etag:.\"(?P<etag>.+)\".*', '\\g<etag>') | first }}"
+  when: >
+    cmk_add_host and (cmk_major | int >= 2 and  cmk_minor | int >= 2) and
+    (res_add.status == 400 and output.fields.host_name | first | regex_search('already
+    exists.$'))
+
+- name: Update host as already exists? (new)
+  uri:
+    method: PUT
+    headers:
+      Authorization: Bearer {{ cmk_username }} {{ cmk_secret }}
+      Accept: application/json
+      If-Match: '{{ etag }}'
+    url: '{{ cmk_omd_protocol }}://{{ cmk_omd_host }}/{{ cmk_omd_site }}/check_mk/api/v0/objects/host_config/{{
+      inventory_hostname | upper }}'
+    body:
+      update_attributes:
+        ipaddress: "{{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }}"
+    body_format: json
+    return_content: true
+    status_code: [200]
+  register: res
+  become: false
+  delegate_to: localhost
+  when: >
+    cmk_add_host and  (cmk_major | int >= 2 and  cmk_minor | int >= 2) and
+    (res_add.status == 400 and output.fields.host_name | first | regex_search('already
+    exists.$'))
+
+- name: Parse result
+  set_fact:
+    output: '{{ res_add.content | from_json }}'
+  when: cmk_add_host
+
+- name: cmk_discovery (new)
+  uri:
+    method: POST
+    headers:
+      Authorization: Bearer {{ cmk_username }} {{ cmk_secret }}
+      Accept: application/json
+    url: '{{ cmk_api_url }}/domain-types/service_discovery_run/actions/start/invoke'
+    body:
+      host_name: '{{ inventory_hostname | upper }}'
+      mode: fix_all
+    body_format: json
+    status_code: [200, 302]
+  become: false
+  delegate_to: localhost
+  when: >
+    cmk_add_host and  cmk_major | int >= 2 and
+    cmk_minor | int >= 2 or
+    cmk_force_install
+
+- name: cmk_apply (new)
+  uri:
+    method: POST
+    headers:
+      Authorization: Bearer {{ cmk_username }} {{ cmk_secret }}
+      Accept: application/json
+      If-Match: "*"
+    url: '{{ cmk_api_url }}/domain-types/activation_run/actions/activate-changes/invoke'
+    body:
+      redirect: false
+      sites:
+        - "{{ cmk_omd_site }}"
+      force_foreign_changes: false
+    body_format: json
+    status_code: 200
+  become: false
+  run_once: true
+  when: >
+    cmk_add_host and cmk_major | int >= 2 and
+    cmk_minor | int >= 2 or cmk_force_install

tasks/host-management/Windows/check.yml

@@ -0,0 +1,11 @@
+---
+
+- name: Retrieve checkmk version
+  win_uri:
+    method: GET
+    headers:
+      Authorization: Bearer {{ cmk_username }} {{ cmk_secret }}
+      Accept: application/json
+    url: '{{ cmk_omd_protocol }}://{{ cmk_omd_host }}/{{ cmk_omd_site }}/check_mk/api/1.0/version'
+    return_content: true
+  register: cmk_output

tasks/host-management/Windows/legacy.yml

@@ -0,0 +1,51 @@
+---
+- name: add host to omd (legacy)
+  win_uri:
+    method: POST
+    url: '{{ cmk_omd_protocol }}://{{ cmk_omd_host }}/{{ cmk_omd_site }}/check_mk/webapi.py?action=add_host{{
+      cmk_auth }}'
+    body: |
+      request={
+        "attributes": {
+        "tag_criticality": "prod",
+        "tag_agent": "cmk-agent",
+        "ipaddress": "{{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }}"
+      },
+      "folder": "{{ cmk_folder | default('Unsorted') }}",
+      "hostname": "{{ inventory_hostname | upper }}"
+      }
+    body_format: raw
+    return_content: true
+  register: res
+  become: false
+  when: >
+    cmk_add_host
+- name: Parse result
+  set_fact:
+    output: '{{ res.content | from_json }}'
+  when: cmk_add_host
+
+- name: cmk_discovery (legacy)
+  win_uri:
+    method: POST
+    url: '{{ cmk_omd_protocol }}://{{ cmk_omd_host }}/{{ cmk_omd_site }}/check_mk/webapi.py?action=discover_services&mode=refresh{{
+      cmk_auth }}'
+    body: request={"hostname":"{{ inventory_hostname }}"}
+    body_format: raw
+    status_code: 200
+  become: false
+  when: >
+    cmk_add_host and  output.result_code == 0 or  cmk_force_install
+
+- name: cmk_apply (legacy)
+  win_uri:
+    method: POST
+    url: '{{ cmk_omd_protocol }}://{{ cmk_omd_host }}/{{ cmk_omd_site }}/check_mk/webapi.py?action=activate_changes&mode=specific{{
+      cmk_auth }}'
+    body: request={"sites":["{{ cmk_omd_site }}"]}
+    body_format: raw
+    status_code: 200
+  become: false
+  run_once: true
+  when: >
+    output.result_code == 0 or  cmk_force_install

tasks/host-management/Windows/modern.yml

@@ -0,0 +1,136 @@
+---
+- name: add host to omd (new)
+  win_uri:
+    method: POST
+    headers:
+      Authorization: Bearer {{ cmk_username }} {{ cmk_secret }}
+      Accept: application/json
+    url: '{{ cmk_api_url }}/domain-types/host_config/collections/all'
+    body:
+      folder: "{{ cmk_folder | default('~Unsorted') }}"
+      host_name: '{{ inventory_hostname | upper }}'
+      attributes:
+        tag_criticality: prod
+        tag_agent: cmk-agent
+        ipaddress: "{{ cmk_host_ip | default(hostvars[inventory_hostname]['ansible_default_ipv4']['address'], true) }}"
+    body_format: json
+    return_content: true
+    status_code: [200, 400]
+  register: res_add
+  become: false
+  when: >
+    cmk_add_host and cmk_major | int >= 2 and cmk_minor | int >= 2
+
+- name: Parse result
+  set_fact:
+    output: '{{ res_add.content | from_json }}'
+  when: cmk_add_host
+
+- name: Fetch etag (new)
+  win_uri:
+    method: GET
+    headers:
+      Authorization: Bearer {{ cmk_username }} {{ cmk_secret }}
+      Accept: application/json
+    url: "{{ cmk_omd_protocol }}://{{ cmk_omd_host }}/{{ cmk_omd_site }}/check_mk/api/v0/objects/host_config/{{ inventory_hostname | upper }}"
+    return_content: true
+  register: res_host_exists
+  become: false
+  when: >
+    cmk_add_host and (cmk_major | int >= 2 and cmk_minor | int >= 2) and
+    (res_add.status == 400 and output.fields.host_name | first | regex_search('already
+    exists.$'))
+
+# - name: Host exists fetch etag (new)  # noqa command-instead-of-module
+#   shell:
+#     cmd: |
+#       curl \
+#       -G \
+#       -i \
+#       --request GET \
+#       --write-out "\nxxx-status_code=%{http_code}\n" \
+#       --header "Authorization: Bearer {{ cmk_username }} {{ cmk_secret }}" \
+#       --header "Accept: application/json" \
+#       "{{ cmk_omd_protocol }}://{{ cmk_omd_host }}/{{ cmk_omd_site }}/check_mk/api/v0/objects/host_config/{{ inventory_hostname | upper }}"
+#   register: res_host_exists
+#   become: false
+#   when: >
+#     cmk_add_host and (cmk_major | int >= 2 and cmk_minor | int >= 2) and
+#     (res_add.status == 400 and output.fields.host_name | first | regex_search('already
+#     exists.$'))
+
+- name: Unpick response
+  set_fact:
+    etag: "{{ res_host_exists.stdout | regex_search('.*etag:.\"(?P<etag>.+)\".*', '\\g<etag>') | first }}"
+  when: >
+    cmk_add_host and (cmk_major | int >= 2 and cmk_minor | int >= 2) and
+    (res_add.status == 400 and output.fields.host_name | first | regex_search('already
+    exists.$'))
+
+- name: Update host as already exists? (new)
+  win_uri:
+    method: PUT
+    headers:
+      Authorization: Bearer {{ cmk_username }} {{ cmk_secret }}
+      Accept: application/json
+      If-Match: '{{ etag }}'
+    url: '{{ cmk_omd_protocol }}://{{ cmk_omd_host }}/{{ cmk_omd_site }}/check_mk/api/v0/objects/host_config/{{
+      inventory_hostname | upper }}'
+    body:
+      update_attributes:
+        ipaddress: "{{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }}"
+    body_format: json
+    return_content: true
+    status_code: [200]
+  register: res
+  become: false
+  delegate_to: localhost
+  when: >
+    cmk_add_host and (cmk_major | int >= 2 and cmk_minor | int >= 2) and
+    (res_add.status == 400 and output.fields.host_name | first | regex_search('already
+    exists.$'))
+
+- name: Parse result
+  set_fact:
+    output: '{{ res_add.content | from_json }}'
+  when: cmk_add_host
+
+- name: cmk_discovery (new)
+  win_uri:
+    method: POST
+    headers:
+      Authorization: Bearer {{ cmk_username }} {{ cmk_secret }}
+      Accept: application/json
+    url: '{{ cmk_api_url }}/domain-types/service_discovery_run/actions/start/invoke'
+    body:
+      host_name: '{{ inventory_hostname | upper }}'
+      mode: fix_all
+    body_format: json
+    status_code: [200, 302]
+  become: false
+  delegate_to: localhost
+  when: >
+    cmk_add_host and cmk_major | int >= 2 and
+    cmk_minor | int >= 2 or
+    cmk_force_install
+
+- name: cmk_apply (new)
+  win_uri:
+    method: POST
+    headers:
+      Authorization: Bearer {{ cmk_username }} {{ cmk_secret }}
+      Accept: application/json
+      If-Match: "*"
+    url: '{{ cmk_api_url }}/domain-types/activation_run/actions/activate-changes/invoke'
+    body:
+      redirect: false
+      sites:
+        - "{{ cmk_omd_site }}"
+      force_foreign_changes: false
+    body_format: json
+    status_code: 200
+  become: false
+  run_once: true
+  when: >
+    cmk_add_host and cmk_major | int >= 2 and
+    cmk_minor | int >= 2 or cmk_force_install

tasks/host-management/modern.yml

@@ -5,52 +5,55 @@
     headers:
       Authorization: Bearer {{ cmk_username }} {{ cmk_secret }}
       Accept: application/json
-    url: '{{ cmk_omd_protocol }}://{{ cmk_omd_host }}/{{ cmk_omd_site }}/check_mk/api/1.0/domain-types/host_config/collections/all'
+    url: '{{ cmk_api_url }}/domain-types/host_config/collections/all'
     body:
       folder: "{{ cmk_folder | default('~Unsorted') }}"
       host_name: '{{ inventory_hostname | upper }}'
       attributes:
         tag_criticality: prod
         tag_agent: cmk-agent
-        ipaddress: "{{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }}"
+        ipaddress: "{{ cmk_host_ip | default(hostvars[inventory_hostname]['ansible_default_ipv4']['address'], true) }}"
     body_format: json
     return_content: true
     status_code: [200, 400]
-  register: res
+  register: res_add
   become: false
   delegate_to: localhost
   when: >
     cmk_add_host and  cmk_major | int >= 2 and  cmk_minor | int >= 2
+
 - name: Parse result
   set_fact:
-    output: '{{ res.content | from_json }}'
+    output: '{{ res_add.content | from_json }}'
   when: cmk_add_host
+
 - name: Host exists fetch etag (new)  # noqa command-instead-of-module
-  shell: |
-    curl \
-    -G \
-    -i \
-    --request GET \
-    --write-out "\nxxx-status_code=%{http_code}\n" \
-    --header "Authorization: Bearer {{ cmk_username }} {{ cmk_secret }}" \
-    --header "Accept: application/json" \
-    "{{ cmk_omd_protocol }}://{{ cmk_omd_host }}/{{ cmk_omd_site }}/check_mk/api/v0/objects/host_config/{{ inventory_hostname | upper }}"
-  register: res
+  shell:
+    cmd: |
+      curl \
+      -G \
+      -i \
+      --request GET \
+      --write-out "\nxxx-status_code=%{http_code}\n" \
+      --header "Authorization: Bearer {{ cmk_username }} {{ cmk_secret }}" \
+      --header "Accept: application/json" \
+      "{{ cmk_omd_protocol }}://{{ cmk_omd_host }}/{{ cmk_omd_site }}/check_mk/api/v0/objects/host_config/{{ inventory_hostname | upper }}"
+  register: res_host_exists
   become: false
   delegate_to: localhost
   when: >
-    cmk_add_host and  (cmk_major | int >= 2 and  cmk_minor | int >= 2) and
-    (output.status == 400 and output.fields.host_name | first | regex_search('already
+    cmk_add_host and (cmk_major | int >= 2 and cmk_minor | int >= 2) and
+    (res_add.status == 400 and output.fields.host_name | first | regex_search('already
     exists.$'))
-- debug:
-    var: res
+
 - name: Unpick response
   set_fact:
-    etag: "{{ res.stdout | regex_search('.*etag:.\"(?P<etag>.+)\".*', '\\g<etag>') | first }}"
+    etag: "{{ res_host_exists.stdout | regex_search('.*etag:.\"(?P<etag>.+)\".*', '\\g<etag>') | first }}"
   when: >
-    cmk_add_host and  (cmk_major | int >= 2 and  cmk_minor | int >= 2) and
-    (output.status == 400 and output.fields.host_name | first | regex_search('already
+    cmk_add_host and (cmk_major | int >= 2 and  cmk_minor | int >= 2) and
+    (res_add.status == 400 and output.fields.host_name | first | regex_search('already
     exists.$'))
+
 - name: Update host as already exists? (new)
   uri:
     method: PUT
@@ -71,45 +74,50 @@
   delegate_to: localhost
   when: >
     cmk_add_host and  (cmk_major | int >= 2 and  cmk_minor | int >= 2) and
-    (output.status == 400 and output.fields.host_name | first | regex_search('already
+    (res_add.status == 400 and output.fields.host_name | first | regex_search('already
     exists.$'))
+
 - name: Parse result
   set_fact:
-    output: '{{ res.content | from_json }}'
+    output: '{{ res_add.content | from_json }}'
   when: cmk_add_host
+
 - name: cmk_discovery (new)
   uri:
     method: POST
     headers:
       Authorization: Bearer {{ cmk_username }} {{ cmk_secret }}
       Accept: application/json
-    url: '{{ cmk_omd_protocol }}://{{ cmk_omd_host }}/{{ cmk_omd_site }}/check_mk/api/1.0/domain-types/service_discovery_run/actions/start/invoke'
+    url: '{{ cmk_api_url }}/domain-types/service_discovery_run/actions/start/invoke'
     body:
       host_name: '{{ inventory_hostname | upper }}'
-      mode: refresh
+      mode: fix_all
     body_format: json
     status_code: [200, 302]
   become: false
+  delegate_to: localhost
   when: >
     cmk_add_host and  cmk_major | int >= 2 and
     cmk_minor | int >= 2 or
     cmk_force_install
-  delegate_to: localhost
+
 - name: cmk_apply (new)
   uri:
     method: POST
     headers:
       Authorization: Bearer {{ cmk_username }} {{ cmk_secret }}
       Accept: application/json
-    url: '{{ cmk_omd_protocol }}://{{ cmk_omd_host }}/{{ cmk_omd_site }}/check_mk/api/1.0/domain-types/activation_run/actions/activate-changes/invoke'
+      If-Match: "*"
+    url: '{{ cmk_api_url }}/domain-types/activation_run/actions/activate-changes/invoke'
     body:
-      redirect: 'False'
-      sites: ['{{ cmk_omd_site }}']
-      force_foreign_changes: 'False'
+      redirect: false
+      sites:
+        - "{{ cmk_omd_site }}"
+      force_foreign_changes: false
     body_format: json
     status_code: 200
   become: false
   run_once: true
   when: >
-    cmk_add_host and  cmk_major | int >= 2 and  cmk_minor | int >= 2 and  cmk_force_install
-  delegate_to: localhost
+    cmk_add_host and cmk_major | int >= 2 and
+    cmk_minor | int >= 2 or cmk_force_install

tasks/main.yml

@@ -12,6 +12,6 @@
 # Register for automatic agent updates
 - include_tasks: '{{ ansible_os_family }}-register.yml'
   when: cmk_fresh_install
-# Finalize things and collect all available services
-- include_tasks: host-configure.yml
-  when: cmk_fresh_install
+# # Finalize things and collect all available services
+# - include_tasks: host-configure.yml
+#   when: cmk_fresh_install