From c5c249ecbe33ef156cd3855b1570e663b587eca5 Mon Sep 17 00:00:00 2001 From: "Troy W." Date: Thu, 30 May 2024 22:19:08 -0400 Subject: [PATCH 1/2] Removed Support for Ubuntu 18.04 (Bionic) --- .github/workflows/agent.yml | 1 - .github/workflows/javagateway.yml | 1 - .github/workflows/proxy.yml | 1 - .github/workflows/server.yml | 5 ----- .github/workflows/web.yml | 5 ----- docs/ZABBIX_AGENT_ROLE.md | 1 - docs/ZABBIX_JAVAGATEWAY_ROLE.md | 1 - docs/ZABBIX_PROXY_ROLE.md | 1 - docs/ZABBIX_SERVER_ROLE.md | 1 - docs/ZABBIX_WEB_ROLE.md | 1 - .../zabbix_agent_tests/common/playbooks/prepare.yml | 4 ++-- roles/zabbix_agent/vars/Debian.yml | 5 ----- roles/zabbix_javagateway/vars/Debian.yml | 4 ---- roles/zabbix_proxy/vars/Debian.yml | 8 -------- roles/zabbix_server/tasks/initialize-mysql.yml | 13 +------------ roles/zabbix_server/vars/Debian.yml | 2 -- roles/zabbix_web/vars/Debian.yml | 2 -- 17 files changed, 3 insertions(+), 53 deletions(-) diff --git a/.github/workflows/agent.yml b/.github/workflows/agent.yml index e081e6721..800d81b1f 100644 --- a/.github/workflows/agent.yml +++ b/.github/workflows/agent.yml @@ -25,7 +25,6 @@ jobs: - ubuntu2404 - ubuntu2204 - ubuntu2004 - - ubuntu1804 - debian12 - debian11 - debian10 diff --git a/.github/workflows/javagateway.yml b/.github/workflows/javagateway.yml index 96ca2a8b7..d256884bb 100644 --- a/.github/workflows/javagateway.yml +++ b/.github/workflows/javagateway.yml @@ -26,7 +26,6 @@ jobs: - ubuntu2404 - ubuntu2204 - ubuntu2004 - - ubuntu1804 - debian12 - debian11 - debian10 diff --git a/.github/workflows/proxy.yml b/.github/workflows/proxy.yml index 5618a0633..a64db1e1d 100644 --- a/.github/workflows/proxy.yml +++ b/.github/workflows/proxy.yml @@ -26,7 +26,6 @@ jobs: - ubuntu2404 - ubuntu2204 - ubuntu2004 - - ubuntu1804 - debian12 - debian11 - debian10 diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml index 9ca8f3761..7d11e69df 100644 --- a/.github/workflows/server.yml +++ b/.github/workflows/server.yml @@ -25,7 +25,6 @@ jobs: - ubuntu2404 - ubuntu2204 - ubuntu2004 - - ubuntu1804 - debian12 - debian11 - debian10 @@ -45,10 +44,6 @@ jobs: version: v62 - container: ubuntu2404 version: v62 - - container: ubuntu1804 - version: v62 - - container: ubuntu1804 - version: v64 - container: debian10 version: v64 steps: diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml index ec60c540d..eea617b06 100644 --- a/.github/workflows/web.yml +++ b/.github/workflows/web.yml @@ -25,7 +25,6 @@ jobs: - ubuntu2404 - ubuntu2204 - ubuntu2004 - - ubuntu1804 - debian12 - debian11 - debian10 @@ -48,12 +47,8 @@ jobs: version: v62 - container: ubuntu2404 version: v62 - - container: ubuntu1804 - version: v62 - container: debian10 version: v64 - - container: ubuntu1804 - version: v64 - container: debian12 version: v62 steps: diff --git a/docs/ZABBIX_AGENT_ROLE.md b/docs/ZABBIX_AGENT_ROLE.md index f9a2fb5a5..9f213ca6f 100644 --- a/docs/ZABBIX_AGENT_ROLE.md +++ b/docs/ZABBIX_AGENT_ROLE.md @@ -97,7 +97,6 @@ See the following list of supported Operating systems with the Zabbix releases: | Ubuntu 24.04 noble | V | | V | | Ubuntu 22.04 jammy | V | V | V | | Ubuntu 20.04 focal | V | V | V | -| Ubuntu 18.04 bionic | V | V | V | | Debian 12 bookworm | V | V | V | | Debian 11 bullseye | V | V | V | | Debian 10 buster | V | V | V | diff --git a/docs/ZABBIX_JAVAGATEWAY_ROLE.md b/docs/ZABBIX_JAVAGATEWAY_ROLE.md index 0de7af814..4eb992ef0 100644 --- a/docs/ZABBIX_JAVAGATEWAY_ROLE.md +++ b/docs/ZABBIX_JAVAGATEWAY_ROLE.md @@ -42,7 +42,6 @@ See the following list of supported Operating systems with the Zabbix releases. | Ubuntu 24.04 noble | V | | V | | Ubuntu 22.04 jammy | V | V | V | | Ubuntu 20.04 focal | V | V | V | -| Ubuntu 18.04 bionic | V | V | V | | Debian 12 bookworm | V | | V | | Debian 11 bullseye | V | V | V | | Debian 10 buster | V | V | V | diff --git a/docs/ZABBIX_PROXY_ROLE.md b/docs/ZABBIX_PROXY_ROLE.md index 703ec6059..171e6fb27 100644 --- a/docs/ZABBIX_PROXY_ROLE.md +++ b/docs/ZABBIX_PROXY_ROLE.md @@ -85,7 +85,6 @@ See the following list of supported Operating systems with the Zabbix releases. | Ubuntu 24.04 noble | V | | V | | Ubuntu 22.04 jammy | V | V | V | | Ubuntu 20.04 focal | V | V | V | -| Ubuntu 18.04 bionic | V | V | V | | Debian 12 bookworm | V | | V | | Debian 11 bullseye | V | V | V | | Debian 10 buster | V | V | V | diff --git a/docs/ZABBIX_SERVER_ROLE.md b/docs/ZABBIX_SERVER_ROLE.md index 20f462c48..3d7434f31 100644 --- a/docs/ZABBIX_SERVER_ROLE.md +++ b/docs/ZABBIX_SERVER_ROLE.md @@ -82,7 +82,6 @@ See the following list of supported Operating systems with the Zabbix releases: | Ubuntu 24.04 noble | V | | V | | Ubuntu 22.04 jammy | V | V | V | | Ubuntu 20.04 focal | V | V | V | -| Ubuntu 18.04 bionic | | | V | | Debian 12 bookworm | V | | V | | Debian 11 bullseye | V | V | V | | Debian 10 buster | | | V | diff --git a/docs/ZABBIX_WEB_ROLE.md b/docs/ZABBIX_WEB_ROLE.md index c1875f208..3e8a6cc3c 100644 --- a/docs/ZABBIX_WEB_ROLE.md +++ b/docs/ZABBIX_WEB_ROLE.md @@ -62,7 +62,6 @@ See the following list of supported Operating Systems with the Zabbix releases. | Ubuntu 24.04 noble | V | | V | | Ubuntu 22.04 jammy | V | V | V | | Ubuntu 20.04 focal | V | V | V | -| Ubuntu 18.04 bionic | | | V | | Debian 12 bookworm | V | | V | | Debian 11 bullseye | V | V | V | | Debian 10 buster | | | V | diff --git a/molecule/zabbix_agent_tests/common/playbooks/prepare.yml b/molecule/zabbix_agent_tests/common/playbooks/prepare.yml index 2ad8efa3f..94d0072f5 100644 --- a/molecule/zabbix_agent_tests/common/playbooks/prepare.yml +++ b/molecule/zabbix_agent_tests/common/playbooks/prepare.yml @@ -27,7 +27,7 @@ - name: "Installing packages on Debian family" ansible.builtin.apt: name: - - "{{ 'net-tools' if ansible_distribution_major_version not in ['10','18', '20'] else 'iproute2' }}" + - "{{ 'net-tools' if ansible_distribution_major_version not in ['10','20'] else 'iproute2' }}" state: present update_cache: true register: zabbix_agent_prepare_packages_install @@ -47,7 +47,7 @@ hosts: docker tasks: - name: "Download Docker CE repo file" - when: not ansible_check_mode # Because get_url always has changed status in check_mode. + when: not ansible_check_mode # Because get_url always has changed status in check_mode. ansible.builtin.get_url: url: https://download.docker.com/linux/centos/docker-ce.repo dest: /etc/yum.repos.d/docker-ce.repo diff --git a/roles/zabbix_agent/vars/Debian.yml b/roles/zabbix_agent/vars/Debian.yml index 0a9b14650..10035dd35 100644 --- a/roles/zabbix_agent/vars/Debian.yml +++ b/roles/zabbix_agent/vars/Debian.yml @@ -39,10 +39,5 @@ zabbix_valid_agent_versions: - 6.2 - 6.0 - "18": - - 6.4 - - 6.2 - - 6.0 - debian_keyring_path: /etc/apt/keyrings/ zabbix_gpg_key: "{{ debian_keyring_path }}zabbix-repo.asc" diff --git a/roles/zabbix_javagateway/vars/Debian.yml b/roles/zabbix_javagateway/vars/Debian.yml index 0ea96ac7e..eb5b48174 100644 --- a/roles/zabbix_javagateway/vars/Debian.yml +++ b/roles/zabbix_javagateway/vars/Debian.yml @@ -23,10 +23,6 @@ zabbix_valid_javagateway_versions: - 6.4 - 6.2 - 6.0 - "18": - - 6.4 - - 6.2 - - 6.0 debian_keyring_path: /etc/apt/keyrings/ zabbix_gpg_key: "{{ debian_keyring_path }}zabbix-repo.asc" diff --git a/roles/zabbix_proxy/vars/Debian.yml b/roles/zabbix_proxy/vars/Debian.yml index af274952b..32c00cc51 100644 --- a/roles/zabbix_proxy/vars/Debian.yml +++ b/roles/zabbix_proxy/vars/Debian.yml @@ -22,10 +22,6 @@ zabbix_valid_proxy_versions: - 6.4 - 6.2 - 6.0 - "18": - - 6.4 - - 6.2 - - 6.0 _zabbix_proxy_pgsql_dependencies: - "{{ zabbix_proxy_install_database_client | ternary('postgresql-client', '') }}" @@ -52,15 +48,11 @@ _zabbix_proxy_mysql_dependencies: "20": - default-mysql-client - python3-pymysql - "18": - - default-mysql-client - - python3-pymysql _zabbix_proxy_sqlite3_dependencies: - sqlite3 mysql_plugin: - "18": mysql_native_password "10": mysql_native_password debian_keyring_path: /etc/apt/keyrings/ diff --git a/roles/zabbix_server/tasks/initialize-mysql.yml b/roles/zabbix_server/tasks/initialize-mysql.yml index b16b475c9..2679fb8c7 100644 --- a/roles/zabbix_server/tasks/initialize-mysql.yml +++ b/roles/zabbix_server/tasks/initialize-mysql.yml @@ -14,17 +14,6 @@ - database - dependencies -# NOTE: Upgrading system-packages with pip is generally a bad idea, but -# ubuntu-18.04 comes with pymysql==0.8.0, which seems to have a problem with -# versions 8 and above of mysql. -- name: Upgrade pymysql - when: - - ansible_facts['distribution'] == 'Ubuntu' - - ansible_facts['distribution_release'] == 'bionic' - ansible.builtin.pip: - name: "pymysql>=0.10.0,<0.11.0" - state: latest - - name: "MySQL Database prep" when: zabbix_server_database_creation become: "{{ zabbix_server_dbhost_run_install }}" @@ -79,7 +68,7 @@ login_host: "{{ zabbix_server_dbhost }}" login_port: "{{ zabbix_server_dbport }}" login_db: "{{ zabbix_server_dbname }}" - query: 'SELECT mandatory FROM dbversion' + query: "SELECT mandatory FROM dbversion" rescue: - name: "MySQL | Get and set schema import overrides" delegate_to: "{{ zabbix_server_real_dbhost | default(zabbix_server_dbhost_run_install | ternary(delegated_dbhost, inventory_hostname), true) }}" diff --git a/roles/zabbix_server/vars/Debian.yml b/roles/zabbix_server/vars/Debian.yml index 277fa8580..86a44d646 100644 --- a/roles/zabbix_server/vars/Debian.yml +++ b/roles/zabbix_server/vars/Debian.yml @@ -28,8 +28,6 @@ zabbix_valid_server_versions: - 6.4 - 6.2 - 6.0 - "18": - - 6.0 debian_keyring_path: /etc/apt/keyrings/ zabbix_gpg_key: "{{ debian_keyring_path }}zabbix-repo.asc" diff --git a/roles/zabbix_web/vars/Debian.yml b/roles/zabbix_web/vars/Debian.yml index 643b226f5..1b6a3a147 100644 --- a/roles/zabbix_web/vars/Debian.yml +++ b/roles/zabbix_web/vars/Debian.yml @@ -46,8 +46,6 @@ zabbix_valid_web_versions: - 6.4 - 6.2 - 6.0 - "18": - - 6.0 debian_keyring_path: /etc/apt/keyrings/ zabbix_gpg_key: "{{ debian_keyring_path }}zabbix-repo.asc" From 6cd8494cc4d1718d3ed789c1c1641569c5f9b49b Mon Sep 17 00:00:00 2001 From: "Troy W." Date: Thu, 30 May 2024 22:23:50 -0400 Subject: [PATCH 2/2] Added Change Fragment --- changelogs/fragments/remove_1804.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 changelogs/fragments/remove_1804.yml diff --git a/changelogs/fragments/remove_1804.yml b/changelogs/fragments/remove_1804.yml new file mode 100644 index 000000000..9eba3bdd9 --- /dev/null +++ b/changelogs/fragments/remove_1804.yml @@ -0,0 +1,2 @@ +breaking_changes: + - All Roles - Removed support for Ubuntu 18.08 (Bionic)