Support fort Zabbix 7.2 #981
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Safranil
force-pushed
the
master
branch
2 times, most recently
from
f104712 to
e5147c9
Compare
Safranil
changed the title
Safranil
force-pushed
the
master
branch
2 times, most recently
from
08a00e2 to
2496d29
Compare
|
Hi, actually the module test supports only LTS release of zabbix, due to the short release schedule of that standard one. |
Valantin
requested changes
Jan 27, 2025
| @@ -24,7 +24,9 @@ | |||
| assert_private() | |||
|
|
|||
| if ($database_schema_path == false) or ($database_schema_path == '') { | |||
| if versioncmp($zabbix_version, '6.0') >= 0 { | |||
| if versioncmp($zabbix_version, '7.2') >= 0 { | |||
There was a problem hiding this comment.
why not just use $database_schema_path?
| @@ -25,7 +25,9 @@ | |||
|
|
|||
| if $database_schema_path != false and $database_schema_path != '' { | |||
| $schema_path = $database_schema_path | |||
| } elsif versioncmp($zabbix_version, '6.0') >= 0 { | |||
| } elsif versioncmp($zabbix_version, '7.2') >= 0 { | |||
| @@ -37,7 +37,12 @@ | |||
| } | |||
|
|
|||
| $_repo_location = $repo_location ? { | |||
| undef => "https://repo.zabbix.com/zabbix/${zabbix_version}/rhel/${majorrelease}/\$basearch/", | |||
| undef => versioncmp($zabbix_version, '7.2') ? { | |||
There was a problem hiding this comment.
You can specify $repo_location
| @@ -258,6 +258,13 @@ | |||
|
|
|||
| # Is set to true, it will create the apache vhost. | |||
| if $manage_vhost { | |||
| $zabbix_ui_dir = versioncmp($zabbix_version, '7.2') ? { | |||
There was a problem hiding this comment.
set zabbix_ui_dir as a parameter with the default as /usr/share/zabbix
| @@ -23,7 +23,9 @@ | |||
|
|
|||
| supported_versions.each do |zabbix_version| | |||
| # path to sql files on Debian and RedHat | |||
| path = if Puppet::Util::Package.versioncmp(zabbix_version, '6.0') >= 0 | |||
| path = if Puppet::Util::Package.versioncmp(zabbix_version, '7.2') >= 0 | |||
There was a problem hiding this comment.
no test for standard release
| @@ -28,7 +28,9 @@ | |||
| end | |||
|
|
|||
| supported_versions.each do |zabbix_version| | |||
| path = if Puppet::Util::Package.versioncmp(zabbix_version, '6.0') >= 0 | |||
| path = if Puppet::Util::Package.versioncmp(zabbix_version, '7.2') >= 0 | |||
There was a problem hiding this comment.
no test for standard release
| @@ -137,6 +137,22 @@ | |||
| it { is_expected.to contain_yumrepo('zabbix-nonsupported').with_gpgkey('https://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-B5333005') } if facts[:os]['release']['major'].to_i < 9 | |||
| it { is_expected.to contain_yumrepo('zabbix-nonsupported').with_gpgkey('https://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-08EFA7DD') } if facts[:os]['release']['major'].to_i >= 9 | |||
| end | |||
|
|
|||
There was a problem hiding this comment.
no test for standard release
| @@ -1,7 +1,7 @@ | |||
| # frozen_string_literal: true | |||
|
|
|||
| def supported_versions | |||
| supported_versions = %w[5.0 6.0 7.0] | |||
| supported_versions = %w[5.0 6.0 7.0 7.2] | |||
There was a problem hiding this comment.
remove 7.2 because we only test LTS release
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request (PR) description
Zabbix 7.2 was published some day ago and some structural change was made by Zabbix Team:
https://repo.zabbix.com/zabbix/7.2/release/<os>;/usr/share/zabbix/ui;/usr/share/zabbix/sql-scripts.This Pull Request (PR) fixes the following issues
No issue was opened.