Skip to content

Update Roles to Support 7.4 #1581

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

Merged
pyrodie18 merged 13 commits into from
Jul 6, 2025
Merged

Update Roles to Support 7.4 #1581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
efbf2a5
Initial Try at Server
pyrodie18 Jul 4, 2025
22a7853
Fixed PostgreSQL Install
pyrodie18 Jul 5, 2025
0eed772
First Look at Web
pyrodie18 Jul 5, 2025
1005e1c
Forgot the workflow file
pyrodie18 Jul 5, 2025
5cea843
First Try with Proxy
pyrodie18 Jul 5, 2025
9f518f8
Keep forgetting workflow file
pyrodie18 Jul 5, 2025
b9ce02a
Forgot a var
pyrodie18 Jul 5, 2025
f873334
Java GW
pyrodie18 Jul 5, 2025
b9e75bc
Agent
pyrodie18 Jul 5, 2025
eb80bfb
All done
pyrodie18 Jul 5, 2025
456a1c6
Added Change Fragment
pyrodie18 Jul 6, 2025
f6d6a99
Update initialize-pgsql.yml
pyrodie18 Jul 6, 2025
8b345d6
Standardize Image and Zabbix Versions
pyrodie18 Jul 6, 2025
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
1 change: 1 addition & 0 deletions .github/workflows/agent.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ jobs:
- image: opensuseleap15
ansible_core: ansible-core<2.17
version:
- v74
- v72
- v70
- v60
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/javagateway.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ jobs:
- image: opensuseleap15
ansible_core: ansible-core<2.17
version:
- v74
- v72
- v70
- v60
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/proxy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ jobs:
- pgsql
- sqlite3
version:
- v74
- v72
- v70
- v60
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/server.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,14 @@ jobs:
- mysql
- pgsql
version:
- v74
- v72
- v70
- v60
exclude:
- container:
image: debian11
version: v74
- container:
image: debian11
version: v72
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/web.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,14 @@ jobs:
- nginx
- apache
version:
- v74
- v72
- v70
- v60
exclude:
- container:
image: debian11
version: v74
- container:
image: debian11
version: v72
Expand Down
2 changes: 2 additions & 0 deletions changelogs/fragments/1578.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
major_changes:
- All Roles - Updated to support Zabbix 7.4
6 changes: 4 additions & 2 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 @@ -10,7 +10,7 @@ driver:

platforms:
- name: zabbix-agent-${MY_MOLECULE_CONTAINER:-centos}
image: geerlingguy/docker-${MY_MOLECULE_IMAGE:-rockylinux8}-ansible:latest
image: geerlingguy/docker-${MY_MOLECULE_IMAGE:-rockylinux9}-ansible:latest
command: ${MOLECULE_DOCKER_COMMAND:-""}
privileged: true
pre_build_image: true
Expand All @@ -21,7 +21,7 @@ platforms:
cgroupns_mode: host
groups:
- agent
- ${MY_MOLECULE_VERSION:-v72}
- ${MY_MOLECULE_VERSION:-v74}

provisioner:
name: ansible
Expand All @@ -48,6 +48,8 @@ provisioner:
zabbix_agent_tlscafile: /etc/zabbix/ca
zabbix_repo_apt_priority: 1
zabbix_repo_yum_gpg_check: 1
v74:
zabbix_agent_version: 7.4
v72:
zabbix_agent_version: 7.2
v70:
Expand Down
8 changes: 5 additions & 3 deletions molecule/zabbix_javagateway/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ driver:
name: default

platforms:
- name: zabbix-jgw-${MY_MOLECULE_VERSION:-v72}-${MY_MOLECULE_CONTAINER:-rockylinux8}
image: geerlingguy/docker-${MY_MOLECULE_IMAGE:-rockylinux8}-ansible:latest
- name: zabbix-jgw-${MY_MOLECULE_VERSION:-v74}-${MY_MOLECULE_CONTAINER:-rockylinux9}
image: geerlingguy/docker-${MY_MOLECULE_IMAGE:-rockylinux9}-ansible:latest
privileged: true
pre_build_image: true
command: ${MOLECULE_DOCKER_COMMAND:-""}
Expand All @@ -20,7 +20,7 @@ platforms:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
cgroupns_mode: host
groups:
- ${MY_MOLECULE_VERSION:-v72}
- ${MY_MOLECULE_VERSION:-v74}

provisioner:
name: ansible
Expand All @@ -37,6 +37,8 @@ provisioner:
ansible_connection: community.docker.docker
zabbix_repo_apt_priority: 1
zabbix_repo_yum_gpg_check: 1
v74:
zabbix_javagateway_version: 7.4
v72:
zabbix_javagateway_version: 7.2
v70:
Expand Down
1 change: 1 addition & 0 deletions molecule/zabbix_proxy/create.docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
v60: 6.0
v70: 7.0
v72: 7.2
v74: 7.4

- name: Create database container for Zabbix server
community.docker.docker_container:
Expand Down
10 changes: 6 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 @@ -9,8 +9,8 @@ driver:
name: default

platforms:
- name: zabbix-proxy-${MY_MOLECULE_VERSION:-v72}-${MY_MOLECULE_DATABASE:-mysql}-${MY_MOLECULE_CONTAINER:-rockylinux8}
image: geerlingguy/docker-${MY_MOLECULE_IMAGE:-rockylinux8}-ansible:latest
- name: zabbix-proxy-${MY_MOLECULE_VERSION:-v74}-${MY_MOLECULE_DATABASE:-mysql}-${MY_MOLECULE_CONTAINER:-rockylinux9}
image: geerlingguy/docker-${MY_MOLECULE_IMAGE:-rockylinux9}-ansible:latest
privileged: true
pre_build_image: true
command: ${MOLECULE_DOCKER_COMMAND:-""}
Expand All @@ -19,10 +19,10 @@ platforms:
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
cgroupns_mode: host
zabbix_proxy_version: ${MY_MOLECULE_VERSION:-v70}
zabbix_proxy_version: ${MY_MOLECULE_VERSION:-v74}
groups:
- ${MY_MOLECULE_DATABASE:-mysql}
- ${MY_MOLECULE_VERSION:-v72}
- ${MY_MOLECULE_VERSION:-v74}

provisioner:
name: ansible
Expand All @@ -44,6 +44,8 @@ provisioner:
zabbix_api_server_port: 8080
ansible_zabbix_url_path: ""
zabbix_proxy_configfrequency: 10
v74:
zabbix_proxy_version: 7.4
v72:
zabbix_proxy_version: 7.2
v70:
Expand Down
10 changes: 6 additions & 4 deletions molecule/zabbix_proxy_psk/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ driver:
name: default

platforms:
- name: zabbix-proxy-psk-${MY_MOLECULE_VERSION:-v72}-${MY_MOLECULE_DATABASE:-mysql}-${MY_MOLECULE_CONTAINER:-rockylinux8}
image: geerlingguy/docker-${MY_MOLECULE_IMAGE:-rockylinux8}-ansible:latest
- name: zabbix-proxy-psk-${MY_MOLECULE_VERSION:-v74}-${MY_MOLECULE_DATABASE:-mysql}-${MY_MOLECULE_CONTAINER:-rockylinux9}
image: geerlingguy/docker-${MY_MOLECULE_IMAGE:-rockylinux9}-ansible:latest
privileged: true
pre_build_image: true
command: ${MOLECULE_DOCKER_COMMAND:-""}
Expand All @@ -19,10 +19,10 @@ platforms:
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
cgroupns_mode: host
zabbix_proxy_version: ${MY_MOLECULE_VERSION:-v70}
zabbix_proxy_version: ${MY_MOLECULE_VERSION:-v74}
groups:
- ${MY_MOLECULE_DATABASE:-mysql}
- ${MY_MOLECULE_VERSION:-v72}
- ${MY_MOLECULE_VERSION:-v74}

provisioner:
name: ansible
Expand Down Expand Up @@ -51,6 +51,8 @@ provisioner:
zabbix_proxy_tlspskfile: "/home/zabbix/proxy_psk"
zabbix_proxy_tlspskidentity: "PSK {{ inventory_hostname }}"
zabbix_proxy_tlspsk_secret: 'f1447b20c0243f3304062d3641fe7e341eb0106bd1adb4273f21659a7717ae6f'
v74:
zabbix_proxy_version: 7.4
v72:
zabbix_proxy_version: 7.2
v70:
Expand Down
12 changes: 7 additions & 5 deletions molecule/zabbix_proxy_psk_active/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ driver:
name: default

platforms:
- name: zabbix-proxy-psk-active-${MY_MOLECULE_VERSION:-v72}-${MY_MOLECULE_DATABASE:-mysql}-${MY_MOLECULE_CONTAINER:-rockylinux8}
image: geerlingguy/docker-${MY_MOLECULE_IMAGE:-rockylinux8}-ansible:latest
- name: zabbix-proxy-psk-active-${MY_MOLECULE_VERSION:-v74}-${MY_MOLECULE_DATABASE:-mysql}-${MY_MOLECULE_CONTAINER:-rockylinux9}
image: geerlingguy/docker-${MY_MOLECULE_IMAGE:-rockylinux9}-ansible:latest
privileged: true
pre_build_image: true
command: ${MOLECULE_DOCKER_COMMAND:-""}
Expand All @@ -19,10 +19,10 @@ platforms:
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
cgroupns_mode: host
zabbix_proxy_version: ${MY_MOLECULE_VERSION:-v70}
zabbix_proxy_version: ${MY_MOLECULE_VERSION:-v74}
groups:
- ${MY_MOLECULE_DATABASE:-mysql}
- ${MY_MOLECULE_VERSION:-v72}
- ${MY_MOLECULE_VERSION:-v74}

provisioner:
name: ansible
Expand All @@ -44,14 +44,16 @@ provisioner:
zabbix_proxy_hostname: proxy1
zabbix_api_server_port: 8080
ansible_zabbix_url_path: ""
zabbix_proxy_server: zabbix-proxy-psk-active-${MY_MOLECULE_VERSION:-v72}-${MY_MOLECULE_DATABASE:-mysql}-${MY_MOLECULE_CONTAINER:-rockylinux8}-zserver
zabbix_proxy_server: zabbix-proxy-psk-active-${MY_MOLECULE_VERSION:-v72}-${MY_MOLECULE_DATABASE:-mysql}-${MY_MOLECULE_CONTAINER:-rockylinux9}-zserver
zabbix_proxy_proxymode: 0
zabbix_proxy_status: active
zabbix_proxy_configfrequency: 10
zabbix_proxy_tlsconnect: psk
zabbix_proxy_tlspskfile: "/home/zabbix/proxy_psk"
zabbix_proxy_tlspskidentity: "PSK {{ inventory_hostname }}"
zabbix_proxy_tlspsk_secret: 'f1447b20c0243f3304062d3641fe7e341eb0106bd1adb4273f21659a7717ae6f'
v74:
zabbix_proxy_version: 7.4
v72:
zabbix_proxy_version: 7.2
v70:
Expand Down
6 changes: 3 additions & 3 deletions molecule/zabbix_repo/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ driver:
name: default

platforms:
- name: zabbix-repo-${MY_MOLECULE_VERSION:-v72}-${MY_MOLECULE_CONTAINER:-rockylinux8}
image: geerlingguy/docker-${MY_MOLECULE_IMAGE:-rockylinux8}-ansible:latest
- name: zabbix-repo-${MY_MOLECULE_VERSION:-v74}-${MY_MOLECULE_CONTAINER:-rockylinux9}
image: geerlingguy/docker-${MY_MOLECULE_IMAGE:-rockylinux9}-ansible:latest
privileged: true
pre_build_image: true
command: ${MOLECULE_DOCKER_COMMAND:-""}
Expand All @@ -20,7 +20,7 @@ platforms:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
cgroupns_mode: host
groups:
- ${MY_MOLECULE_VERSION:-v72}
- ${MY_MOLECULE_VERSION:-v74}

provisioner:
name: ansible
Expand Down
8 changes: 5 additions & 3 deletions molecule/zabbix_server/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ driver:
name: default

platforms:
- name: zabbix-server-${MY_MOLECULE_VERSION:-v72}-${MY_MOLECULE_DATABASE:-mysql}-${MY_MOLECULE_CONTAINER:-rockylinux8}
image: geerlingguy/docker-${MY_MOLECULE_IMAGE:-rockylinux8}-ansible:latest
- name: zabbix-server-${MY_MOLECULE_VERSION:-v74}-${MY_MOLECULE_DATABASE:-mysql}-${MY_MOLECULE_CONTAINER:-rockylinux9}
image: geerlingguy/docker-${MY_MOLECULE_IMAGE:-rockylinux9}-ansible:latest
privileged: true
pre_build_image: true
command: ${MOLECULE_DOCKER_COMMAND:-""}
Expand All @@ -21,7 +21,7 @@ platforms:
cgroupns_mode: host
groups:
- ${MY_MOLECULE_DATABASE:-mysql}
- ${MY_MOLECULE_VERSION:-v72}
- ${MY_MOLECULE_VERSION:-v74}

provisioner:
name: ansible
Expand All @@ -38,6 +38,8 @@ provisioner:
ansible_connection: community.docker.docker
zabbix_repo_apt_priority: 1
zabbix_repo_yum_gpg_check: 1
v74:
zabbix_server_version: 7.4
v72:
zabbix_server_version: 7.2
v70:
Expand Down
9 changes: 6 additions & 3 deletions molecule/zabbix_web/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ driver:
name: default

platforms:
- name: zabbix-web-${MY_MOLECULE_VERSION:-v72}-${MY_MOLECULE_DATABASE:-mysql}-${MY_MOLECULE_CONTAINER:-rockylinux9}
- name: zabbix-web-${MY_MOLECULE_VERSION:-v74}-${MY_MOLECULE_DATABASE:-mysql}-${MY_MOLECULE_CONTAINER:-rockylinux9}
image: geerlingguy/docker-${MY_MOLECULE_IMAGE:-rockylinux9}-ansible:latest
privileged: true
pre_build_image: true
Expand All @@ -22,7 +22,7 @@ platforms:
cgroupns_mode: host
groups:
- ${MY_MOLECULE_DATABASE:-mysql}
- ${MY_MOLECULE_VERSION:-v72}
- ${MY_MOLECULE_VERSION:-v74}
- ${MY_MOLECULE_WEB_SERVER:-apache}

provisioner:
Expand All @@ -38,9 +38,12 @@ provisioner:
group_vars:
all:
ansible_connection: community.docker.docker
zabbix_api_server_url: zabbix-web-${MY_MOLECULE_VERSION:-v72}-${MY_MOLECULE_DATABASE:-mysql}-${MY_MOLECULE_CONTAINER:-rockylinux9}
zabbix_api_server_url: zabbix-web-${MY_MOLECULE_VERSION:-v74}-${MY_MOLECULE_DATABASE:-mysql}-${MY_MOLECULE_CONTAINER:-rockylinux9}
zabbix_repo_apt_priority: 1
zabbix_repo_yum_gpg_check: 1
v74:
zabbix_server_version: 7.4
zabbix_web_version: 7.4
v72:
zabbix_server_version: 7.2
zabbix_web_version: 7.2
Expand Down
9 changes: 4 additions & 5 deletions roles/zabbix_agent/vars/Debian.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,25 @@ _zabbix_agent_install_recommends: false
zabbix_valid_agent_versions:
# Debian
"12":
- 7.4
- 7.2
- 7.0
- 6.0

"11":
- 7.2
- 7.0
- 6.0

"9":
- 7.4
- 7.2
- 7.0
- 6.0
# Ubuntu
"24":
- 7.4
- 7.2
- 7.0
- 6.0

"22":
- 7.4
- 7.2
- 7.0
- 6.0
2 changes: 2 additions & 0 deletions roles/zabbix_agent/vars/RedHat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@ _zabbix_agent_disable_repo:

zabbix_valid_agent_versions:
"9":
- 7.4
- 7.2
- 7.0
- 6.0
"8":
- 7.4
- 7.2
- 7.0
- 6.0
5 changes: 1 addition & 4 deletions roles/zabbix_agent/vars/Suse.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@ zabbix_agent2_conf: zabbix_agent2.conf

zabbix_valid_agent_versions:
# SLES
"12":
- 7.2
- 7.0
- 6.0
"15":
- 7.4
- 7.2
- 7.0
- 6.0
4 changes: 4 additions & 0 deletions roles/zabbix_javagateway/vars/Debian.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@
zabbix_valid_javagateway_versions:
# Debian
"12":
- 7.4
- 7.2
- 7.0
- 6.0
"11":
- 7.4
- 7.2
- 7.0
- 6.0

# Ubuntu
"24":
- 7.4
- 7.2
- 7.0
- 6.0
"22":
- 7.4
- 7.2
- 7.0
- 6.0
Expand Down
Loading
Loading