Merge branch 'zabbix_host_events_info_tags' of github.com:aplathrop/c…

…ommunity.zabbix into zabbix_host_events_info_tags
ansible-collections · May 31, 2024 · 5b7291a · 5b7291a
2 parents df2e84f + eec026d
commit 5b7291a
Show file tree

Hide file tree

Showing 7 changed files with 1,059 additions and 1,038 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,6 +4,15 @@ community.zabbix Release Notes
 
 .. contents:: Topics
 
+v2.5.1
+======
+
+Bugfixes
+-------------
+
+- zabbix_agent - Fix reading existing psk
+- zabbix_agent - Fix role when zabbix_agent_listenip is undefined
+
 v2.5.0
 ======
 

diff --git a/README.md b/README.md
@@ -104,7 +104,7 @@ You can also include it in a `requirements.yml` file along with other required c
 ---
 collections:
   - name: community.zabbix
-    version: 2.5.0
+    version: 2.5.1
   - name: ansible.posix
     version: 1.3.0
   - name: community.general

diff --git a/changelogs/.plugin-cache.yaml b/changelogs/.plugin-cache.yaml
@@ -226,4 +226,4 @@ plugins:
   shell: {}
   strategy: {}
   vars: {}
-version: 2.5.0
+version: 2.5.1
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
diff --git a/galaxy.yml b/galaxy.yml
@@ -1,7 +1,7 @@
 ---
 namespace: community
 name: zabbix
-version: 2.5.0
+version: 2.5.1
 readme: README.md
 authors:
   - Dusan Matejka (@D3DeFi)

diff --git a/roles/zabbix_agent/tasks/Linux.yml b/roles/zabbix_agent/tasks/Linux.yml
@@ -51,7 +51,7 @@
     network_interface: ansible_{{ zabbix_agent_listeninterface }}
   when:
     - (zabbix_agent_listeninterface)
-    - not zabbix_agent_listenip
+    - zabbix_agent_listenip is undefined
   tags:
     - config
 
@@ -60,7 +60,7 @@
     zabbix_agent_listenip: "{{ hostvars[inventory_hostname][network_interface]['ipv4'].address | default('0.0.0.0') }}"
   when:
     - (zabbix_agent_listeninterface)
-    - not zabbix_agent_listenip
+    - zabbix_agent_listenip is undefined
   tags:
     - config
     - api
@@ -69,7 +69,7 @@
   ansible.builtin.set_fact:
     zabbix_agent_listenip: "0.0.0.0"
   when:
-    - not (zabbix_agent_listenip)
+    - zabbix_agent_listenip is undefined
   tags:
     - config
 

diff --git a/roles/zabbix_agent/tasks/psk_secret.yml b/roles/zabbix_agent/tasks/psk_secret.yml
@@ -30,6 +30,7 @@
   ansible.builtin.slurp:
     src: "{{ zabbix_agent_tlspskfile }}"
   register: zabbix_agent_tlspsk_base64
+  become: true
   when:
     - zabbix_agent_tlspskcheck.stat.exists
   no_log: "{{ ansible_verbosity < 3 }}"