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

Support fort Zabbix 7.2 #981

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support fort Zabbix 7.2 #981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ jobs:
name: Puppet
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v3
with:
beaker_facter: 'zabbix_version:Zabbix:5.0,6.0,7.0'
beaker_facter: 'zabbix_version:Zabbix:5.0,6.0,7.0,7.2'
unit_runs_on: 'cern-self-hosted'
2 changes: 1 addition & 1 deletion .sync.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ spec/spec_helper.rb:
- parameter_documentation
.github/workflows/ci.yml:
with:
beaker_facter: 'zabbix_version:Zabbix:5.0,6.0,7.0'
beaker_facter: 'zabbix_version:Zabbix:5.0,6.0,7.0,7.2'
unit_runs_on: 'cern-self-hosted'
4 changes: 3 additions & 1 deletion manifests/database/mysql.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Copy link
Contributor

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?

$schema_path = '/usr/share/zabbix/sql-scripts/mysql/'
} elsif versioncmp($zabbix_version, '6.0') >= 0 {
$schema_path = '/usr/share/zabbix-sql-scripts/mysql/'
} else {
$schema_path = '/usr/share/doc/zabbix-*-mysql*'
Expand Down
4 changes: 3 additions & 1 deletion manifests/database/postgresql.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as for mysql

$schema_path = '/usr/share/zabbix/sql-scripts/postgresql/'
} elsif versioncmp($zabbix_version, '6.0') >= 0 {
$schema_path = '/usr/share/zabbix-sql-scripts/postgresql/'
} elsif $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '7' {
$schema_path = "/usr/share/doc/zabbix-*-pgsql-${zabbix_version}*/"
Expand Down
14 changes: 12 additions & 2 deletions manifests/repo.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') ? {
Copy link
Contributor

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

# Version older than 7.2
-1 => "https://repo.zabbix.com/zabbix/${zabbix_version}/rhel/${majorrelease}/\$basearch/",
# Version 7.2 and newer
default => "https://repo.zabbix.com/zabbix/${zabbix_version}/stable/rhel/${majorrelease}/\$basearch/",
},
default => $repo_location,
}

Expand Down Expand Up @@ -87,7 +92,12 @@
}

$_repo_location = $repo_location ? {
undef => "http://repo.zabbix.com/zabbix/${zabbix_version}/${operatingsystem}/",
undef => versioncmp($zabbix_version, '7.2') ? {
# Version older than 7.2
-1 => "http://repo.zabbix.com/zabbix/${zabbix_version}/${operatingsystem}/",
# Version 7.2 and newer
default => "http://repo.zabbix.com/zabbix/${zabbix_version}/stable/${operatingsystem}/",
},
default => $repo_location,
}

Expand Down
23 changes: 15 additions & 8 deletions manifests/web.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') ? {
Copy link
Contributor

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

# Version older than 7.2
-1 => '/usr/share/zabbix',
# Version 7.2 and newer
default => '/usr/share/zabbix/ui',
}

include apache
include apache::mod::dir
if $facts['os']['family'] == 'RedHat' {
Expand All @@ -277,7 +284,7 @@
}

$fcgi_filematch = {
path => '/usr/share/zabbix',
path => $zabbix_ui_dir,
provider => 'directory',
addhandlers => [
{
Expand Down Expand Up @@ -319,7 +326,7 @@
# We create nonssl vhost for redirecting non ssl
# traffic to https.
apache::vhost { "${zabbix_url}_nonssl":
docroot => '/usr/share/zabbix',
docroot => $zabbix_ui_dir,
manage_docroot => false,
default_vhost => $default_vhost,
port => $apache_listenport,
Expand All @@ -344,35 +351,35 @@
}

apache::vhost { $zabbix_url:
docroot => '/usr/share/zabbix',
docroot => $zabbix_ui_dir,
ip => $apache_listen_ip,
port => $apache_listen_port,
default_vhost => $default_vhost,
add_listen => true,
directories => [
merge({
path => '/usr/share/zabbix',
path => $zabbix_ui_dir,
provider => 'directory',
require => 'all granted',
}, $fcgi_filematch
),
{
path => '/usr/share/zabbix/conf',
path => "${zabbix_ui_dir}/conf",
provider => 'directory',
require => 'all denied',
},
{
path => '/usr/share/zabbix/api',
path => "${zabbix_ui_dir}/api",
provider => 'directory',
require => 'all denied',
},
{
path => '/usr/share/zabbix/include',
path => "${zabbix_ui_dir}/include",
provider => 'directory',
require => 'all denied',
},
{
path => '/usr/share/zabbix/include/classes',
path => "${zabbix_ui_dir}/include/classes",
provider => 'directory',
require => 'all denied',
},
Expand Down
4 changes: 3 additions & 1 deletion spec/classes/database_mysql_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

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

'/usr/share/zabbix/sql-scripts/mysql/'
elsif Puppet::Util::Package.versioncmp(zabbix_version, '6.0') >= 0
'/usr/share/zabbix-sql-scripts/mysql/'
else
'/usr/share/doc/zabbix-*-mysql*'
Expand Down
4 changes: 3 additions & 1 deletion spec/classes/database_postgresql_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

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

'/usr/share/zabbix/sql-scripts/postgresql/'
elsif Puppet::Util::Package.versioncmp(zabbix_version, '6.0') >= 0
'/usr/share/zabbix-sql-scripts/postgresql/'
else
'/usr/share/doc/zabbix-*-pgsql'
Expand Down
16 changes: 16 additions & 0 deletions spec/classes/repo_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Copy link
Contributor

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

context "on RedHat #{major} and Zabbix 7.2" do
let :params do
{
zabbix_version: '7.2',
manage_repo: true
}
end

it { is_expected.to contain_yumrepo('zabbix').with_baseurl("https://repo.zabbix.com/zabbix/7.2/stable/rhel/#{major}/$basearch/") }
it { is_expected.to contain_yumrepo('zabbix').with_gpgkey('https://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-B5333005') }
it { is_expected.to contain_yumrepo('zabbix-nonsupported').with_baseurl("https://repo.zabbix.com/non-supported/rhel/#{major}/$basearch/") }

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
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion spec/support/acceptance/supported_versions.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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]
Copy link
Contributor

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

# this is a hack so that we don't have to rewrite the existing acceptance tests
if (beaker_zabbix_version = ENV.fetch('BEAKER_FACTER_zabbix_version', nil))
supported_versions &= [beaker_zabbix_version]
Expand Down
Loading