Removed support for Zabbix 6.2

ansible-collections · Jun 5, 2024 · 8a76e70 · 8a76e70
1 parent c919e2e
commit 8a76e70
Show file tree

Hide file tree

Showing 36 changed files with 64 additions and 283 deletions.
diff --git a/.github/workflows/agent.yml b/.github/workflows/agent.yml
@@ -29,18 +29,12 @@ jobs:
           - debian11
         version:
           - v64
-          - v62
           - v60
         scenario_name:
           - default
           - autopsk
           - agent2
           - agent2autopsk
-        exclude:
-          - container: debian12
-            version: v62
-          - container: ubuntu2404
-            version: v62
 
     steps:
       - name: Check out code

diff --git a/.github/workflows/javagateway.yml b/.github/workflows/javagateway.yml
@@ -29,13 +29,7 @@ jobs:
           - debian11
         version:
           - v64
-          - v62
           - v60
-        exclude:
-          - container: debian12
-            version: v62
-          - container: ubuntu2404
-            version: v62
         collection_role:
           - zabbix_javagateway
     steps:

diff --git a/.github/workflows/plugins-integration.yml b/.github/workflows/plugins-integration.yml
@@ -21,7 +21,6 @@ jobs:
       matrix:
         zabbix_container:
           - version: "6.0"
-          - version: "6.2"
           - version: "6.4"
         ansible:
           # https://docs.ansible.com/ansible/latest/reference_appendices/release_and_maintenance.html#ansible-core-changelogs

diff --git a/.github/workflows/proxy.yml b/.github/workflows/proxy.yml
@@ -35,16 +35,8 @@ jobs:
           - sqlite3
         version:
           - v64
-          - v62
           - v60
-        exclude:
-          - container:
-              name: debian12
-              base_image: debian:12
-              os_family: debian
-            version: v62
-          - container: ubuntu2404
-            version: v62
+
     steps:
       - name: Check out code
         uses: actions/checkout@v4

diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml
@@ -34,13 +34,8 @@ jobs:
           - pgsql
         version:
           - v64
-          - v62
           - v60
-        exclude:
-          - container: debian12
-            version: v62
-          - container: ubuntu2404
-            version: v62
+
     steps:
       - name: Check out code
         uses: actions/checkout@v4

diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
@@ -37,13 +37,7 @@ jobs:
           - apache
         version:
           - v64
-          - v62
           - v60
-        exclude:
-          - container: ubuntu2404
-            version: v62
-          - container: debian12
-            version: v62
     steps:
       - name: Check out code
         uses: actions/checkout@v4

diff --git a/changelogs/fragments/1250.yml b/changelogs/fragments/1250.yml
@@ -0,0 +1,2 @@
+breaking_changes:
+  - Removed support for Zabbix 6.2
diff --git a/docs/ZABBIX_AGENT_ROLE.md b/docs/ZABBIX_AGENT_ROLE.md
@@ -89,15 +89,15 @@ 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.4 | 6.2 | 6.0 |
-|---------------------|-----|-----|-----|
-| Red Hat Fam 9       |  V  |  V  |  V  |
-| Red Hat Fam 8       |  V  |  V  |  V  |
-| Ubuntu 24.04 noble  |  V  |     |  V  |
-| Ubuntu 22.04 jammy  |  V  |  V  |  V  |
-| Ubuntu 20.04 focal  |  V  |  V  |  V  |
-| Debian 12 bookworm  |  V  |  V  |  V  |
-| Debian 11 bullseye  |  V  |  V  |  V  |
+| Zabbix              | 6.4 | 6.0 |
+|---------------------|-----|-----|
+| Red Hat Fam 9       |  V  |  V  |
+| Red Hat Fam 8       |  V  |  V  |
+| Ubuntu 24.04 noble  |  V  |  V  |
+| Ubuntu 22.04 jammy  |  V  |  V  |
+| Ubuntu 20.04 focal  |  V  |  V  |
+| Debian 12 bookworm  |  V  |  V  |
+| Debian 11 bullseye  |  V  |  V  |
 
 You can bypass this matrix by setting `enable_version_check: false`
 
@@ -109,7 +109,7 @@ The following is an overview of all available configuration default for this rol
 
 ### Overall Zabbix
 
-* `zabbix_agent_version`: This is the version of zabbix. Default: The highest supported version for the operating system. Can be overridden to 6.4, 6.2, or 6.0
+* `zabbix_agent_version`: This is the version of zabbix. Default: The highest supported version for the operating system. Can be overridden to 6.4 or 6.0
 * `zabbix_agent_version_minor`: When you want to specify a minor version to be installed. Is also used for `zabbix_sender` and `zabbix_get`. RedHat only. Default set to: `*` (latest available)
 * `zabbix_repo_yum`: A list with Yum repository configuration.
 * `zabbix_repo_yum_gpgcheck`: If Yum should check GPG keys on installation

diff --git a/docs/ZABBIX_JAVAGATEWAY_ROLE.md b/docs/ZABBIX_JAVAGATEWAY_ROLE.md
@@ -34,15 +34,15 @@ So, you'll need one of those operating systems.. :-)
 
 See the following list of supported Operating systems with the Zabbix releases.
 
-| Zabbix              | 6.4 | 6.2 | 6.0 |
-|---------------------|-----|-----|-----|
-| Red Hat Fam 9       |  V  |  V  |  V  |
-| Red Hat Fam 8       |  V  |  V  |  V  |
-| Ubuntu 24.04 noble  |  V  |     |  V  |
-| Ubuntu 22.04 jammy  |  V  |  V  |  V  |
-| Ubuntu 20.04 focal  |  V  |  V  |  V  |
-| Debian 12 bookworm  |  V  |     |  V  |
-| Debian 11 bullseye  |  V  |  V  |  V  |
+| Zabbix              | 6.4 | 6.0 |
+|---------------------|-----|-----|
+| Red Hat Fam 9       |  V  |  V  |
+| Red Hat Fam 8       |  V  |  V  |
+| Ubuntu 24.04 noble  |  V  |  V  |
+| Ubuntu 22.04 jammy  |  V  |  V  |
+| Ubuntu 20.04 focal  |  V  |  V  |
+| Debian 12 bookworm  |  V  |  V  |
+| Debian 11 bullseye  |  V  |  V  |
 
 You can bypass this matrix by setting `enable_version_check: false`
 

diff --git a/docs/ZABBIX_PROXY_ROLE.md b/docs/ZABBIX_PROXY_ROLE.md
@@ -77,15 +77,15 @@ ansible-galaxy collection install community.postgresql
 
 See the following list of supported Operating systems with the Zabbix releases.
 
-| Zabbix              | 6.4 | 6.2 | 6.0 |
-|---------------------|-----|-----|-----|
-| Red Hat Fam 9       |  V  |  V  |  V  |
-| Red Hat Fam 8       |  V  |  V  |  V  |
-| Ubuntu 24.04 noble  |  V  |     |  V  |
-| Ubuntu 22.04 jammy  |  V  |  V  |  V  |
-| Ubuntu 20.04 focal  |  V  |  V  |  V  |
-| Debian 12 bookworm  |  V  |     |  V  |
-| Debian 11 bullseye  |  V  |  V  |  V  |
+| Zabbix              | 6.4 | 6.0 |
+|---------------------|-----|-----|
+| Red Hat Fam 9       |  V  |  V  |
+| Red Hat Fam 8       |  V  |  V  |
+| Ubuntu 24.04 noble  |  V  |  V  |
+| Ubuntu 22.04 jammy  |  V  |  V  |
+| Ubuntu 20.04 focal  |  V  |  V  |
+| Debian 12 bookworm  |  V  |  V  |
+| Debian 11 bullseye  |  V  |  V  |
 
 You can bypass this matrix by setting `enable_version_check: false`
 

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.4 | 6.2 | 6.0 |
-|---------------------|-----|-----|-----|
-| Red Hat Fam 9       |  V  |  V  |  V  |
-| Red Hat Fam 8       |  V  |  V  |  V  |
-| Ubuntu 24.04 noble  |  V  |     |  V  |
-| Ubuntu 22.04 jammy  |  V  |  V  |  V  |
-| Ubuntu 20.04 focal  |  V  |  V  |  V  |
-| Debian 12 bookworm  |  V  |     |  V  |
-| Debian 11 bullseye  |  V  |  V  |  V  |
+| Zabbix              | 6.4 | 6.0 |
+|---------------------|-----|-----|
+| Red Hat Fam 9       |  V  |  V  |
+| Red Hat Fam 8       |  V  |  V  |
+| Ubuntu 24.04 noble  |  V  |  V  |
+| Ubuntu 22.04 jammy  |  V  |  V  |
+| Ubuntu 20.04 focal  |  V  |  V  |
+| Debian 12 bookworm  |  V  |  V  |
+| Debian 11 bullseye  |  V  |  V  |
 
 You can bypass this matrix by setting `enable_version_check: false`
 

diff --git a/docs/ZABBIX_WEB_ROLE.md b/docs/ZABBIX_WEB_ROLE.md
@@ -55,15 +55,15 @@ ansible-galaxy collection install community.general
 
 See the following list of supported Operating Systems with the Zabbix releases.
 
-| Zabbix              | 6.4 | 6.2 | 6.0 |
-|---------------------|-----|-----|-----|
-| Red Hat Fam 9       |  V  |  V  |  V  |
-| Red Hat Fam 8       |  V  |  V  |  V  |
-| Ubuntu 24.04 noble  |  V  |     |  V  |
-| Ubuntu 22.04 jammy  |  V  |  V  |  V  |
-| Ubuntu 20.04 focal  |  V  |  V  |  V  |
-| Debian 12 bookworm  |  V  |     |  V  |
-| Debian 11 bullseye  |  V  |  V  |  V  |
+| Zabbix              | 6.4 | 6.0 |
+|---------------------|-----|-----|
+| Red Hat Fam 9       |  V  |  V  |
+| Red Hat Fam 8       |  V  |  V  |
+| Ubuntu 24.04 noble  |  V  |  V  |
+| Ubuntu 22.04 jammy  |  V  |  V  |
+| Ubuntu 20.04 focal  |  V  |  V  |
+| Debian 12 bookworm  |  V  |  V  |
+| Debian 11 bullseye  |  V  |  V  |
 
 You can bypass this matrix by setting `enable_version_check: false`
 

diff --git a/molecule/zabbix_agent_tests/common/molecule.yml b/molecule/zabbix_agent_tests/common/molecule.yml
@@ -35,8 +35,6 @@ provisioner:
         zabbix_agent_tlsaccept: psk
       v64:
         zabbix_agent_version: 6.4
-      v62:
-        zabbix_agent_version: 6.2
       v60:
         zabbix_agent_version: 6.0
 scenario:

diff --git a/molecule/zabbix_javagateway/molecule.yml b/molecule/zabbix_javagateway/molecule.yml
@@ -23,8 +23,6 @@ provisioner:
     group_vars:
       v64:
         zabbix_javagateway_version: 6.4
-      v62:
-        zabbix_javagateway_version: 6.2
       v60:
         zabbix_javagateway_version: 6.0
 

diff --git a/molecule/zabbix_proxy/molecule.yml b/molecule/zabbix_proxy/molecule.yml
@@ -25,8 +25,6 @@ provisioner:
     group_vars:
       v64:
         zabbix_proxy_version: 6.4
-      v62:
-        zabbix_proxy_version: 6.2
       v60:
         zabbix_proxy_version: 6.0
       mysql:

diff --git a/molecule/zabbix_server/molecule.yml b/molecule/zabbix_server/molecule.yml
@@ -24,8 +24,6 @@ provisioner:
     group_vars:
       v64:
         zabbix_server_version: 6.4
-      v62:
-        zabbix_server_version: 6.2
       v60:
         zabbix_server_version: 6.0
       mysql:

diff --git a/molecule/zabbix_web/molecule.yml b/molecule/zabbix_web/molecule.yml
@@ -36,9 +36,6 @@ provisioner:
       v64:
         zabbix_server_version: 6.4
         zabbix_web_version: 6.4
-      v62:
-        zabbix_server_version: 6.2
-        zabbix_web_version: 6.2
       v60:
         zabbix_server_version: 6.0
         zabbix_web_version: 6.0

diff --git a/roles/zabbix_agent/vars/Debian.yml b/roles/zabbix_agent/vars/Debian.yml
@@ -7,17 +7,14 @@ zabbix_valid_agent_versions:
   # Debian
   "12":
     - 6.4
-    - 6.2
     - 6.0
 
   "11":
     - 6.4
-    - 6.2
     - 6.0
 
   "9":
     - 6.4
-    - 6.2
     - 6.0
   # Ubuntu
   "24":
@@ -26,12 +23,10 @@ zabbix_valid_agent_versions:
 
   "22":
     - 6.4
-    - 6.2
     - 6.0
 
   "20":
     - 6.4
-    - 6.2
     - 6.0
 
 debian_keyring_path: /etc/apt/keyrings/

diff --git a/roles/zabbix_agent/vars/RedHat.yml b/roles/zabbix_agent/vars/RedHat.yml
@@ -6,9 +6,7 @@ zabbix_agent: zabbix-agent
 zabbix_valid_agent_versions:
   "9":
     - 6.4
-    - 6.2
     - 6.0
   "8":
     - 6.4
-    - 6.2
     - 6.0
diff --git a/roles/zabbix_agent/vars/Windows.yml b/roles/zabbix_agent/vars/Windows.yml
@@ -3,5 +3,4 @@
 zabbix_valid_agent_versions:
   "10":
     - 6.4
-    - 6.2
     - 6.0
diff --git a/roles/zabbix_javagateway/vars/Debian.yml b/roles/zabbix_javagateway/vars/Debian.yml
@@ -5,7 +5,6 @@ zabbix_valid_javagateway_versions:
     - 6.0
   "11":
     - 6.4
-    - 6.2
     - 6.0
 
   # Ubuntu
@@ -14,11 +13,9 @@ zabbix_valid_javagateway_versions:
     - 6.0
   "22":
     - 6.4
-    - 6.2
     - 6.0
   "20":
     - 6.4
-    - 6.2
     - 6.0
 
 debian_keyring_path: /etc/apt/keyrings/

diff --git a/roles/zabbix_javagateway/vars/RedHat.yml b/roles/zabbix_javagateway/vars/RedHat.yml
@@ -2,13 +2,10 @@
 zabbix_valid_javagateway_versions:
   "9":
     - 6.4
-    - 6.2
     - 6.0
   "8":
     - 6.4
-    - 6.2
     - 6.0
   "7":
     - 6.4
-    - 6.2
     - 6.0
diff --git a/roles/zabbix_proxy/vars/Debian.yml b/roles/zabbix_proxy/vars/Debian.yml
@@ -5,18 +5,15 @@ zabbix_valid_proxy_versions:
     - 6.0
   "11":
     - 6.4
-    - 6.2
     - 6.0
   "24":
     - 6.4
     - 6.0
   "22":
     - 6.4
-    - 6.2
     - 6.0
   "20":
     - 6.4
-    - 6.2
     - 6.0
 
 _zabbix_proxy_pgsql_dependencies:

diff --git a/roles/zabbix_proxy/vars/RedHat.yml b/roles/zabbix_proxy/vars/RedHat.yml
@@ -1,11 +1,9 @@
 zabbix_valid_proxy_versions:
   "9":
     - 6.4
-    - 6.2
     - 6.0
   "8":
     - 6.4
-    - 6.2
     - 6.0
 
 _zabbix_proxy_pgsql_dependencies:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		breaking_changes:
		- Removed support for Zabbix 6.2
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,17 +7,14 @@ zabbix_valid_agent_versions: @@
       # Debian
       "12":
         - 6.4
-        - 6.2
         - 6.0
       "11":
         - 6.4
-        - 6.2
         - 6.0
       "9":
         - 6.4
-        - 6.2
         - 6.0
       # Ubuntu
       "24":
@@ Expand All / @@ -26,12 +23,10 @@ zabbix_valid_agent_versions: @@
       "22":
         - 6.4
-        - 6.2
         - 6.0
       "20":
         - 6.4
-        - 6.2
         - 6.0
     debian_keyring_path: /etc/apt/keyrings/
@@ Expand Down @@