Add Zabbix 7.0 Updates to Roles (#1275)

ansible-collections · Jun 7, 2024 · 87ae404 · 87ae404
1 parent 773cfa3
commit 87ae404
Show file tree

Hide file tree

Showing 30 changed files with 197 additions and 35 deletions.
diff --git a/.github/workflows/agent.yml b/.github/workflows/agent.yml
@@ -7,12 +7,18 @@ on:
       - "molecule/zabbix_agent/**"
       - "molecule/requirements.txt"
       - ".github/workflows/agent.yml"
+      - "roles/zabbix_repo/**"
+      - "molecule/zabbix_repo/**"
+      - ".github/workflows/repo.yml"
   pull_request:
     paths:
       - "roles/zabbix_agent/**"
       - "molecule/zabbix_agent/**"
       - "molecule/requirements.txt"
       - ".github/workflows/agent.yml"
+      - "roles/zabbix_repo/**"
+      - "molecule/zabbix_repo/**"
+      - ".github/workflows/repo.yml"
 jobs:
   molecule:
     runs-on: ubuntu-20.04
@@ -28,6 +34,7 @@ jobs:
           - debian12
           - debian11
         version:
+          - v70
           - v64
           - v60
         scenario_name:

diff --git a/.github/workflows/javagateway.yml b/.github/workflows/javagateway.yml
@@ -7,12 +7,18 @@ on:
       - "molecule/zabbix_javagateway/**"
       - "molecule/requirements.txt"
       - ".github/workflows/javagateway.yml"
+      - "roles/zabbix_repo/**"
+      - "molecule/zabbix_repo/**"
+      - ".github/workflows/repo.yml"
   pull_request:
     paths:
       - "roles/zabbix_javagateway/**"
       - "molecule/zabbix_javagateway/**"
       - "molecule/requirements.txt"
       - ".github/workflows/javagateway.yml"
+      - "roles/zabbix_repo/**"
+      - "molecule/zabbix_repo/**"
+      - ".github/workflows/repo.yml"
 jobs:
   molecule:
     runs-on: ubuntu-20.04
@@ -28,6 +34,7 @@ jobs:
           - debian12
           - debian11
         version:
+          - v70
           - v64
           - v60
         collection_role:

diff --git a/.github/workflows/proxy.yml b/.github/workflows/proxy.yml
@@ -7,12 +7,18 @@ on:
       - "molecule/zabbix_proxy/**"
       - "molecule/requirements.txt"
       - ".github/workflows/proxy.yml"
+      - "roles/zabbix_repo/**"
+      - "molecule/zabbix_repo/**"
+      - ".github/workflows/repo.yml"
   pull_request:
     paths:
       - "roles/zabbix_proxy/**"
       - "molecule/zabbix_proxy/**"
       - "molecule/requirements.txt"
       - ".github/workflows/proxy.yml"
+      - "roles/zabbix_repo/**"
+      - "molecule/zabbix_repo/**"
+      - ".github/workflows/repo.yml"
 jobs:
   molecule:
     runs-on: ubuntu-20.04
@@ -34,6 +40,7 @@ jobs:
           - pgsql
           - sqlite3
         version:
+          - v70
           - v64
           - v60
 

diff --git a/.github/workflows/repo.yml b/.github/workflows/repo.yml
@@ -30,6 +30,7 @@ jobs:
         collection_role:
           - zabbix_repo
         version:
+          - v70
           - v64
           - v60
 

diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml
@@ -7,12 +7,18 @@ on:
       - "molecule/zabbix_server/**"
       - "molecule/requirements.txt"
       - ".github/workflows/server.yml"
+      - "roles/zabbix_repo/**"
+      - "molecule/zabbix_repo/**"
+      - ".github/workflows/repo.yml"
   pull_request:
     paths:
       - "roles/zabbix_server/**"
       - "molecule/zabbix_server/**"
       - "molecule/requirements.txt"
       - ".github/workflows/server.yml"
+      - "roles/zabbix_repo/**"
+      - "molecule/zabbix_repo/**"
+      - ".github/workflows/repo.yml"
 jobs:
   molecule:
     runs-on: ubuntu-20.04
@@ -33,9 +39,14 @@ jobs:
           - mysql
           - pgsql
         version:
+          - v70
           - v64
           - v60
-
+        exclude:
+          - container: ubuntu2004
+            version: v70
+          - container: debian11
+            version: v70
     steps:
       - name: Check out code
         uses: actions/checkout@v4

diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
@@ -7,12 +7,18 @@ on:
       - "molecule/zabbix_web/**"
       - "molecule/requirements.txt"
       - ".github/workflows/web.yml"
+      - "roles/zabbix_repo/**"
+      - "molecule/zabbix_repo/**"
+      - ".github/workflows/repo.yml"
   pull_request:
     paths:
       - "roles/zabbix_web/**"
       - "molecule/zabbix_web/**"
       - "molecule/requirements.txt"
       - ".github/workflows/web.yml"
+      - "roles/zabbix_repo/**"
+      - "molecule/zabbix_repo/**"
+      - ".github/workflows/repo.yml"
 jobs:
   molecule:
     runs-on: ubuntu-20.04
@@ -36,8 +42,14 @@ jobs:
           - nginx
           - apache
         version:
+          - v70
           - v64
           - v60
+        exclude:
+          - container: ubuntu2004
+            version: v70
+          - container: debian11
+            version: v70
     steps:
       - name: Check out code
         uses: actions/checkout@v4

diff --git a/docs/ZABBIX_PROXY_ROLE.md b/docs/ZABBIX_PROXY_ROLE.md
@@ -338,8 +338,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 | | Version 7.0 or Greater |
 | PidFile | zabbix_proxy_pidfile | /var/run/zabbix/zabbix_proxy.pid| |
+| ProxyBufferMode | zabbix_proxy_proxybuffermode | | Version 7.0 or Greater |
 | ProxyLocalBuffer | zabbix_proxy_proxylocalbuffer |0| |
+| ProxyMemoryBufferAge | zabbix_proxy_proxymemorybufferage || Version 7.0 or Greater |
+| ProxyMemoryBufferSize | zabbix_proxy_proxymemorybuffersize || Version 7.0 or Greater |
 | ProxyMode | zabbix_proxy_proxymode || |
 | ProxyOfflineBuffer | zabbix_proxy_proxyofflinebuffer |1| |
 | Server | zabbix_proxy_server | 192.168.1.1| |
@@ -350,8 +354,11 @@ The following table lists all variables that are exposed to modify the configura
 | SSLCALocation | zabbix_proxy_sslcalocation || |
 | SSLCertLocation | zabbix_proxy_sslcertlocation || |
 | SSLKeyLocation | zabbix_proxy_sslkeylocation || |
+| StartAgentPollers | zabbix_proxy_startagentpollers || Version 7.0 or Greater |
+| StartBrowserPollers | zabbix_proxy_startbrowserpollers || Version 7.0 or Greater |
 | StartDBSyncers | zabbix_proxy_startdbsyncers |4| |
 | StartDiscoverers | zabbix_proxy_startdiscoverers |1| |
+| StartHTTPAgentPollers | zabbix_proxy_httpagentpollers | | Version 7.0 or Greater |
 | StartHTTPPollers | zabbix_proxy_starthttppollers |1| |
 | StartIPMIPollers | zabbix_proxy_startipmipollers |0| |
 | StartJavaPollers | zabbix_proxy_startjavapollers || |
@@ -360,6 +367,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 | | Version 7.0 or Greater |
 | StartSNMPTrapper | zabbix_proxy_startsnmptrapper || |
 | StartTrappers | zabbix_proxy_starttrappers |5| |
 | StartVMwareCollectors | zabbix_proxy_startvmwarecollectors || |
@@ -389,14 +397,16 @@ The following table lists all variables that are exposed to modify the configura
 | User | zabbix_proxy_user || |
 | Vault | zabbix_proxy_vault || Version 6.2 or Greater |
 | VaultDBPath | zabbix_proxy_vaultdbpath || |
-| VaultTLSCertFile | zabbix_proxy_vaulttlscertfile || Version 6.2 or Greater |
-| VaultTLSKeyFile | zabbix_proxy_vaulttlskeyfile || Version 6.2 or Greater |
+| VaultPrefix | zabbix_proxy_vaultprefix || Version 7.0 or Greater |
+| VaultTLSCertFile | zabbix_proxy_vaulttlscertfile || Version 6.4 or Greater |
+| VaultTLSKeyFile | zabbix_proxy_vaulttlskeyfile || Version 6.4 or Greater |
 | VaultToken | zabbix_proxy_vaulttoken || |
 | VaultURL | zabbix_proxy_vaulturl |https://127.0.0.1:8200| |
 | VMwareCacheSize | zabbix_proxy_vmwarecachesize | 8M| |
 | VMwareFrequency | zabbix_proxy_vmwarefrequency |60| |
 | VMwarePerfFrequency | zabbix_proxy_vmwareperffrequency | | |
 | VMwareTimeout | zabbix_proxy_vmwaretimeout | | |
+| WebDriverURL | zabbix_proxy_webdriverurl | | Version 7.0 or Greater |
 
 ## Tags
 

diff --git a/docs/ZABBIX_SERVER_ROLE.md b/docs/ZABBIX_SERVER_ROLE.md
@@ -286,6 +286,7 @@ The following table lists all variables that are exposed to modify the configura
 |-----------|------------------|--------|--------|
 |AlertScriptsPath | zabbix_server_alertscriptspath | /usr/lib/zabbix/alertscripts |  |
 |AllowRoot | zabbix_server_allowroot | 0 |  |
+|AllowSoftwareUpdateCheck | zabbix_server_allowsoftwareupdatecheck |  | Version 7.0 or later |
 |AllowUnsupportedDBVersions | zabbix_server_allowunsupporteddbversions |0  |  |
 |CacheSize | zabbix_server_cachesize | |  |
 |CacheUpdateFrequency | zabbix_server_cacheupdatefrequency | |  |
@@ -303,6 +304,7 @@ The following table lists all variables that are exposed to modify the configura
 |DBTLSKeyFile | zabbix_server_dbtlskeyfile | |  |
 |DBUser | zabbix_server_dbuser | zabbix-server |  |
 |DebugLevel | zabbix_server_debuglevel | 3 |  |
+|EnableGlobalScripts | zabbix_server_enableglobalscripts |  | Version 7.0 or later |
 |ExportDir | zabbix_server_exportdir | |  |
 |ExportFileSize | zabbix_server_exportfilesize | 1G |  |
 |ExportType | zabbix_server_exporttype | |  |
@@ -328,6 +330,7 @@ The following table lists all variables that are exposed to modify the configura
 |LogFileSize | zabbix_server_logfilesize | 10 |  |
 |LogSlowQueries | zabbix_server_logslowqueries | 0 |  |
 |LogType | zabbix_server_logtype | file |  |
+|MaxConcurrentChecksPerPoller | zabbix_server_maxconcurrentchecksperpoller |  | Version 7.0 or later |
 |MaxHousekeeperDelete | zabbix_server_maxhousekeeperdelete | 500 |  |
 |NodeAddress | zabbix_server_nodeaddress | |  |
 |PidFile | zabbix_server_pidfile | /var/run/zabbix/zabbix_server.pid |  |
@@ -340,12 +343,15 @@ The following table lists all variables that are exposed to modify the configura
 |SSLCALocation | zabbix_server_sslcalocation | |  |
 |SSLCertLocation | zabbix_server_sslcertlocation | ${datadir}/zabbix/ssl/certs |  |
 |SSLKeyLocation | zabbix_server_sslkeylocation | ${datadir}/zabbix/ssl/keys |  |
+|StartAgentPollers | zabbix_server_startagentpollers | | Version 7.0 or later |
 |StartAlerters | zabbix_server_startalerters | |  |
+|StartBrowserPollers | zabbix_server_startbrowserpollers | | Version 7.0 or later |
 |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 | | Version 7.0 or later |
 |StartHTTPPollers | zabbix_server_starthttppollers | 1 |  |
 |StartIPMIPollers | zabbix_server_startipmipollers | 0 |  |
 |StartJavaPollers | zabbix_server_startjavapollers | 0 |  |
@@ -357,6 +363,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 |  |
+|StartSNMPPollers | zabbix_server_startsnmppollers |  | Version 7.0 or later |
 |StartSNMPTrapper | zabbix_server_startsnmptrapper | 0 |  |
 |StartTimers | zabbix_server_starttimers | 1 |  |
 |StartTrappers | zabbix_server_starttrappers | 5 |  |
@@ -384,14 +391,16 @@ The following table lists all variables that are exposed to modify the configura
 |ValueCacheSize | zabbix_server_valuecachesize | |  |
 |Vault | zabbix_server_vault | | Version 6.2 or later  |
 |VaultDBPath | zabbix_server_vaultdbpath | |  |
-|VaultTLSKeyFile | zabbix_server_vaulttlskeyfile | | Version 6.2 or later |
-|VaultTLSCertFile | zabbix_server_vaulttlscertfile | | Version 6.2 or later |
+|VaultPrefix | zabbix_server_vaultdbprefix | | Version 7.0 or later |
+|VaultTLSKeyFile | zabbix_server_vaulttlskeyfile | | Version 6.4 or later |
+|VaultTLSCertFile | zabbix_server_vaulttlscertfile | | Version 6.4 or later |
 |VaultToken | zabbix_server_vaulttoken | |  |
 |VaultURL | zabbix_server_vaulturl | https://127.0.0.1:8200 |  |
 |VMwareCacheSize | zabbix_server_vmwarecachesize | |  |
 |VMwareFrequency | zabbix_server_vmwarefrequency | 60 |  |
 |VMwarePerfFrequency | zabbix_server_vmwareperffrequency | 60 |  |
 |VMwareTimeout | zabbix_server_vmwaretimeout | 10 |  |
+|WebDriverURL | zabbix_server_webdriverurl | | Version 7.0 or later |
 |WebServiceURL | zabbix_server_webserviceurl | |  |
 
 ## Tags

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:-v70}
 
 provisioner:
   name: ansible
@@ -35,6 +35,8 @@ provisioner:
         zabbix_agent_tlsaccept: psk
         zabbix_repo_apt_priority: 1
         zabbix_repo_yum_gpg_check: 1
+      v70:
+        zabbix_agent_version: 7.0
       v64:
         zabbix_agent_version: 6.4
       v60:

diff --git a/molecule/zabbix_javagateway/molecule.yml b/molecule/zabbix_javagateway/molecule.yml
@@ -3,7 +3,7 @@ driver:
   name: docker
 
 platforms:
-  - name: zabbix-server-${MY_MOLECULE_VERSION:-v64}-${MY_MOLECULE_DATABASE:-mysql}-${MY_MOLECULE_CONTAINER:-rockylinux8}
+  - name: zabbix-server-${MY_MOLECULE_VERSION:-v70}-${MY_MOLECULE_DATABASE:-mysql}-${MY_MOLECULE_CONTAINER:-rockylinux8}
     image: geerlingguy/docker-${MY_MOLECULE_IMAGE:-rockylinux8}-ansible:latest
     privileged: true
     pre_build_image: true
@@ -13,7 +13,7 @@ platforms:
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
     groups:
-      - ${MY_MOLECULE_VERSION:-v64}
+      - ${MY_MOLECULE_VERSION:-v70}
 provisioner:
   name: ansible
   env:
@@ -24,6 +24,8 @@ provisioner:
       all:
         zabbix_repo_apt_priority: 1
         zabbix_repo_yum_gpg_check: 1
+      v70:
+        zabbix_javagateway_version: 7.0
       v64:
         zabbix_javagateway_version: 6.4
       v60:

diff --git a/molecule/zabbix_proxy/molecule.yml b/molecule/zabbix_proxy/molecule.yml
@@ -2,7 +2,7 @@
 driver:
   name: docker
 platforms:
-  - name: zabbix-proxy-${MY_MOLECULE_VERSION:-v64}-${MY_MOLECULE_DATABASE:-mysql}-${MY_MOLECULE_CONTAINER:-rockylinux8}
+  - name: zabbix-proxy-${MY_MOLECULE_VERSION:-v70}-${MY_MOLECULE_DATABASE:-mysql}-${MY_MOLECULE_CONTAINER:-rockylinux8}
     dockerfile: Dockerfile.${MY_MOLECULE_OS_FAMILY:-redhat}.j2
     base_image: ${MY_MOLECULE_IMAGE:-rockylinux/rockylinux:8-ubi-init}
     image: ${MY_MOLECULE_CONTAINER:-rockylinux8}
@@ -14,7 +14,7 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
     groups:
       - ${MY_MOLECULE_DATABASE:-mysql}
-      - ${MY_MOLECULE_VERSION:-v64}
+      - ${MY_MOLECULE_VERSION:-v70}
 
 provisioner:
   name: ansible
@@ -26,6 +26,8 @@ provisioner:
       all:
         zabbix_repo_apt_priority: 1
         zabbix_repo_yum_gpg_check: 1
+      v70:
+        zabbix_proxy_version: 7.0
       v64:
         zabbix_proxy_version: 6.4
       v60:

diff --git a/molecule/zabbix_repo/molecule.yml b/molecule/zabbix_repo/molecule.yml
@@ -2,7 +2,7 @@
 driver:
   name: docker
 platforms:
-  - name: zabbix-repo-${MY_MOLECULE_VERSION:-v64}-${MY_MOLECULE_CONTAINER:-rockylinux8}
+  - name: zabbix-repo-${MY_MOLECULE_VERSION:-v70}-${MY_MOLECULE_CONTAINER:-rockylinux8}
     image: geerlingguy/docker-${MY_MOLECULE_IMAGE:-rockylinux8}-ansible:latest
     privileged: true
     pre_build_image: true
@@ -12,7 +12,7 @@ platforms:
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
     groups:
-      - ${MY_MOLECULE_VERSION:-v64}
+      - ${MY_MOLECULE_VERSION:-v70}
 
 provisioner:
   name: ansible
@@ -24,6 +24,8 @@ provisioner:
       all:
         zabbix_repo_apt_priority: 1
         zabbix_repo_yum_gpg_check: 1
+      v70:
+        zabbix_server_version: 7.0
       v64:
         zabbix_server_version: 6.4
       v60:
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,6 +30,7 @@ jobs: @@
             collection_role:
               - zabbix_repo
             version:
+              - v70
               - v64
               - v60
@@ Expand Down @@