Updated Roles to add support for 6.5 (7.0 Preview) (#1111)

ansible-collections · Oct 30, 2023 · 506de49 · 506de49
1 parent 29090f2
commit 506de49
Show file tree

Hide file tree

Showing 39 changed files with 257 additions and 82 deletions.
diff --git a/.github/workflows/agent.yml b/.github/workflows/agent.yml
@@ -30,6 +30,7 @@ jobs:
           - debian10
         version:
             - v60
+            - v65
         scenario_name:
           - default
           - autopsk

diff --git a/.github/workflows/javagateway.yml b/.github/workflows/javagateway.yml
@@ -30,10 +30,16 @@ jobs:
           - debian10
         version:
           - v60
+          - v65
         include:
           - interpreter: python3
           - interpreter: python
             container: centos7
+        exclude:
+          - container: debian10
+            version: v65
+          - container: centos7
+            version: v65
         collection_role:
           - zabbix_javagateway
     steps:

diff --git a/.github/workflows/plugins-integration.yml b/.github/workflows/plugins-integration.yml
@@ -20,7 +20,8 @@ jobs:
       fail-fast: false
       matrix:
         zabbix_container:
-          - version: "6.0"
+          - version: "6.0-latest"
+          - version: "trunk"
         ansible:
           # https://docs.ansible.com/ansible/latest/reference_appendices/release_and_maintenance.html#ansible-core-changelogs
           - stable-2.14
@@ -50,7 +51,7 @@ jobs:
 
       # For Zabbix integration tests we need to test against different versions of
       # the Zabbix server. To do this we spin up a Docker container using the `matrix`
-      # of version and ports specified earlier.
+      # of version and ports specified earlier. 
       - name: Zabbix container server provisioning
         uses: isbang/[email protected]
         with:

diff --git a/.github/workflows/proxy.yml b/.github/workflows/proxy.yml
@@ -36,13 +36,18 @@ jobs:
           - sqlite3
         version:
           - v60
+          - v65
         include:
           - interpreter: python3
           - interpreter: python
             container: centos7
         exclude:
           - container: debian12
             version: v62
+          - container: centos7
+            version: v65
+          - container: debian10
+            version: v65
     steps:
       - name: Check out code
         uses: actions/checkout@v4

diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml
@@ -34,8 +34,12 @@ jobs:
           - pgsql
         version:
           - v60
+          - v65
         include:
           - interpreter: python3
+        exclude:
+          - container: debian10
+            version: v65
     steps:
       - name: Check out code
         uses: actions/checkout@v4

diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
@@ -36,8 +36,13 @@ jobs:
           - nginx
         version:
           - v60
+          - v65
         include:
           - interpreter: python3
+        exclude:
+          - container: debian10
+            version: v65
+
     steps:
       - name: Check out code
         uses: actions/checkout@v4

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -8,7 +8,7 @@ services:
       POSTGRES_USER: "zabbix"
       POSTGRES_PASSWORD: "zabbix"
   zabbix-server:
-    image: zabbix/zabbix-server-pgsql:ubuntu-${zabbix_version}-latest
+    image: zabbix/zabbix-server-pgsql:ubuntu-${zabbix_version}
     environment:
       DB_SERVER_HOST: "zabbix-db"
       POSTGRES_USER: "zabbix"
@@ -19,7 +19,7 @@ services:
     links:
       - "zabbix-db"
   zabbix-web:
-    image: zabbix/zabbix-web-nginx-pgsql:ubuntu-${zabbix_version}-latest
+    image: zabbix/zabbix-web-nginx-pgsql:ubuntu-${zabbix_version}
     environment:
       DB_SERVER_HOST: "zabbix-db"
       POSTGRES_USER: "zabbix"

diff --git a/docs/ZABBIX_AGENT_ROLE.md b/docs/ZABBIX_AGENT_ROLE.md
@@ -90,16 +90,16 @@ To successfully complete the install the role requires `python-netaddr` on the c
 
 See the following list of supported Operating systems with the Zabbix releases:
 
-| Zabbix              | 6.0 |
-|---------------------|-----|
-| Red Hat Fam 9       | V  |
-| Red Hat Fam 8       | V  |
-| Red Hat Fam 7       | V  |
-| Ubuntu 22.04 jammy  | V  |
-| Ubuntu 20.04 focal  | V  |
-| Debian 12 bookworm  | V  |
-| Debian 11 bullseye  | V  |
-| Debian 10 buster    | V  |
+| Zabbix              | 6.0 | 7.0 |
+|---------------------|-----|-----|
+| Red Hat Fam 9       |  V  |  V  |
+| Red Hat Fam 8       |  V  |  V  |
+| Red Hat Fam 7       |  V  |  V  |
+| Ubuntu 22.04 jammy  |  V  |  V  |
+| Ubuntu 20.04 focal  |  V  |  V  |
+| Debian 12 bookworm  |  V  |  V  |
+| Debian 11 bullseye  |  V  |  V  |
+| Debian 10 buster    |  V  |  V  |
 
 
 # Getting started

diff --git a/docs/ZABBIX_JAVAGATEWAY_ROLE.md b/docs/ZABBIX_JAVAGATEWAY_ROLE.md
@@ -34,16 +34,16 @@ So, you'll need one of those operating systems.. :-)
 
 See the following list of supported Operating systems with the Zabbix releases.
 
-| Zabbix              |6.0 |
-|---------------------|-----|
-| Red Hat Fam 9       | V  |
-| Red Hat Fam 8       | V  |
-| Red Hat Fam 7       | V  |
-| Ubuntu 22.04 jammy  | V  |
-| Ubuntu 20.04 focal  | V  |
-| Debian 12 bookworm  | V  |
-| Debian 11 bullseye  | V  |
-| Debian 10 buster    | V  |
+| Zabbix              | 6.0 | 7.0 |
+|---------------------|-----|-----|
+| Red Hat Fam 9       |  V  |  V  |
+| Red Hat Fam 8       |  V  |  V  |
+| Red Hat Fam 7       |  V  |     |
+| Ubuntu 22.04 jammy  |  V  |  V  |
+| Ubuntu 20.04 focal  |  V  |  V  |
+| Debian 12 bookworm  |  V  |  V  |
+| Debian 11 bullseye  |  V  |  V  |
+| Debian 10 buster    |  V  |     |
 
 # Role Variables
 

diff --git a/docs/ZABBIX_PROXY_ROLE.md b/docs/ZABBIX_PROXY_ROLE.md
@@ -77,16 +77,16 @@ ansible-galaxy collection install community.postgresql
 
 See the following list of supported Operating systems with the Zabbix releases.
 
-| Zabbix              |6.0 |
-|---------------------|-----|
-| Red Hat Fam 9       |  V  |
-| Red Hat Fam 8       |  V  |
-| Red Hat Fam 7       |  V  |
-| Ubuntu 22.04 jammy  |  V  |
-| Ubuntu 20.04 focal  |  V  |
-| Debian 12 bookworm  |  V  |
-| Debian 11 bullseye  |  V  |
-| Debian 10 buster    |  V  |
+| Zabbix              | 6.0 | 7.0 |
+|---------------------|-----|-----|
+| Red Hat Fam 9       |  V  |  V  |
+| Red Hat Fam 8       |  V  |  V  |
+| Red Hat Fam 7       |  V  |     |
+| Ubuntu 22.04 jammy  |  V  |  V  |
+| Ubuntu 20.04 focal  |  V  |  V  |
+| Debian 12 bookworm  |  V  |  V  |
+| Debian 11 bullseye  |  V  |  V  |
+| Debian 10 buster    |  V  |     |
 
 # Role Variables
 
@@ -332,8 +332,12 @@ The following table lists all variables that are exposed to modify the configura
 | LogRemoteCommands | zabbix_proxy_logremotecommands || |
 | LogSlowQueries | zabbix_proxy_logslowqueries || |
 | LogType | zabbix_proxy_logtype | file| |
+| MaxConcurrentChecksPerPoller | zabbix_proxy_maxconcurrentchecksperpoller || |
 | PidFile | zabbix_proxy_pidfile | /var/run/zabbix/zabbix_proxy.pid| |
+| ProxyBufferMode | zabbix_proxy_proxybuffermode || |
 | ProxyLocalBuffer | zabbix_proxy_proxylocalbuffer |0| |
+| ProxyMemoryBufferAge | zabbix_proxy_proxymemorybufferage || |
+| ProxyMemoryBufferSize | zabbix_proxy_proxymemorybuffersize || |
 | ProxyMode | zabbix_proxy_proxymode || |
 | ProxyOfflineBuffer | zabbix_proxy_proxyofflinebuffer |1| |
 | Server | zabbix_proxy_server | 192.168.1.1| |
@@ -342,10 +346,12 @@ The following table lists all variables that are exposed to modify the configura
 | SourceIP | zabbix_proxy_sourceip || |
 | SSHKeyLocation | zabbix_proxy_sshkeylocation || |
 | SSLCALocation | zabbix_proxy_sslcalocation || |
+| StartAgentPollers | zabbix_proxy_startagentpollers || |
 | SSLCertLocation | zabbix_proxy_sslcertlocation || |
 | SSLKeyLocation | zabbix_proxy_sslkeylocation || |
 | StartDBSyncers | zabbix_proxy_startdbsyncers |4| |
 | StartDiscoverers | zabbix_proxy_startdiscoverers |1| |
+| StartHTTPAgentPollers | zabbix_proxy_starthttpagentpollers || |
 | StartHTTPPollers | zabbix_proxy_starthttppollers |1| |
 | StartIPMIPollers | zabbix_proxy_startipmipollers |0| |
 | StartJavaPollers | zabbix_proxy_startjavapollers || |
@@ -354,6 +360,7 @@ The following table lists all variables that are exposed to modify the configura
 | StartPollers | zabbix_proxy_startpollers |5| |
 | StartPollersUnreachable | zabbix_proxy_startpollersunreachable |1| |
 | StartPreprocessors | zabbix_proxy_startpreprocessors |3| |
+| StartSNMPPollers | zabbix_proxy_startsnmppollers || |
 | StartSNMPTrapper | zabbix_proxy_startsnmptrapper || |
 | StartTrappers | zabbix_proxy_starttrappers |5| |
 | StartVMwareCollectors | zabbix_proxy_startvmwarecollectors || |

diff --git a/docs/ZABBIX_SERVER_ROLE.md b/docs/ZABBIX_SERVER_ROLE.md
@@ -75,15 +75,15 @@ ansible-galaxy collection install community.postgresql
 
 See the following list of supported Operating systems with the Zabbix releases:
 
-| Zabbix              | 6.0 |
-|---------------------|-----|
-| Red Hat Fam 9       |  V  |
-| Red Hat Fam 8       |  V  |
-| Ubuntu 22.04 jammy  |  V  |
-| Ubuntu 20.04 focal  |  V  |
-| Debian 12 bookworm  |  V  |
-| Debian 11 bullseye  |  V  |
-| Debian 10 buster    |  V  |
+| Zabbix              | 6.0 | 7.0 |
+|---------------------|-----|-----|
+| Red Hat Fam 9       |  V  |  V  |
+| Red Hat Fam 8       |  V  |  V  |
+| Ubuntu 22.04 jammy  |  V  |  V  |
+| Ubuntu 20.04 focal  |  V  |  V  |
+| Debian 12 bookworm  |  V  |  V  |
+| Debian 11 bullseye  |  V  |  V  |
+| Debian 10 buster    |  V  |     |
 
 # Installation
 
@@ -337,14 +337,17 @@ The following table lists all variables that are exposed to modify the configura
 |SSHKeyLocation | zabbix_server_sshkeylocation | |  |
 |SSLCALocation | zabbix_server_sslcalocation | |  |
 |SSLCertLocation | zabbix_server_sslcertlocation | ${datadir}/zabbix/ssl/certs |  |
+|StartAgentPollers | zabbix_server_startagentpollers | | |
 |SSLKeyLocation | zabbix_server_sslkeylocation | ${datadir}/zabbix/ssl/keys |  |
 |StartAlerters | zabbix_server_startalerters | |  |
 |StartConnectors | zabbix_server_connectors | | Version 6.4 or later |
 |StartDBSyncers | zabbix_server_startdbsyncers | 4 |  |
 |StartDiscoverers | zabbix_server_startdiscoverers | 1 |  |
 |StartEscalators | zabbix_server_startescalators | 1 |  |
 |StartHistoryPollers | zabbix_server_starthistorypollers | |  |
+|StartHTTPAgentPollers | zabbix_server_starthttpagentpollers | | |
 |StartHTTPPollers | zabbix_server_starthttppollers | 1 |  |
+|StartHTTPAgentPollers | zabbix_server_starthttpagentpollers | | |
 |StartIPMIPollers | zabbix_server_startipmipollers | 0 |  |
 |StartJavaPollers | zabbix_server_startjavapollers | 0 |  |
 |StartLLDProcessors | zabbix_server_startlldprocessors | |  |
@@ -355,6 +358,7 @@ The following table lists all variables that are exposed to modify the configura
 |StartPreprocessors | zabbix_server_startpreprocessors | |  |
 |StartProxyPollers | zabbix_server_startproxypollers | |  |
 |StartReportWriters | zabbix_server_startreportwriters | 0 |  |
+|StartSNMMPAgentPollers | zabbix_server_startsnmpagentpollers | | |
 |StartSNMPTrapper | zabbix_server_startsnmptrapper | 0 |  |
 |StartTimers | zabbix_server_starttimers | 1 |  |
 |StartTrappers | zabbix_server_starttrappers | 5 |  |

diff --git a/docs/ZABBIX_WEB_ROLE.md b/docs/ZABBIX_WEB_ROLE.md
@@ -54,15 +54,15 @@ ansible-galaxy collection install community.general
 
 See the following list of supported Operating Systems with the Zabbix releases.
 
-| Zabbix              | 6.0 |
-|---------------------|-----|
-| Red Hat Fam 9       |  V  |
-| Red Hat Fam 8       |  V  |
-| Ubuntu 22.04 jammy  |  V  |
-| Ubuntu 20.04 focal  |  V  |
-| Debian 12 bookworm  |  V  |
-| Debian 11 bullseye  |  V  |
-| Debian 10 buster    |  V  |
+| Zabbix              | 6.0 | 7.0 |
+|---------------------|-----|-----|
+| Red Hat Fam 9       |  V  |  V  |
+| Red Hat Fam 8       |  V  |  V  |
+| Ubuntu 22.04 jammy  |  V  |  V  |
+| Ubuntu 20.04 focal  |  V  |  V  |
+| Debian 12 bookworm  |  V  |  V  |
+| Debian 11 bullseye  |  V  |  V  |
+| Debian 10 buster    |  V  |    |
 
 # Installation
 

diff --git a/molecule/zabbix_agent_tests/common/molecule.yml b/molecule/zabbix_agent_tests/common/molecule.yml
@@ -14,7 +14,7 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
     groups:
       - agent
-      - ${MY_MOLECULE_VERSION:-v64}
+      - ${MY_MOLECULE_VERSION:-v65}
 
 provisioner:
   name: ansible
@@ -37,6 +37,8 @@ provisioner:
         zabbix_agent_tlsaccept: psk
       v60:
         zabbix_agent_version: 6.0
+      v65:
+        zabbix_agent_version: 6.5
 scenario:
   test_sequence:
     - dependency

diff --git a/molecule/zabbix_javagateway/molecule.yml b/molecule/zabbix_javagateway/molecule.yml
@@ -13,7 +13,7 @@ platforms:
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
     groups:
-      - ${MY_MOLECULE_VERSION:-v64}
+      - ${MY_MOLECULE_VERSION:-v65}
       - ${MY_MOLECULE_INTERPRETER:-python3}
 provisioner:
   name: ansible
@@ -28,6 +28,8 @@ provisioner:
         ansible_python_interpreter: /usr/bin/python
       v60:
         zabbix_javagateway_version: 6.0
+      v65:
+        zabbix_javagateway_version: 6.5
 
 verifier:
   name: testinfra
diff --git a/molecule/zabbix_proxy/molecule.yml b/molecule/zabbix_proxy/molecule.yml
@@ -13,7 +13,7 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
     groups:
       - ${MY_MOLECULE_DATABASE:-mysql}
-      - ${MY_MOLECULE_VERSION:-v64}
+      - ${MY_MOLECULE_VERSION:-v65}
 
 provisioner:
   name: ansible
@@ -28,6 +28,8 @@ provisioner:
         ansible_python_interpreter: /usr/bin/python
       v60:
         zabbix_proxy_version: 6.0
+      v65:
+        zabbix_proxy_version: 6.5
       mysql:
         zabbix_proxy_dbname: zabbix
         zabbix_proxy_dbuser: zabbix-dbuser

diff --git a/molecule/zabbix_proxy/tests/test_default.py b/molecule/zabbix_proxy/tests/test_default.py
@@ -23,7 +23,10 @@ def test_zabbix_package(host):
     database = ansible_data['zabbix_proxy_database']
 
     zabbix_proxy = host.package(f'zabbix-proxy-%s' % database)
-    assert str(version) in zabbix_proxy.version
+    try:
+        assert str(version) in zabbix_proxy.version
+    except:
+        assert "7.0" in zabbix_proxy.version
 
 
 def test_zabbix_proxy_dot_conf(host):

diff --git a/molecule/zabbix_server/molecule.yml b/molecule/zabbix_server/molecule.yml
@@ -13,7 +13,7 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
     groups:
       - ${MY_MOLECULE_DATABASE:-mysql}
-      - ${MY_MOLECULE_VERSION:-v64}
+      - ${MY_MOLECULE_VERSION:-v65}
       - ${MY_MOLECULE_INTERPRETER:-python3}
 
 provisioner:
@@ -29,6 +29,8 @@ provisioner:
         ansible_python_interpreter: /usr/bin/python
       v60:
         zabbix_server_version: 6.0
+      v65:
+        zabbix_server_version: 6.5
       mysql:
         zabbix_server_dbname: zabbix
         zabbix_server_dbuser: zabbix-dbuser

diff --git a/molecule/zabbix_server/tests/test_default.py b/molecule/zabbix_server/tests/test_default.py
@@ -25,7 +25,10 @@ def test_zabbix_package(host):
     database = ansible_data['zabbix_server_database']
 
     zabbix_server = host.package(f'zabbix-server-%s' % database)
-    assert str(version) in zabbix_server.version
+    try:
+        assert str(version) in zabbix_server.version
+    except:  # Allows for testing of the 7.0 beta
+        assert "7.0" in zabbix_server.version
 
 
 def test_zabbix_server_dot_conf(host):
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,6 +30,7 @@ jobs: @@
               - debian10
             version:
                 - v60
+                - v65
             scenario_name:
               - default
               - autopsk
@@ Expand Down @@