From b9cd111e156edb690c04fbc8061f274918dcae1f Mon Sep 17 00:00:00 2001 From: Troy W Date: Sun, 22 Oct 2023 11:39:11 -0400 Subject: [PATCH] Removed Old Versions of Zabbix --- docs/ZABBIX_AGENT_ROLE.md | 20 ++++++++++---------- docs/ZABBIX_JAVAGATEWAY_ROLE.md | 20 ++++++++++---------- docs/ZABBIX_PROXY_ROLE.md | 20 ++++++++++---------- docs/ZABBIX_SERVER_ROLE.md | 18 +++++++++--------- roles/zabbix_agent/vars/Debian.yml | 14 -------------- roles/zabbix_agent/vars/RedHat.yml | 6 ------ roles/zabbix_agent/vars/Windows.yml | 2 -- roles/zabbix_javagateway/vars/Debian.yml | 11 ----------- roles/zabbix_javagateway/vars/RedHat.yml | 6 ------ roles/zabbix_server/vars/Debian.yml | 9 --------- roles/zabbix_server/vars/RedHat.yml | 4 ---- roles/zabbix_web/vars/Debian.yml | 9 --------- 12 files changed, 39 insertions(+), 100 deletions(-) diff --git a/docs/ZABBIX_AGENT_ROLE.md b/docs/ZABBIX_AGENT_ROLE.md index 5a88c85d2..9113aec97 100644 --- 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 index ef33008e0..c792f9a96 100644 --- 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 index f883e73b2..df6f6e670 100644 --- 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 index f526996c4..31ab50844 100644 --- 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 index 88e566fb4..4abeb8f46 100644 --- 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 index 50f0b01ec..d78a658e8 100644 --- 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 index 4dd64ba02..6b33dd66a 100644 --- 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 index 544e33094..c5c4f3510 100644 --- 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 index 62af028ff..f47237382 100644 --- 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 index 4c74370cb..a1e804cc5 100644 --- 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 index 923dba1fe..ef46ac2e6 100644 --- 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 index 0eaaee8b8..f47d74562 100644 --- 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/