Removed Old Versions of Zabbix

ansible-collections · Oct 22, 2023 · b9cd111 · b9cd111
1 parent 32b3317
commit b9cd111
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 100 deletions.
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.4 | 6.2 | 6.0 |
-|---------------------|-----|-----|-----|
-| Red Hat Fam 9       |  V  |  V  |  V  |
-| Red Hat Fam 8       |  V  |  V  |  V  |
-| Red Hat Fam 7       |  V  |  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  |
-| Debian 10 buster    |  V  |  V  |  V  |
+| 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  |
 
 
 # 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.4 | 6.2 | 6.0 |
-|---------------------|-----|-----|-----|
-| Red Hat Fam 9       |  V  |  V  |  V  |
-| Red Hat Fam 8       |  V  |  V  |  V  |
-| Red Hat Fam 7       |  V  |  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  |
-| Debian 10 buster    |  V  |  V  |  V  |
+| 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  |
 
 # 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.4 | 6.2 | 6.0 |
-|---------------------|-----|-----|-----|
-| Red Hat Fam 9       |  V  |  V  |  V  |
-| Red Hat Fam 8       |  V  |  V  |  V  |
-| Red Hat Fam 7       |  V  |  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  |
-| Debian 10 buster    |  V  |  V  |  V  |
+| 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  |
 
 # Role Variables
 

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 22.04 jammy  |  V  |  V  |  V  |
-| Ubuntu 20.04 focal  |  V  |  V  |  V  |
-| Debian 12 bookworm  |  V  |     |  V  |
-| Debian 11 bullseye  |  V  |  V  |  V  |
-| Debian 10 buster    |     |     |  V  |
+| 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  |
 
 # Installation
 

diff --git a/roles/zabbix_agent/vars/Debian.yml b/roles/zabbix_agent/vars/Debian.yml
@@ -9,38 +9,24 @@ zabbix_agent2_conf: zabbix_agent2.conf
 zabbix_valid_agent_versions:
   # Debian
   "12":
-    - 6.4
-    - 6.2
     - 6.0
 
   "11":
-    - 6.4
-    - 6.2
     - 6.0
 
   "10":
-    - 6.4
-    - 6.2
     - 6.0
 
   "9":
-    - 6.4
-    - 6.2
     - 6.0
   # Ubuntu
   "22":
-    - 6.4
-    - 6.2
     - 6.0
 
   "20":
-    - 6.4
-    - 6.2
     - 6.0
 
   "18":
-    - 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
@@ -8,14 +8,8 @@ zabbix_agent2_conf: zabbix_agent2.conf
 
 zabbix_valid_agent_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_agent/vars/Windows.yml b/roles/zabbix_agent/vars/Windows.yml
@@ -2,6 +2,4 @@
 # vars file for zabbix_agent (Windows)
 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
@@ -1,28 +1,17 @@
 zabbix_valid_javagateway_versions:
   # Debian
   "12":
-    - 6.4
     - 6.0
   "11":
-    - 6.4
-    - 6.2
     - 6.0
   "10":
-    - 6.4
-    - 6.2
     - 6.0
   # Ubuntu
   "22":
-    - 6.4
-    - 6.2
     - 6.0
   "20":
-    - 6.4
-    - 6.2
     - 6.0
   "18":
-    - 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
@@ -1,14 +1,8 @@
 ---
 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_server/vars/Debian.yml b/roles/zabbix_server/vars/Debian.yml
@@ -8,24 +8,15 @@ mysql_create_dir: ""
 zabbix_valid_server_versions:
   # Debian
   "12":
-    - 6.4
     - 6.0
   "11":
-    - 6.4
-    - 6.2
     - 6.0
   "10":
     - 6.0
   # Ubuntu
   "22":
-    - 6.4
-    - 6.2
     - 6.0
   "20":
-    - 6.4
-    - 6.2
-    - 6.0
-  "18":
     - 6.0
 
 debian_keyring_path: /etc/apt/keyrings/

diff --git a/roles/zabbix_server/vars/RedHat.yml b/roles/zabbix_server/vars/RedHat.yml
@@ -10,12 +10,8 @@ __epel_repo:
 
 zabbix_valid_server_versions:
   "9":
-    - 6.4
-    - 6.2
     - 6.0
   "8":
-    - 6.4
-    - 6.2
     - 6.0
 
 pgsql_depenencies:

diff --git a/roles/zabbix_web/vars/Debian.yml b/roles/zabbix_web/vars/Debian.yml
@@ -26,24 +26,15 @@ _nginx_tls_dhparam: /etc/ssl/private/dhparams.pem
 zabbix_valid_web_versions:
   # Debian
   "12":
-    - 6.4
     - 6.0
   "11":
-    - 6.4
-    - 6.2
     - 6.0
   "10":
     - 6.0
   # Ubuntu
   "22":
-    - 6.4
-    - 6.2
     - 6.0
   "20":
-    - 6.4
-    - 6.2
-    - 6.0
-  "18":
     - 6.0
 
 debian_keyring_path: /etc/apt/keyrings/
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,14 +8,8 @@ zabbix_agent2_conf: zabbix_agent2.conf @@
     zabbix_valid_agent_versions:
       "9":
-        - 6.4
-        - 6.2
         - 6.0
       "8":
-        - 6.4
-        - 6.2
         - 6.0
       "7":
-        - 6.4
-        - 6.2
         - 6.0