Merge branch 'main' into refactor_zabbix_proxy

.github/workflows/agent.yml

@@ -22,6 +22,7 @@ jobs:
         container:
           - rockylinux9
           - rockylinux8
+          - ubuntu2404
           - ubuntu2204
           - ubuntu2004
           - ubuntu1804
@@ -40,6 +41,8 @@ jobs:
         exclude:
           - container: debian12
             version: v62
+          - container: ubuntu2404
+            version: v62
 
     steps:
       - name: Check out code

.github/workflows/javagateway.yml

@@ -23,6 +23,7 @@ jobs:
           - rockylinux9
           - rockylinux8
           - centos7
+          - ubuntu2404
           - ubuntu2204
           - ubuntu2004
           - ubuntu1804
@@ -40,6 +41,8 @@ jobs:
         exclude:
           - container: debian12
             version: v62
+          - container: ubuntu2404
+            version: v62
         collection_role:
           - zabbix_javagateway
     steps:

.github/workflows/proxy.yml

@@ -20,33 +20,16 @@ jobs:
       fail-fast: false
       matrix:
         container:
-          - name: rockylinux9
-            base_image: rockylinux/rockylinux:9-ubi-init
-            os_family: redhat
-          - name: rockylinux8
-            base_image: rockylinux/rockylinux:8-ubi-init
-            os_family: redhat
-          - name: centos7
-            base_image: centos/systemd:latest
-            os_family: redhat
-          - name: ubuntu2204
-            base_image: ubuntu:22.04
-            os_family: debian
-          - name: ubuntu2004
-            base_image: ubuntu:20.04
-            os_family: debian
-          - name: ubuntu1804
-            base_image: ubuntu:18.04
-            os_family: debian
-          - name: debian12
-            base_image: debian:12
-            os_family: debian
-          - name: debian11
-            base_image: debian:11
-            os_family: debian
-          - name: debian10
-            base_image: debian:10
-            os_family: debian
+          - rockylinux9
+          - rockylinux8
+          - centos7
+          - ubuntu2404
+          - ubuntu2204
+          - ubuntu2004
+          - ubuntu1804
+          - debian12
+          - debian11
+          - debian10
         collection_role:
           - zabbix_proxy
         database:
@@ -63,6 +46,8 @@ jobs:
               base_image: debian:12
               os_family: debian
             version: v62
+          - container: ubuntu2404
+            version: v62
     steps:
       - name: Check out code
         uses: actions/checkout@v4

.github/workflows/server.yml

@@ -22,6 +22,7 @@ jobs:
         container:
           - rockylinux9
           - rockylinux8
+          - ubuntu2404
           - ubuntu2204
           - ubuntu2004
           - ubuntu1804
@@ -37,13 +38,13 @@ jobs:
           - v64
           - v62
           - v60
-        include:
-          - interpreter: python3
         exclude:
           - container: debian12
             version: v62
           - container: debian10
             version: v62
+          - container: ubuntu2404
+            version: v62
           - container: ubuntu1804
             version: v62
           - container: ubuntu1804
@@ -86,6 +87,5 @@ jobs:
           MY_MOLECULE_IMAGE=${{ matrix.container }}
           MY_MOLECULE_VERSION=${{ matrix.version }}
           MY_MOLECULE_DATABASE=${{ matrix.database }}
-          MY_MOLECULE_INTERPRETER=${{ matrix.interpreter }}
           MY_MOLECULE_DOCKER_COMMAND=${{ matrix.command }}
           molecule test -s ${{ matrix.collection_role }}

.github/workflows/web.yml

@@ -22,6 +22,7 @@ jobs:
         container:
           - rockylinux9
           - rockylinux8
+          - ubuntu2404
           - ubuntu2204
           - ubuntu2004
           - ubuntu1804
@@ -35,6 +36,7 @@ jobs:
           - pgsql
         web_server:
           - nginx
+          - apache
         version:
           - v64
           - v62
@@ -44,6 +46,8 @@ jobs:
         exclude:
           - container: debian10
             version: v62
+          - container: ubuntu2404
+            version: v62
           - container: ubuntu1804
             version: v62
           - container: debian10

CHANGELOG.rst

@@ -4,6 +4,42 @@ community.zabbix Release Notes
 
 .. contents:: Topics
 
+v2.4.0
+======
+
+Minor Changes
+-------------
+
+- Add slash at the end of the location directives, to prevent path traversal attacks.
+- Added active_since and active_till in zabbix_maintenance
+- Added content_type for email in zabbix_mediatypes
+- Introduce flag `enable_version_check` to allow installations on non-supported platforms.
+- agent, javagateway, proxy, server, and web role - added the http_proxy and https_proxy environment variables to "Debian | Download gpg key" analog to other tasks
+- agent, javagateway, proxy, server, and web role - introduced default variable zabbix_repo_deb_gpg_key_url with value http://repo.zabbix.com/zabbix-official-repo.key
+- agent, javagateway, proxy, server, and web role - introduced default variable zabbix_repo_deb_include_deb_src with value true
+- agent, javagateway, proxy, server, and web role - removed superfluous slash in zabbix_gpg_key of the Debian vars and renamed key to zabbix-repo instead of zabbix-official-repo
+- agent, javagateway, proxy, server, and web role - used variable zabbix_repo_deb_include_deb_src in "Debian | Installing repository" to determine whether deb-src should be added to /etc/apt/sources.list.d/zabbix.sources
+- agent, javagateway, proxy, server, and web role - used zabbix_repo_deb_gpg_key_url in "Debian | Download gpg key" instead of hardcoded url
+- zabbix_correlation module added
+- zabbix_service_info module added
+- zabbix_template - Add template_yaml parameter.
+- zabbix_web role, Refactored zabbix_selinux variable names to correlate with selinux boolean names.
+
+Bugfixes
+--------
+
+- zabbix_agent - Fixed IPMI authentication algorithm default setting
+- zabbix_agent - Fixed issue to where scripts can be deployed alongside userparameters
+- zabbix_host - Don't reset IPMI setting when update inventory data of a host
+- zabbix_host - Finish task with failed if host_group parameter is empty list
+- zabbix_server - proper indentaion of become in selinux.yaml
+- zabbix_web - Added missing semicolon to nginx vhost template.
+- zabbix_web role, Add missing selinux.yml tasks.
+
+New Modules
+-----------
+
+- community.zabbix.zabbix_correlation - Create/update/delete Zabbix correlation
 
 v2.3.1
 ======
@@ -598,7 +634,6 @@ Release Summary
 
 | Release date: 2020-10-22
 
-
 Minor Changes
 -------------
 
@@ -625,7 +660,6 @@ Release Summary
 
 | Release date: 2020-08-16
 
-
 Minor Changes
 -------------
 
@@ -665,7 +699,6 @@ Release Summary
 
 | Release date: 2020-07-26
 
-
 Minor Changes
 -------------
 
@@ -738,7 +771,6 @@ Release Summary
 
 | Release date: 2020-06-15
 
-
 Minor Changes
 -------------
 

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.3.1
+    version: 2.4.0
   - name: ansible.posix
     version: 1.3.0
   - name: community.general

changelogs/.plugin-cache.yaml

@@ -1,12 +1,10 @@
-objects:
-  role: {}
+objects: {}
 plugins:
   become: {}
   cache: {}
   callback: {}
   cliconf: {}
   connection: {}
-  filter: {}
   httpapi:
     zabbix:
       description: HttpApi Plugin for Zabbix
@@ -39,6 +37,11 @@ plugins:
       name: zabbix_autoregister
       namespace: ''
       version_added: 1.6.0
+    zabbix_correlation:
+      description: Create/update/delete Zabbix correlation
+      name: zabbix_correlation
+      namespace: ''
+      version_added: 2.4.0
     zabbix_discovery_rule:
       description: Create/delete/update Zabbix discovery rules
       name: zabbix_discovery_rule
@@ -129,6 +132,11 @@ plugins:
       name: zabbix_service
       namespace: ''
       version_added: null
+    zabbix_service_info:
+      description: Gather information about Zabbix service
+      name: zabbix_service_info
+      namespace: ''
+      version_added: null
     zabbix_settings:
       description: Update Zabbix global settings.
       name: zabbix_settings
@@ -187,6 +195,5 @@ plugins:
   netconf: {}
   shell: {}
   strategy: {}
-  test: {}
   vars: {}
-version: 2.3.1
+version: 2.4.0

changelogs/changelog.yaml

@@ -1092,3 +1092,61 @@ releases:
     fragments:
     - 1156-bugfix_zabbix_user_directory_dryrun.yml
     release_date: '2024-01-10'
+  2.4.0:
+    changes:
+      bugfixes:
+      - zabbix_agent - Fixed IPMI authentication algorithm default setting
+      - zabbix_agent - Fixed issue to where scripts can be deployed alongside userparameters
+      - zabbix_host - Don't reset IPMI setting when update inventory data of a host
+      - zabbix_host - Finish task with failed if host_group parameter is empty list
+      - zabbix_server - proper indentaion of become in selinux.yaml
+      - zabbix_web - Added missing semicolon to nginx vhost template.
+      - zabbix_web role, Add missing selinux.yml tasks.
+      minor_changes:
+      - Add slash at the end of the location directives, to prevent path traversal
+        attacks.
+      - Added active_since and active_till in zabbix_maintenance
+      - Added content_type for email in zabbix_mediatypes
+      - Introduce flag `enable_version_check` to allow installations on non-supported
+        platforms.
+      - agent, javagateway, proxy, server, and web role - added the http_proxy and
+        https_proxy environment variables to "Debian | Download gpg key" analog to
+        other tasks
+      - agent, javagateway, proxy, server, and web role - introduced default variable
+        zabbix_repo_deb_gpg_key_url with value http://repo.zabbix.com/zabbix-official-repo.key
+      - agent, javagateway, proxy, server, and web role - introduced default variable
+        zabbix_repo_deb_include_deb_src with value true
+      - agent, javagateway, proxy, server, and web role - removed superfluous slash
+        in zabbix_gpg_key of the Debian vars and renamed key to zabbix-repo instead
+        of zabbix-official-repo
+      - agent, javagateway, proxy, server, and web role - used variable zabbix_repo_deb_include_deb_src
+        in "Debian | Installing repository" to determine whether deb-src should be
+        added to /etc/apt/sources.list.d/zabbix.sources
+      - agent, javagateway, proxy, server, and web role - used zabbix_repo_deb_gpg_key_url
+        in "Debian | Download gpg key" instead of hardcoded url
+      - zabbix_correlation module added
+      - zabbix_service_info module added
+      - zabbix_template - Add template_yaml parameter.
+      - zabbix_web role, Refactored zabbix_selinux variable names to correlate with
+        selinux boolean names.
+    fragments:
+    - 1157-add_template_yaml.yml
+    - 1162-do_not_update_ipmi_options.yml
+    - 1165-indent-become.yml
+    - 1168-finish-task-with-failed-if-host_group-parameter-is-empty_list.yml
+    - 1169-add_zabbix_correlation.yml
+    - 1176-content_type-in-mediatype.yml
+    - 1180-active_since-in-maintenance.yml
+    - 1183-nginx-fix-against-path-traversal.yml
+    - 1186-custom_gpg_key_url.yml
+    - 1188-agent_ipmi_authtype_fix.yml
+    - 1205-fix-zabbix-agent-scripts.yml
+    - 1206-fix-nginx-template-ssl-params.yml
+    - 1210-add_zabbix_service_info.yml
+    - 1220-refactor_selinux_tasks_and_variable_names_role_zabbix_web.yml
+    - 1224-enable-version-check.yml
+    modules:
+    - description: Create/update/delete Zabbix correlation
+      name: zabbix_correlation
+      namespace: ''
+    release_date: '2024-05-13'

changelogs/fragments/1221-add_support_for_ubuntu_24.04.yml

@@ -0,0 +1,2 @@
+minor_changes:
+  - all roles - Added support for Ubuntu 24.04 (Noble Numbat)

changelogs/fragments/1227-fpm-socket-permissions.yml

@@ -0,0 +1,2 @@
+bugfixes:
+  - zabbix_web - make the FPM socket group-writable so the web server can properly forward requests to the FPM process

changelogs/fragments/agent.yml

@@ -0,0 +1,3 @@
+minor_changes:
+  - agent role - Standardized all configuration variables using the `zabbix_agent` prefix vs `zabbix_agent2`.  Support for `zabbix_agent2` to be removed in 3.0.0
+  - agent role - Standardized templating of agent.conf file

changelogs/fragments/pr_1222.yml

@@ -0,0 +1,6 @@
+minor_changes:
+  - zabbix_item module added
+  - zabbix_trigger module added
+  - zabbix_discoveryrule module added
+  - zabbix_itemprototype module added
+  - zabbix_triggerprototype module added