defaults/main.yml

@@ -25,6 +25,7 @@ zabbix_agent_start_agents: 3
 zabbix_agent_passive_checks_status: 'disabled'
 zabbix_agent_hostname: '{{ ansible_fqdn }}'
 zabbix_agent_processing_timeout: 3
+zabbix_host_metadata: "{{ ansible_system }}"
 
 zabbix_agent_firewalld_services:
   - { service: 'zabbix-agent', state: '{{ zabbix_agent_passive_checks_status }}', zone: '{{ firewalld_default_zone }}' }

templates/zabbix_agentd.conf.j2

@@ -183,11 +183,7 @@ Hostname={{ zabbix_agent_hostname }}
 # Range: 0-255 characters
 # Default:
 # HostMetadata=
-{% if zabbix_authentication_method == "psk" %}
-HostMetadata={{ ansible_system }} {{ zabbix_psk_string }}
-{% else %}
-HostMetadata={{ ansible_system }}
-{% endif %}
+HostMetadata={{ zabbix_host_metadata }}
 
 ### Option: HostMetadataItem
 #	Optional parameter that defines an item used for getting host metadata.