Skip to content

Commit

Permalink
Roles to Zabbix 6.4 (#937)
Browse files Browse the repository at this point in the history 
* Zabbix proxy configuration template updated for Zabbix 6.4.

* Zabbix server configuration template updated for Zabbix 6.4.

* zabbix_server role: adjusting defaults.

* zabbix_server role: fix zabbix_server_proxyconfigfrequency variable.

* Add 6.4 version to all roles and make it essentially default.

* zabbix_server role: restore accidentally deleted parameter.

* READMEs for role updated with Zabbix 6.4.

* Changelog fragment added.

* Fix molecule test for zabbix_web.
  • Loading branch information
@BGmot
BGmot authored Apr 2, 2023
1 parent 29db969 commit e4bd9d6
Show file tree
Hide file tree
Showing 27 changed files with 235 additions and 128 deletions.
2 changes: 2 additions & 0 deletions changelogs/roles_zabbix64.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
minor_changes:
- all roles - updated to support Zabbix 6.4.
36 changes: 18 additions & 18 deletions docs/ZABBIX_AGENT_ROLE.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,24 +95,24 @@ 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.2 | 6.0 | 5.4 | 5.2 | 5.0 (LTS)| 4.4 | 4.0 (LTS) | 3.0 (LTS) |
|---------------------|-----|-----|-----|-----|----------|-----|-----------|-----------|
| Red Hat Fam 9 | V | V | | | | | | |
| Red Hat Fam 8 | V | V | V | V | V | V | | |
| Red Hat Fam 7 | V | V | V | V | V | V | V | V |
| Red Hat Fam 6 | V | V | V | V | V | | | V |
| Red Hat Fam 5 | | V | V | V | V | | | V |
| Fedora | | | | | | V | V | |
| Ubuntu 20.04 focal | V | V | V | V | V | | V | |
| Ubuntu 18.04 bionic | V | V | V | V | V | V | V | |
| Ubuntu 16.04 xenial | V | V | V | V | V | V | V | |
| Ubuntu 14.04 trusty | V | V | V | V | V | V | V | V |
| Debian 10 buster | V | V | V | V | V | V | | |
| Debian 9 stretch | V | | V | V | V | V | V | |
| Debian 8 jessie | | | | V | V | V | V | V |
| Debian 7 wheezy | | | | | | | V | V |
| macOS 10.15 | | | | | | V | V | |
| macOS 10.14 | | | | | | V | V | |
| Zabbix | 6.4 | 6.2 | 6.0 | 5.4 | 5.2 | 5.0 (LTS)| 4.4 | 4.0 (LTS) | 3.0 (LTS) |
|---------------------|-----|-----|-----|-----|-----|----------|-----|-----------|-----------|
| Red Hat Fam 9 | V | V | V | | | | | | |
| Red Hat Fam 8 | V | V | V | V | V | V | V | | |
| Red Hat Fam 7 | V | V | V | V | V | V | V | V | V |
| Red Hat Fam 6 | V | V | V | V | V | V | | | V |
| Red Hat Fam 5 | | | V | V | V | V | | | V |
| Fedora | | | | | | | V | V | |
| Ubuntu 20.04 focal | V | V | V | V | V | V | | V | |
| Ubuntu 18.04 bionic | V | V | V | V | V | V | V | V | |
| Ubuntu 16.04 xenial | V | V | V | V | V | V | V | V | |
| Ubuntu 14.04 trusty | V | V | V | V | V | V | V | V | V |
| Debian 10 buster | V | V | V | V | V | V | V | | |
| Debian 9 stretch | V | V | | V | V | V | V | V | |
| Debian 8 jessie | | | | | V | V | V | V | V |
| Debian 7 wheezy | | | | | | | | V | V |
| macOS 10.15 | | | | | | | V | V | |
| macOS 10.14 | | | | | | | V | V | |

# Getting started

Expand Down
35 changes: 17 additions & 18 deletions docs/ZABBIX_JAVAGATEWAY_ROLE.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,24 +35,23 @@ Please send Pull Requests or suggestions when you want to use this role for othe

See the following list of supported Operating systems with the Zabbix releases.

| Zabbix | 5.2 | 5.0 | 4.4 | 4.0 (LTS) | 3.0 (LTS) |
|---------------------|-----|-----|-----|-----------|-----------|
| Red Hat Fam 8 | V | V | V | | |
| Red Hat Fam 7 | V | V | V | V | V |
| Red Hat Fam 6 | V | V | | | V |
| Red Hat Fam 5 | V | V | | | V |
| Fedora | | | V | V | |
| Ubuntu 20.04 focal | V | V | | V | |
| Ubuntu 19.10 eoan | | | | | |
| Ubuntu 18.04 bionic | V | V | V | V | |
| Ubuntu 16.04 xenial | V | V | V | V | |
| Ubuntu 14.04 trusty | V | V | V | V | V |
| Debian 10 buster | V | V | V | | |
| Debian 9 stretch | V | V | V | V | |
| Debian 8 jessie | V | V | V | V | V |
| Debian 7 wheezy | | | | V | V |
| macOS 10.15 | | | V | V | |
| macOS 10.14 | | | V | V | |
| Zabbix | 6.4 | 6.2 | 6.0 (LTS) | 5.2 | 5.0 | 4.4 | 4.0 (LTS) | 3.0 (LTS) |
|---------------------|-----|-----|-----------|-----|-----|-----|-----------|-----------|
| Red Hat Fam 8 | V | V | V | V | V | V | | |
| Red Hat Fam 7 | | | | V | V | V | V | V |
| Red Hat Fam 6 | | | | V | V | | | V |
| Red Hat Fam 5 | | | | V | V | | | V |
| Fedora | | | | | | V | V | |
| Ubuntu 20.04 focal | V | V | V | V | V | | V | |
| Ubuntu 18.04 bionic | | | | V | V | V | V | |
| Ubuntu 16.04 xenial | | | | V | V | V | V | |
| Ubuntu 14.04 trusty | | | | V | V | V | V | V |
| Debian 10 buster | V | V | V | V | V | V | | |
| Debian 9 stretch | | | | V | V | V | V | |
| Debian 8 jessie | | | | V | V | V | V | V |
| Debian 7 wheezy | | | | | | | V | V |
| macOS 10.15 | | | | | | V | V | |
| macOS 10.14 | | | | | | V | V | |

# Role Variables

Expand Down
36 changes: 18 additions & 18 deletions docs/ZABBIX_PROXY_ROLE.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,24 +77,24 @@ ansible-galaxy collection install community.postgresql

See the following list of supported Operating systems with the Zabbix releases.

| Zabbix | 6.2 | 6.0 | 5.4 | 5.2 | 5.0 (LTS)| 4.4 | 4.0 (LTS) | 3.0 (LTS) |
|---------------------|-----|-----|-----|-----|-----------|-----|-----------|-----------|
| Red Hat Fam 9 | V | V | | | | | | |
| Red Hat Fam 8 | V | V | V | V | V | V | | |
| Red Hat Fam 7 | V | V | V | V | V | V | V | V |
| Red Hat Fam 6 | | | | V | V | | | V |
| Red Hat Fam 5 | | | | V | V | | | V |
| Fedora | | | | | | V | V | |
| Ubuntu 20.04 focal | V | V | V | V | V | | V | |
| Ubuntu 18.04 bionic | | V | V | V | V | V | V | |
| Ubuntu 16.04 xenial | | | | V | V | V | V | |
| Ubuntu 14.04 trusty | | | | V | V | V | V | V |
| Debian 10 buster | | V | V | V | V | V | | |
| Debian 9 stretch | | V | V | V | V | V | V | |
| Debian 8 jessie | | | | V | V | V | V | V |
| Debian 7 wheezy | | | | | | | V | V |
| macOS 10.15 | | | | | | V | V | |
| macOS 10.14 | | | | | | V | V | |
| Zabbix | 6.4 | 6.2 | 6.0 | 5.4 | 5.2 | 5.0 (LTS)| 4.4 | 4.0 (LTS) | 3.0 (LTS) |
|---------------------|-----|-----|-----|-----|-----|-----------|-----|-----------|-----------|
| Red Hat Fam 9 | V | V | V | | | | | | |
| Red Hat Fam 8 | V | V | V | V | V | V | V | | |
| Red Hat Fam 7 | V | V | V | V | V | V | V | V | V |
| Red Hat Fam 6 | | | | | V | V | | | V |
| Red Hat Fam 5 | | | | | V | V | | | V |
| Fedora | | | | | | | V | V | |
| Ubuntu 20.04 focal | V | V | V | V | V | V | | V | |
| Ubuntu 18.04 bionic | | | V | V | V | V | V | V | |
| Ubuntu 16.04 xenial | | | | | V | V | V | V | |
| Ubuntu 14.04 trusty | | | | | V | V | V | V | V |
| Debian 10 buster | V | | V | V | V | V | V | | |
| Debian 9 stretch | V | | V | V | V | V | V | V | |
| Debian 8 jessie | | | | | V | V | V | V | V |
| Debian 7 wheezy | | | | | | | | V | V |
| macOS 10.15 | | | | | | | V | V | |
| macOS 10.14 | | | | | | | V | V | |

# Role Variables

Expand Down
37 changes: 19 additions & 18 deletions docs/ZABBIX_SERVER_ROLE.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,24 +75,24 @@ ansible-galaxy collection install community.postgresql

See the following list of supported Operating systems with the Zabbix releases:

| Zabbix | 6.2 | 6.0 | 5.4 | 5.2 | 5.0 (LTS) | 4.4 | 4.0 (LTS) | 3.0 (LTS) |
|---------------------|-----|-----|-----|-----|-----------|-----|-----------|-----------|
| Red Hat Fam 9 | V | V | | | | | | |
| Red Hat Fam 8 | V | V | V | V | V | V | | |
| Red Hat Fam 7 | | | | | V | V | V | V |
| Red Hat Fam 6 | | | | V | V | | | V |
| Red Hat Fam 5 | | | | V | V | | | V |
| Fedora | | | | | | V | V | |
| Ubuntu 20.04 focal | V | V | V | V | V | | V | |
| Ubuntu 18.04 bionic | | V | V | V | V | V | V | |
| Ubuntu 16.04 xenial | | | | V | V | V | V | |
| Ubuntu 14.04 trusty | | | | V | V | V | V | V |
| Debian 10 buster | | V | V | V | V | V | | |
| Debian 9 stretch | | V | V | V | V | V | V | |
| Debian 8 jessie | | | | V | V | V | V | V |
| Debian 7 wheezy | | | | | | | V | V |
| macOS 10.15 | | | | | | V | V | |
| macOS 10.14 | | | | | | V | V | |
| Zabbix | 6.4 | 6.2 | 6.0 | 5.4 | 5.2 | 5.0 (LTS) | 4.4 | 4.0 (LTS) | 3.0 (LTS) |
|---------------------|-----|-----|-----|-----|-----|-----------|-----|-----------|-----------|
| Red Hat Fam 9 | V | V | V | | | | | | |
| Red Hat Fam 8 | V | V | V | V | V | V | V | | |
| Red Hat Fam 7 | | | | | | V | V | V | V |
| Red Hat Fam 6 | | | | | V | V | | | V |
| Red Hat Fam 5 | | | | | V | V | | | V |
| Fedora | | | | | | | V | V | |
| Ubuntu 20.04 focal | V | V | V | V | V | V | | V | |
| Ubuntu 18.04 bionic | | | V | V | V | V | V | V | |
| Ubuntu 16.04 xenial | | | | | V | V | V | V | |
| Ubuntu 14.04 trusty | | | | | V | V | V | V | V |
| Debian 10 buster | | | V | V | V | V | V | | |
| Debian 9 stretch | | | V | V | V | V | V | V | |
| Debian 8 jessie | | | | | V | V | V | V | V |
| Debian 7 wheezy | | | | | | | | V | V |
| macOS 10.15 | | | | | | | V | V | |
| macOS 10.14 | | | | | | | V | V | |

See https://support.zabbix.com/browse/ZBX-18790 why RHEL7 is not supported anymore.

Expand Down Expand Up @@ -152,6 +152,7 @@ The following is an overview of all available configuration default for this rol
* `zabbix_server_webserviceurl`: URL to Zabbix web service, used to perform web related tasks.
* `zabbix_server_servicemanagersyncfrequency`: How often Zabbix will synchronize configuration of a service manager (in seconds).
* `zabbix_server_problemhousekeepingfrequency`: How often Zabbix will delete problems for deleted triggers (in seconds).
* `zabbix_server_connectors`: Number of pre-forked instances of preprocessing workers.

### High Availability

Expand Down
38 changes: 19 additions & 19 deletions docs/ZABBIX_WEB_ROLE.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,25 +54,25 @@ ansible-galaxy collection install community.general

See the following list of supported Operating Systems with the Zabbix releases.

| Zabbix | 6.2 | 6.0 | 5.4 | 5.2 | 5.0 (LTS) | 4.4 | 4.0 (LTS) | 3.0 (LTS) |
|---------------------|-----|-----|-----|-----|------------|-----|-----------|-----------|
| Red Hat Fam 9 | V | V | | | | | | |
| Red Hat Fam 8 | V | V | V | V | V | V | | |
| Red Hat Fam 7 | | V | V | V | V | V | V | V |
| Red Hat Fam 6 | | | | V | V | | | V |
| Red Hat Fam 5 | | | | V | V | | | V |
| Fedora | | | | | | V | V | |
| Ubuntu 22.04 jammy | V | V | | | | | | |
| Ubuntu 20.04 focal | V | V | V | V | V | V | | |
| Ubuntu 18.04 bionic | | V | V | V | V | V | V | |
| Ubuntu 16.04 xenial | | | | V | V | V | V | |
| Ubuntu 14.04 trusty | | | | V | V | V | V | V |
| Debian 10 buster | | V | V | V | V | V | | |
| Debian 9 stretch | | V | V | V | V | V | V | |
| Debian 8 jessie | | | | V | V | V | V | V |
| Debian 7 wheezy | | | | | | | V | V |
| macOS 10.15 | | | | | | V | V | |
| macOS 10.14 | | | | | | V | V | |
| Zabbix | 6.4 | 6.2 | 6.0 (LTS) | 5.4 | 5.2 | 5.0 (LTS) | 4.4 | 4.0 (LTS) | 3.0 (LTS) |
|---------------------|-----|-----|-----------|-----|-----|------------|-----|-----------|-----------|
| Red Hat Fam 9 | V | V | V | | | | | | |
| Red Hat Fam 8 | V | V | V | V | V | V | V | | |
| Red Hat Fam 7 | | V | V | V | V | V | V | V | V |
| Red Hat Fam 6 | | | | | V | V | | | V |
| Red Hat Fam 5 | | | | | V | V | | | V |
| Fedora | | | | | | | V | V | |
| Ubuntu 22.04 jammy | V | V | V | | | | | | |
| Ubuntu 20.04 focal | V | V | V | V | V | V | V | | |
| Ubuntu 18.04 bionic | | | V | V | V | V | V | V | |
| Ubuntu 16.04 xenial | | | | | V | V | V | V | |
| Ubuntu 14.04 trusty | | | | | V | V | V | V | V |
| Debian 10 buster | V | V | V | V | V | V | V | | |
| Debian 9 stretch | | | V | V | V | V | V | V | |
| Debian 8 jessie | | | | | V | V | V | V | V |
| Debian 7 wheezy | | | | | | | | V | V |
| macOS 10.15 | | | | | | | V | V | |
| macOS 10.14 | | | | | | | V | V | |

# Installation

Expand Down
4 changes: 2 additions & 2 deletions molecule/zabbix_agent_tests/common/tests/common/test_agent.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ def test_zabbix_package(host, zabbix_agent_package):

if host.system_info.distribution == "debian":
if host.system_info.codename in ["bullseye", "focal"]:
assert zabbix_agent_package.version.startswith("1:6.2")
assert zabbix_agent_package.version.startswith("1:6.4")
else:
assert zabbix_agent_package.version.startswith("1:6.0")
if host.system_info.distribution == "centos":
assert zabbix_agent_package.version.startswith("6.2")
assert zabbix_agent_package.version.startswith("6.4")
4 changes: 2 additions & 2 deletions molecule/zabbix_proxy/tests/test_default.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ def test_zabbix_package(host, proxy):
if zabbixhost == proxy:
zabbix_proxy = host.package(proxy)
if host.system_info.distribution in ["debian", "ubuntu"]:
assert zabbix_proxy.version.startswith("1:6.2")
assert zabbix_proxy.version.startswith("1:6.4")
elif host.system_info.distribution == "centos":
assert zabbix_proxy.version.startswith("6.2")
assert zabbix_proxy.version.startswith("6.4")
assert zabbix_proxy.is_installed


Expand Down
4 changes: 2 additions & 2 deletions molecule/zabbix_server/tests/test_default.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ def test_zabbix_package(host, server):
if zabbixhost == server:
zabbix_server = host.package(server)
if host.system_info.distribution in ["debian", "ubuntu"]:
assert zabbix_server.version.startswith("1:6.2")
assert zabbix_server.version.startswith("1:6.4")
elif host.system_info.distribution == "centos":
assert zabbix_server.version.startswith("6.2")
assert zabbix_server.version.startswith("6.4")
assert zabbix_server.is_installed


Expand Down
Loading

0 comments on commit e4bd9d6

Please sign in to comment.