-
-
Notifications
You must be signed in to change notification settings - Fork 230
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.
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
Support fort Zabbix 7.2 #981
base: master
Are you sure you want to change the base?
Conversation
f104712
to
e5147c9
Compare
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. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
use the variable instead add new complexity for standar release every 6 month
@@ -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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why not just use $database_schema_path?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change is a good preparation for the LTS version 8.0.
@@ -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 { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
same as for mysql
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change is a good preparation for the LTS version 8.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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can specify $repo_location
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change is a good preparation for the LTS version 8.0.
@@ -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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
set zabbix_ui_dir as a parameter with the default as /usr/share/zabbix
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change is a good preparation for the LTS version 8.0.
@@ -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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
no test for standard release
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change is a good preparation for the LTS version 8.0.
@@ -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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
no test for standard release
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change is a good preparation for the LTS version 8.0.
@@ -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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
no test for standard release
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change is a good preparation for the LTS version 8.0.
@@ -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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove 7.2 because we only test LTS release
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change is a good preparation for the LTS version 8.0.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change is a good preparation for the LTS version 8.0.
@@ -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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change is a good preparation for the LTS version 8.0.
@@ -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 { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change is a good preparation for the LTS version 8.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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change is a good preparation for the LTS version 8.0.
@@ -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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change is a good preparation for the LTS version 8.0.
@@ -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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change is a good preparation for the LTS version 8.0.
@@ -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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change is a good preparation for the LTS version 8.0.
@@ -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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change is a good preparation for the LTS version 8.0.
@@ -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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change is a good preparation for the LTS version 8.0.
Hi. And, yes, this is in my own interest, because I'd like 7.2 deployed. :) |
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.