From b9ce702263a471e355adadd48e764ce02c8a3153 Mon Sep 17 00:00:00 2001 From: Troy W Date: Thu, 6 Jun 2024 19:48:51 -0400 Subject: [PATCH] Remove Support for Zabbix 6.2 (#1274) --- .github/workflows/agent.yml | 6 - .github/workflows/javagateway.yml | 6 - .github/workflows/proxy.yml | 10 +- .github/workflows/server.yml | 6 +- .github/workflows/web.yml | 6 - changelogs/fragments/1250.yml | 2 + docs/ZABBIX_AGENT_ROLE.md | 20 +-- docs/ZABBIX_JAVAGATEWAY_ROLE.md | 18 +-- docs/ZABBIX_PROXY_ROLE.md | 18 +-- docs/ZABBIX_SERVER_ROLE.md | 18 +-- docs/ZABBIX_WEB_ROLE.md | 18 +-- .../zabbix_agent_tests/common/molecule.yml | 2 - molecule/zabbix_javagateway/molecule.yml | 2 - molecule/zabbix_proxy/molecule.yml | 2 - molecule/zabbix_server/molecule.yml | 2 - molecule/zabbix_web/molecule.yml | 3 - roles/zabbix_agent/vars/Debian.yml | 5 - roles/zabbix_agent/vars/RedHat.yml | 2 - roles/zabbix_agent/vars/Windows.yml | 1 - roles/zabbix_javagateway/vars/Debian.yml | 3 - roles/zabbix_javagateway/vars/RedHat.yml | 3 - roles/zabbix_proxy/vars/Debian.yml | 3 - roles/zabbix_proxy/vars/RedHat.yml | 2 - roles/zabbix_server/vars/Debian.yml | 3 - roles/zabbix_server/vars/RedHat.yml | 2 - roles/zabbix_web/vars/Debian.yml | 3 - roles/zabbix_web/vars/RedHat.yml | 2 - .../tasks/zabbix_authentication_tests.yml | 149 ------------------ .../test_zabbix_host_info/tasks/main.yml | 4 +- .../test_zabbix_settings/tasks/main.yml | 4 +- .../test_zabbix_template/defaults/main.yml | 2 +- .../defaults/main.yml | 2 +- .../test_zabbix_template_info/tasks/main.yml | 2 +- .../test_zabbix_templategroup/tasks/main.yml | 4 +- .../test_zabbix_usergroup/tasks/main.yml | 8 +- 35 files changed, 63 insertions(+), 280 deletions(-) create mode 100644 changelogs/fragments/1250.yml diff --git a/.github/workflows/agent.yml b/.github/workflows/agent.yml index 29810bacd..4ed41594c 100644 --- 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 index 969983e43..e2036cd15 100644 --- a/.github/workflows/javagateway.yml +++ b/.github/workflows/javagateway.yml @@ -30,13 +30,7 @@ jobs: version: - v70 - v64 - - v62 - v60 - exclude: - - container: debian12 - version: v62 - - container: ubuntu2404 - version: v62 collection_role: - zabbix_javagateway steps: diff --git a/.github/workflows/proxy.yml b/.github/workflows/proxy.yml index 6021fd9c4..60368e138 100644 --- a/.github/workflows/proxy.yml +++ b/.github/workflows/proxy.yml @@ -36,16 +36,8 @@ jobs: version: - v70 - 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 index 6e16e37f9..772e58263 100644 --- a/.github/workflows/server.yml +++ b/.github/workflows/server.yml @@ -34,17 +34,13 @@ jobs: - pgsql version: - v64 - - v62 - v60 exclude: - - container: debian12 - version: v62 - - container: ubuntu2404 - version: v62 - 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 index 5ceb8b746..4d0ebecd4 100644 --- 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 new file mode 100644 index 000000000..8f1f1dd41 --- /dev/null +++ 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 index 870c5ded6..043d70576 100644 --- 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 index 9207b1c6c..a500a5fc7 100644 --- 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 index f91856355..b1d7179bf 100644 --- 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 index 0659aaf14..a55b46da9 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 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 index 16558348e..5e0d8bf2b 100644 --- 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 index bdb70e74f..6ef3ba22b 100644 --- a/molecule/zabbix_agent_tests/common/molecule.yml +++ b/molecule/zabbix_agent_tests/common/molecule.yml @@ -37,8 +37,6 @@ provisioner: zabbix_repo_yum_gpg_check: 1 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 index 8803e8959..e14ddc469 100644 --- a/molecule/zabbix_javagateway/molecule.yml +++ b/molecule/zabbix_javagateway/molecule.yml @@ -28,8 +28,6 @@ provisioner: zabbix_javagateway_version: 7.0 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 index 960d149ec..5df385854 100644 --- a/molecule/zabbix_proxy/molecule.yml +++ b/molecule/zabbix_proxy/molecule.yml @@ -30,8 +30,6 @@ provisioner: zabbix_proxy_version: 7.0 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 index 8d97a347c..eb543b571 100644 --- a/molecule/zabbix_server/molecule.yml +++ b/molecule/zabbix_server/molecule.yml @@ -29,8 +29,6 @@ provisioner: zabbix_server_version: 7.0 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 index 720e3f0a7..9d4541bc5 100644 --- a/molecule/zabbix_web/molecule.yml +++ b/molecule/zabbix_web/molecule.yml @@ -38,9 +38,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 index e7c7d0629..36002ab95 100644 --- 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,10 +23,8 @@ zabbix_valid_agent_versions: "22": - 6.4 - - 6.2 - 6.0 "20": - 6.4 - - 6.2 - 6.0 diff --git a/roles/zabbix_agent/vars/RedHat.yml b/roles/zabbix_agent/vars/RedHat.yml index 7c807652e..b799942a5 100644 --- 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 index 4dd64ba02..543758aa2 100644 --- 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 index 3181d1d4f..31301eebb 100644 --- a/roles/zabbix_javagateway/vars/Debian.yml +++ b/roles/zabbix_javagateway/vars/Debian.yml @@ -7,7 +7,6 @@ zabbix_valid_javagateway_versions: "11": - 7.0 - 6.4 - - 6.2 - 6.0 # Ubuntu @@ -18,10 +17,8 @@ zabbix_valid_javagateway_versions: "22": - 7.0 - 6.4 - - 6.2 - 6.0 "20": - 7.0 - 6.4 - - 6.2 - 6.0 diff --git a/roles/zabbix_javagateway/vars/RedHat.yml b/roles/zabbix_javagateway/vars/RedHat.yml index 72f593374..06e2bb1af 100644 --- a/roles/zabbix_javagateway/vars/RedHat.yml +++ b/roles/zabbix_javagateway/vars/RedHat.yml @@ -3,14 +3,11 @@ zabbix_valid_javagateway_versions: "9": - 7.0 - 6.4 - - 6.2 - 6.0 "8": - 7.0 - 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 index 1249a1ab5..d7bf64856 100644 --- a/roles/zabbix_proxy/vars/Debian.yml +++ b/roles/zabbix_proxy/vars/Debian.yml @@ -7,7 +7,6 @@ zabbix_valid_proxy_versions: "11": - 7.0 - 6.4 - - 6.2 - 6.0 "24": - 7.0 @@ -16,12 +15,10 @@ zabbix_valid_proxy_versions: "22": - 7.0 - 6.4 - - 6.2 - 6.0 "20": - 7.0 - 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 index e4c166627..b1285bd4f 100644 --- a/roles/zabbix_proxy/vars/RedHat.yml +++ b/roles/zabbix_proxy/vars/RedHat.yml @@ -2,12 +2,10 @@ zabbix_valid_proxy_versions: "9": - 7.0 - 6.4 - - 6.2 - 6.0 "8": - 7.0 - 6.4 - - 6.2 - 6.0 _zabbix_proxy_pgsql_dependencies: diff --git a/roles/zabbix_server/vars/Debian.yml b/roles/zabbix_server/vars/Debian.yml index 41bc9a8c3..acd5ede94 100644 --- a/roles/zabbix_server/vars/Debian.yml +++ b/roles/zabbix_server/vars/Debian.yml @@ -13,7 +13,6 @@ zabbix_valid_server_versions: - 6.0 "11": - 6.4 - - 6.2 - 6.0 # Ubuntu "24": @@ -23,11 +22,9 @@ zabbix_valid_server_versions: "22": - 7.0 - 6.4 - - 6.2 - 6.0 "20": - 6.4 - - 6.2 - 6.0 _zabbix_server_pgsql_dependencies: diff --git a/roles/zabbix_server/vars/RedHat.yml b/roles/zabbix_server/vars/RedHat.yml index 8ca422c66..d19e25d25 100644 --- a/roles/zabbix_server/vars/RedHat.yml +++ b/roles/zabbix_server/vars/RedHat.yml @@ -12,12 +12,10 @@ zabbix_valid_server_versions: "9": - 7.0 - 6.4 - - 6.2 - 6.0 "8": - 7.0 - 6.4 - - 6.2 - 6.0 _zabbix_server_pgsql_dependencies: diff --git a/roles/zabbix_web/vars/Debian.yml b/roles/zabbix_web/vars/Debian.yml index a52708c33..f8c3e42af 100644 --- a/roles/zabbix_web/vars/Debian.yml +++ b/roles/zabbix_web/vars/Debian.yml @@ -30,7 +30,6 @@ zabbix_valid_web_versions: - 6.0 "11": - 6.4 - - 6.2 - 6.0 # Ubuntu "24": @@ -38,9 +37,7 @@ zabbix_valid_web_versions: - 6.0 "22": - 6.4 - - 6.2 - 6.0 "20": - 6.4 - - 6.2 - 6.0 diff --git a/roles/zabbix_web/vars/RedHat.yml b/roles/zabbix_web/vars/RedHat.yml index 785c18c99..9365ede15 100644 --- a/roles/zabbix_web/vars/RedHat.yml +++ b/roles/zabbix_web/vars/RedHat.yml @@ -21,11 +21,9 @@ __epel_repo: zabbix_valid_web_versions: "9": - 6.4 - - 6.2 - 6.0 "8": - 6.4 - - 6.2 - 6.0 zabbix_web_php_dependencies: diff --git a/tests/integration/targets/test_zabbix_authentication/tasks/zabbix_authentication_tests.yml b/tests/integration/targets/test_zabbix_authentication/tasks/zabbix_authentication_tests.yml index 90b8b7868..f73f5be2e 100644 --- a/tests/integration/targets/test_zabbix_authentication/tasks/zabbix_authentication_tests.yml +++ b/tests/integration/targets/test_zabbix_authentication/tasks/zabbix_authentication_tests.yml @@ -151,155 +151,6 @@ ansible.builtin.assert: that: zbxauth_update.changed is sameas True -- when: zabbix_version is version('6.2', '=') - name: support Zabbix version (=6.2) - block: - - name: test - create user directory - community.zabbix.zabbix_user_directory: - name: TestUserDirectory - host: "test.com" - port: 389 - base_dn: "ou=Users,dc=example,dc=org" - search_attribute: "uid" - - - name: test - update ldap_configured without mandatory paramters - community.zabbix.zabbix_authentication: - ldap_configured: true - ignore_errors: true - register: zbxauth_update - - - name: assert that authentication was NOT updated - ansible.builtin.assert: - that: - - zbxauth_update.failed is sameas True - - zbxauth_update.msg == "Please set ldap_userdirectory when you change a value of ldap_configured to true." - - - name: test - update saml_auth_enabled without mandatory paramters - community.zabbix.zabbix_authentication: - saml_auth_enabled: true - ignore_errors: true - register: zbxauth_update - - - name: assert that authentication was NOT updated - ansible.builtin.assert: - that: - - zbxauth_update.failed is sameas True - - zbxauth_update.msg == "Please set saml_idp_entityid, saml_sso_url, saml_username_attribute and saml_sp_entityid when you change a value of saml_auth_enabled to true." - - - name: test - update all authentication setting - community.zabbix.zabbix_authentication: - authentication_type: internal - http_auth_enabled: true - http_login_form: zabbix_login_form - http_strip_domains: "comp,any" - http_case_sensitive: true - ldap_configured: true - ldap_case_sensitive: true - ldap_userdirectory: TestUserDirectory - saml_auth_enabled: true - saml_idp_entityid: "" - saml_sso_url: "https://localhost/SAML2/SSO" - saml_slo_url: "https://localhost/SAML2/SLO" - saml_username_attribute: "uid" - saml_sp_entityid: "https://localhost" - saml_nameid_format: "urn:oasis:names:tc:SAML:2.0:nameid-format:entity" - saml_sign_messages: true - saml_sign_assertions: true - saml_sign_authn_requests: true - saml_sign_logout_requests: true - saml_sign_logout_responses: true - saml_encrypt_nameid: true - saml_encrypt_assertions: true - saml_case_sensitive: true - passwd_min_length: 70 - passwd_check_rules: - - contain_uppercase_and_lowercase_letters - - contain_digits - - contain_special_characters - - avoid_easy_to_guess - register: zbxauth_update - - - name: assert that authentication was updated - ansible.builtin.assert: - that: zbxauth_update.changed is sameas True - - - name: test - update all authentication setting (again) - community.zabbix.zabbix_authentication: - authentication_type: internal - http_auth_enabled: true - http_login_form: zabbix_login_form - http_strip_domains: - - comp - - any - http_case_sensitive: true - ldap_configured: true - ldap_case_sensitive: true - ldap_userdirectory: TestUserDirectory - saml_auth_enabled: true - saml_idp_entityid: "" - saml_sso_url: "https://localhost/SAML2/SSO" - saml_slo_url: "https://localhost/SAML2/SLO" - saml_username_attribute: "uid" - saml_sp_entityid: "https://localhost" - saml_nameid_format: "urn:oasis:names:tc:SAML:2.0:nameid-format:entity" - saml_sign_messages: true - saml_sign_assertions: true - saml_sign_authn_requests: true - saml_sign_logout_requests: true - saml_sign_logout_responses: true - saml_encrypt_nameid: true - saml_encrypt_assertions: true - saml_case_sensitive: true - passwd_min_length: 70 - passwd_check_rules: - - contain_uppercase_and_lowercase_letters - - contain_digits - - contain_special_characters - - avoid_easy_to_guess - register: zbxauth_update - - - name: assert that authentication was NOT updated - ansible.builtin.assert: - that: zbxauth_update.changed is sameas False - - - name: test - initialize all authentication setting - community.zabbix.zabbix_authentication: - authentication_type: internal - http_auth_enabled: false - http_login_form: zabbix_login_form - http_strip_domains: [] - http_case_sensitive: true - ldap_configured: false - ldap_case_sensitive: true - saml_auth_enabled: false - saml_idp_entityid: "" - saml_sso_url: "" - saml_slo_url: "" - saml_username_attribute: "" - saml_sp_entityid: "" - saml_nameid_format: "" - saml_sign_messages: false - saml_sign_assertions: false - saml_sign_authn_requests: false - saml_sign_logout_requests: false - saml_sign_logout_responses: false - saml_encrypt_nameid: false - saml_encrypt_assertions: false - saml_case_sensitive: false - passwd_min_length: 8 - passwd_check_rules: - - avoid_easy_to_guess - register: zbxauth_update - - - name: assert that authentication was updated - ansible.builtin.assert: - that: zbxauth_update.changed is sameas True - - - name: test - delete user directory - community.zabbix.zabbix_user_directory: - name: TestUserDirectory - state: absent - - when: zabbix_version is version('6.4', '>=') name: support Zabbix version (>=6.4) block: diff --git a/tests/integration/targets/test_zabbix_host_info/tasks/main.yml b/tests/integration/targets/test_zabbix_host_info/tasks/main.yml index 72c2f6364..3cd63e437 100644 --- a/tests/integration/targets/test_zabbix_host_info/tasks/main.yml +++ b/tests/integration/targets/test_zabbix_host_info/tasks/main.yml @@ -49,7 +49,7 @@ community.zabbix.zabbix_host_info: register: gather_all_facts_result - - when: zabbix_version is version('5.4', '>=') and zabbix_version is version('6.2', '<') + - when: zabbix_version is version('6.0', '=') ansible.builtin.assert: that: - gather_all_facts_result.hosts | length == 1 @@ -70,7 +70,7 @@ - gather_all_facts_result.hosts.0.hostinterfaces.0.type == "1" - gather_all_facts_result.hosts.0.hostinterfaces.0.useip == "1" - - when: zabbix_version is version('6.2', '>=') + - when: zabbix_version is version('6.4', '>=') ansible.builtin.assert: that: - gather_all_facts_result.hosts | length == 1 diff --git a/tests/integration/targets/test_zabbix_settings/tasks/main.yml b/tests/integration/targets/test_zabbix_settings/tasks/main.yml index 7be88158e..d1056f097 100644 --- a/tests/integration/targets/test_zabbix_settings/tasks/main.yml +++ b/tests/integration/targets/test_zabbix_settings/tasks/main.yml @@ -73,8 +73,8 @@ that: - zbx_settings.changed is sameas False -- when: zabbix_version is version('6.2', '>=') - name: support Zabbix version (>=6.2) +- when: zabbix_version is version('6.4', '>=') + name: support Zabbix version (>=6.4) block: - name: test - Zabbix settings (same as default) community.zabbix.zabbix_settings: diff --git a/tests/integration/targets/test_zabbix_template/defaults/main.yml b/tests/integration/targets/test_zabbix_template/defaults/main.yml index 6f736db53..7d1f6deba 100644 --- a/tests/integration/targets/test_zabbix_template/defaults/main.yml +++ b/tests/integration/targets/test_zabbix_template/defaults/main.yml @@ -1,2 +1,2 @@ --- -template_groups_key: "{{ 'template_groups' if zabbix_version is version('6.2', '>=') else 'groups' }}" +template_groups_key: "{{ 'template_groups' if zabbix_version is version('6.4', '>=') else 'groups' }}" diff --git a/tests/integration/targets/test_zabbix_template_info/defaults/main.yml b/tests/integration/targets/test_zabbix_template_info/defaults/main.yml index 6f736db53..7d1f6deba 100644 --- a/tests/integration/targets/test_zabbix_template_info/defaults/main.yml +++ b/tests/integration/targets/test_zabbix_template_info/defaults/main.yml @@ -1,2 +1,2 @@ --- -template_groups_key: "{{ 'template_groups' if zabbix_version is version('6.2', '>=') else 'groups' }}" +template_groups_key: "{{ 'template_groups' if zabbix_version is version('6.4', '>=') else 'groups' }}" diff --git a/tests/integration/targets/test_zabbix_template_info/tasks/main.yml b/tests/integration/targets/test_zabbix_template_info/tasks/main.yml index ae790f1f9..37915dc64 100644 --- a/tests/integration/targets/test_zabbix_template_info/tasks/main.yml +++ b/tests/integration/targets/test_zabbix_template_info/tasks/main.yml @@ -27,7 +27,7 @@ - ansible.builtin.assert: that: - fetch_template_json_format_result.template_json[template_export_key].date is defined - when: zabbix_version is version('6.2', '<=') + when: zabbix_version is version('6.0', '=') - ansible.builtin.assert: that: diff --git a/tests/integration/targets/test_zabbix_templategroup/tasks/main.yml b/tests/integration/targets/test_zabbix_templategroup/tasks/main.yml index c04c20497..812368d79 100644 --- a/tests/integration/targets/test_zabbix_templategroup/tasks/main.yml +++ b/tests/integration/targets/test_zabbix_templategroup/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: test - do not run tests for Zabbix < 6.2 +- name: test - do not run tests for Zabbix = 6.0 meta: end_play - when: zabbix_version is version('6.2', '<') + when: zabbix_version is version('6.0', '=') - name: test - create new Zabbix template group community.zabbix.zabbix_templategroup: diff --git a/tests/integration/targets/test_zabbix_usergroup/tasks/main.yml b/tests/integration/targets/test_zabbix_usergroup/tasks/main.yml index d1922315b..1ed0aa0ca 100644 --- a/tests/integration/targets/test_zabbix_usergroup/tasks/main.yml +++ b/tests/integration/targets/test_zabbix_usergroup/tasks/main.yml @@ -49,7 +49,7 @@ ansible.builtin.assert: that: usergroup_reset is changed - - when: zabbix_version is version('6.2', '<') + - when: zabbix_version is version('6.0', '=') block: - name: test - update Zabbix user group with one right community.zabbix.zabbix_usergroup: @@ -88,7 +88,7 @@ ansible.builtin.assert: that: not usergroup_updated_rights_again is changed - - when: zabbix_version is version('6.2', '>=') + - when: zabbix_version is version('6.4', '>=') block: - name: test - update Zabbix user group with one hostgroup right community.zabbix.zabbix_usergroup: @@ -217,7 +217,7 @@ - name: test - reset Zabbix user group to default community.zabbix.zabbix_usergroup: - - when: zabbix_version is version('6.2', '>=') + - when: zabbix_version is version('6.4', '>=') block: - name: test - create new user directory community.zabbix.zabbix_user_directory: @@ -270,4 +270,4 @@ name: LDAP infra 1 host: "test.com" state: absent - when: zabbix_version is version('6.2', '>=') + when: zabbix_version is version('6.4', '>=')