Skip to content

Commit

Permalink
Fixing zabbix agent include issues (#1323)
Browse files Browse the repository at this point in the history
  • Loading branch information
pyrodie18 authored Jul 6, 2024
1 parent a7602ee commit 018638b
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions changelogs/fragments/1322.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bugfixes:
- zabbix_agent Role - Fixed several issues related to `zabbix_agent_include_dir` and `zabbix_agent_include`
2 changes: 1 addition & 1 deletion roles/zabbix_agent/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ zabbix_agent_docker_ports:
zabbix_agent_docker_security_opts:
- apparmor:unconfined
zabbix_agent_docker_volumes:
- /etc/zabbix/zabbix_agentd.d:{{ zabbix_agent_include }}
- /etc/zabbix/zabbix_agentd.d:{{ zabbix_agent_include_dir }}
- /:/hostfs:ro
- /etc:/hostfs/etc:ro
- /proc:/hostfs/proc:ro
Expand Down
2 changes: 1 addition & 1 deletion roles/zabbix_agent/tasks/remove.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@

- name: "Remove | Remove the agent-include-dir"
ansible.builtin.file:
path: "{{ zabbix_agent_include | replace('agent2', 'agent') }}"
path: "{{ zabbix_agent_include_dir | replace('agent2', 'agent') }}"
state: absent
become: true
2 changes: 1 addition & 1 deletion roles/zabbix_agent/tasks/userparameter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
- name: Install user-defined userparameters
ansible.builtin.template:
src: "{{ zabbix_agent_userparameters_templates_src }}/{{ item.name }}.j2"
dest: "{{ zabbix_agent_include }}/userparameter_{{ item.name }}.conf"
dest: "{{ zabbix_agent_include_dir }}/userparameter_{{ item.name }}.conf"
owner: zabbix
group: zabbix
mode: "0644"
Expand Down

0 comments on commit 018638b

Please sign in to comment.