Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove old versions from roles #1107

Merged
merged 10 commits into from
Oct 22, 2023
Merged

Remove old versions from roles #1107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
334f5bb
updated workfl.ows
pyrodie18 Oct 6, 2023
7082cd2
updated docs
pyrodie18 Oct 6, 2023
aa9c61d
cleanup agent
pyrodie18 Oct 6, 2023
eedf74b
Cleanup JavaGW
pyrodie18 Oct 6, 2023
04dfe97
Cleanup Proxy
pyrodie18 Oct 6, 2023
f346cdb
Cleanup Server
pyrodie18 Oct 6, 2023
32b3317
Cleanup Web
pyrodie18 Oct 6, 2023
b9cd111
Removed Old Versions of Zabbix
pyrodie18 Oct 22, 2023
da21dd4
Merge branch '3.0.0' into remove_old_versions_from_roles
pyrodie18 Oct 22, 2023
6ad0557
removed left over tasks from < 6.0
pyrodie18 Oct 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions .github/workflows/agent.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,19 @@ jobs:
container:
- rockylinux9
- rockylinux8
- centos7
- ubuntu2204
- ubuntu2004
- debian12
- debian11
- debian10
version:
- v64
- v62
- v60
scenario_name:
- default
- autopsk
- agent2
- agent2autopsk
exclude:
- container: debian12
version: v62

steps:
- name: Check out code
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/javagateway.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,11 @@ jobs:
- debian11
- debian10
version:
- v64
- v62
- v60
include:
- interpreter: python3
- interpreter: python
container: centos7
exclude:
- container: debian12
version: v62
collection_role:
- zabbix_javagateway
steps:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/plugins-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ jobs:
matrix:
zabbix_container:
- version: "6.0"
- version: "6.2"
- version: "6.4"
ansible:
# https://docs.ansible.com/ansible/latest/reference_appendices/release_and_maintenance.html#ansible-core-changelogs
- stable-2.12
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/proxy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ jobs:
- pgsql
- sqlite3
version:
- v64
- v62
- v60
include:
- interpreter: python3
Expand Down
9 changes: 0 additions & 9 deletions .github/workflows/server.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,9 @@ jobs:
- mysql
- pgsql
version:
- v64
- v62
- v60
include:
- interpreter: python3
exclude:
- container: debian12
version: v62
- container: debian10
version: v62
- container: debian10
version: v64
steps:
- name: Check out code
uses: actions/checkout@v4
Expand Down
9 changes: 0 additions & 9 deletions .github/workflows/web.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,9 @@ jobs:
web_server:
- nginx
version:
- v64
- v62
- v60
include:
- interpreter: python3
exclude:
- container: debian10
version: v62
- container: debian10
version: v64
- container: debian12
version: v62
steps:
- name: Check out code
uses: actions/checkout@v4
Expand Down
20 changes: 10 additions & 10 deletions docs/ZABBIX_AGENT_ROLE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 10 additions & 10 deletions docs/ZABBIX_JAVAGATEWAY_ROLE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
20 changes: 10 additions & 10 deletions docs/ZABBIX_PROXY_ROLE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
18 changes: 9 additions & 9 deletions docs/ZABBIX_SERVER_ROLE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
18 changes: 9 additions & 9 deletions docs/ZABBIX_WEB_ROLE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,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 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

Expand Down
4 changes: 0 additions & 4 deletions molecule/zabbix_agent_tests/common/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ provisioner:
zabbix_agent_listenip: 0.0.0.0
zabbix_agent_tlsconnect: psk
zabbix_agent_tlsaccept: psk
v64:
zabbix_agent_version: 6.4
v62:
zabbix_agent_version: 6.2
v60:
zabbix_agent_version: 6.0
scenario:
Expand Down
4 changes: 0 additions & 4 deletions molecule/zabbix_javagateway/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@ provisioner:
ansible_python_interpreter: /usr/bin/python3
python:
ansible_python_interpreter: /usr/bin/python
v64:
zabbix_javagateway_version: 6.4
v62:
zabbix_javagateway_version: 6.2
v60:
zabbix_javagateway_version: 6.0

Expand Down
4 changes: 0 additions & 4 deletions molecule/zabbix_proxy/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@ provisioner:
ansible_python_interpreter: /usr/bin/python3
python:
ansible_python_interpreter: /usr/bin/python
v64:
zabbix_proxy_version: 6.4
v62:
zabbix_proxy_version: 6.2
v60:
zabbix_proxy_version: 6.0
mysql:
Expand Down
6 changes: 0 additions & 6 deletions molecule/zabbix_server/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,8 @@ provisioner:
ansible_python_interpreter: /usr/bin/python3
python:
ansible_python_interpreter: /usr/bin/python
v64:
zabbix_server_version: 6.4
v62:
zabbix_server_version: 6.2
v60:
zabbix_server_version: 6.0
v50:
zabbix_server_version: 5.0
mysql:
zabbix_server_dbname: zabbix
zabbix_server_dbuser: zabbix-dbuser
Expand Down
6 changes: 0 additions & 6 deletions molecule/zabbix_web/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,6 @@ provisioner:
ansible_python_interpreter: /usr/bin/python3
python:
ansible_python_interpreter: /usr/bin/python
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
Expand Down
2 changes: 1 addition & 1 deletion roles/zabbix_agent/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

- name: Determine Latest Supported Zabbix Version
ansible.builtin.set_fact:
zabbix_agent_version: "{{ zabbix_valid_agent_versions[ansible_distribution_major_version][0] | default(6.4) }}"
zabbix_agent_version: "{{ zabbix_valid_agent_versions[ansible_distribution_major_version][0] | default(6.0) }}"
when: zabbix_agent_version is not defined or zabbix_agent_version is none
tags:
- always
Expand Down
2 changes: 0 additions & 2 deletions roles/zabbix_agent/templates/zabbix_agent2.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,6 @@ Plugins.{{ my_name }}.{{ param }}={{ value }}
{% endfor %}
{% endfor %}
{% endif %}
{% if zabbix_agent_version is version('6.0', '>=') %}
{% if zabbix_agent2_listenbacklog is defined and zabbix_agent2_listenbacklog %}
ListenBacklog={{ zabbix_agent2_listenbacklog }}
{% endif %}
{% endif %}
8 changes: 1 addition & 7 deletions roles/zabbix_agent/templates/zabbix_agentd.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@
{% if ansible_os_family != "Windows" %}
PidFile={{ zabbix_agent_pidfile }}
{% endif %}
{% if zabbix_agent_version is version('3.0', '>=') %}
LogType={{ zabbix_agent_logtype }}
{% endif %}
{% if ansible_os_family == "Windows" %}
LogFile={{ zabbix_agent_win_logfile }}
{% else %}
Expand Down Expand Up @@ -66,7 +64,7 @@ RefreshActiveChecks={{ zabbix_agent_refreshactivechecks }}
BufferSend={{ zabbix_agent_buffersend }}
BufferSize={{ zabbix_agent_buffersize }}
MaxLinesPerSecond={{ zabbix_agent_maxlinespersecond }}
{% if zabbix_agent_version is version_compare('6.2', '>=') %}
{% if zabbix_agent_version is version_compare('6.0', '>') %}
HeartbeatFrequency={{ zabbix_agent_heartbeatfrequency }}
{% endif %}
{% if zabbix_agent_zabbix_alias is defined and zabbix_agent_zabbix_alias %}
Expand Down Expand Up @@ -96,11 +94,9 @@ Include={{ include }}
{% endfor %}
{% endif %}
UnsafeUserParameters={{ zabbix_agent_unsafeuserparameters }}
{% if zabbix_agent_version is version_compare('2.2', '>=') %}
{% if ansible_os_family != "Windows" %}
LoadModulePath={{ zabbix_agent_loadmodulepath }}
{% endif %}
{% endif %}
{% if zabbix_agent_loadmodule is defined and zabbix_agent_loadmodule %}
{% if zabbix_agent_loadmodule is string %}
LoadModule={{ zabbix_agent_loadmodule }}
Expand Down Expand Up @@ -142,8 +138,6 @@ TLSPSKIdentity={{ zabbix_agent_tlspskidentity }}
TLSPSKFile={{ zabbix_agent_tlspskfile }}
{% endif %}
{% endif %}
{% if zabbix_agent_version is version('6.0', '>=') %}
{% if zabbix_agent_listenbacklog is defined and zabbix_agent_listenbacklog %}
ListenBacklog={{ zabbix_agent_listenbacklog }}
{% endif %}
{% endif %}
14 changes: 0 additions & 14 deletions roles/zabbix_agent/vars/Debian.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
Loading