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

Jump to bottom

Remove unsupported OS #957

Merged
merged 7 commits into from
Jun 28, 2024
Merged

Remove unsupported OS #957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8b071c2
Change manage_startup_script default to false
Valantin Jun 27, 2024
7f1df97
Remove VirtuozzoLinux from supported OS
Valantin Jun 27, 2024
f61c84b
Remove XenServer from supported OS
Valantin Jun 27, 2024
c011f23
Remove CloudLinux from supported OS
Valantin Jun 27, 2024
1456de4
Remove Scientific from supported OS
Valantin Jun 27, 2024
f096892
Remove Amazon from supported OS
Valantin Jun 27, 2024
f00c8c9
Remove Centos 8 from supported OS
Valantin Jun 27, 2024
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
13 changes: 7 additions & 6 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
$server_zabbix_user = 'zabbix'
$zabbix_package_provider = undef
$agent_loadmodulepath = '/usr/lib/modules'
$manage_startup_script = false
}
'AIX': {
$manage_repo = false
Expand All @@ -32,6 +33,7 @@
$agent_config_group = 'zabbix'
$agent_pidfile = '/var/run/zabbix/zabbix_agentd.pid'
$agent_servicename = 'zabbix-agent'
$manage_startup_script = true
}
'Archlinux': {
$server_fpinglocation = '/usr/bin/fping'
Expand All @@ -51,6 +53,7 @@
$server_zabbix_user = 'zabbix-server'
$zabbix_package_provider = undef
$agent_loadmodulepath = '/usr/lib/modules'
$manage_startup_script = false
}
'FreeBSD': {
$manage_repo = false
Expand All @@ -66,6 +69,7 @@
$server_zabbix_user = 'zabbix'
$zabbix_package_provider = undef
$agent_loadmodulepath = '/usr/local/lib/zabbix/modules'
$manage_startup_script = false
}
'Gentoo': {
$server_fpinglocation = '/usr/sbin/fping'
Expand All @@ -85,6 +89,7 @@
$server_zabbix_user = 'zabbix'
$zabbix_package_provider = undef
$agent_loadmodulepath = '/usr/lib/modules'
$manage_startup_script = false
}
'windows': {
$manage_repo = false
Expand All @@ -99,6 +104,7 @@
$agent_servicename = 'Zabbix Agent'
$agent_include = 'C:/ProgramData/zabbix/zabbix_agentd.d'
$agent_loadmodulepath = undef
$manage_startup_script = false
}
default : {
$server_fpinglocation = '/usr/sbin/fping'
Expand All @@ -118,6 +124,7 @@
$server_zabbix_user = 'zabbix'
$zabbix_package_provider = undef
$agent_loadmodulepath = '/usr/lib/modules'
$manage_startup_script = false
}
}

Expand All @@ -129,12 +136,6 @@
$zabbix_version = '6.0'
}

$manage_startup_script = downcase($facts['kernel']) ? {
'windows' => false,
'FreeBSD' => false,
default => true,
}

$zabbix_package_state = 'present'
$zabbix_proxy = 'localhost'
$zabbix_proxy_ip = '127.0.0.1'
Expand Down
12 changes: 1 addition & 11 deletions manifests/repo.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,9 @@
String[1] $zabbix_version = $zabbix::params::zabbix_version,
) inherits zabbix::params {
if $manage_repo {
case $facts['os']['name'] {
'PSBM': {
$majorrelease = '6'
}
'Amazon': {
$majorrelease = '6'
}
default: {
$majorrelease = $facts['os']['release']['major']
}
}
case $facts['os']['family'] {
'RedHat': {
$majorrelease = $facts['os']['release']['major']
if (versioncmp(fact('os.release.major'), '7') >= 0 and $zabbix_version == '7.0') {
Copy link
Member

Choose a reason for hiding this comment

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

you can use $majorrelease here

Suggested change
if (versioncmp(fact('os.release.major'), '7') >= 0 and $zabbix_version == '7.0') {
if (versioncmp($majorrelease, '7') >= 0 and $zabbix_version == '7.0') {

$gpgkey_zabbix = 'https://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-B5333005'
$gpgkey_nonsupported = 'https://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-B5333005'
Expand Down
34 changes: 0 additions & 34 deletions metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,6 @@
"9"
]
},
{
"operatingsystem": "Amazon",
"operatingsystemrelease": [
"7",
"8"
]
},
{
"operatingsystem": "OracleLinux",
"operatingsystemrelease": [
Expand All @@ -79,18 +72,10 @@
"9"
]
},
{
"operatingsystem": "Scientific",
"operatingsystemrelease": [
"7",
"8"
]
},
{
"operatingsystem": "CentOS",
"operatingsystemrelease": [
"7",
Copy link
Member

Choose a reason for hiding this comment

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

CentOS 7 is also EoL: https://voxpupuli.org/blog/2024/05/08/CentOS-7-CentOS-Stream-8-deprecation/

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes I'v planned to remove EL7 code and OS in a separe PR, need to remove a lot of unused logic from manifest and spec

"8",
"9"
]
},
Expand All @@ -108,19 +93,6 @@
"9"
]
},
{
"operatingsystem": "CloudLinux",
"operatingsystemrelease": [
"7",
"8"
]
},
{
"operatingsystem": "XenServer",
"operatingsystemrelease": [
"6"
]
},
{
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
Expand All @@ -135,12 +107,6 @@
"12"
]
},
{
"operatingsystem": "VirtuozzoLinux",
"operatingsystemrelease": [
"7"
]
},
{
"operatingsystem": "Archlinux"
},
Expand Down
51 changes: 29 additions & 22 deletions spec/classes/agent_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,10 @@
is_expected.to contain_service(service_name).
with_ensure('running').
with_enable(true).
with_service_provider(facts[:os]['family'] == 'AIX' ? 'init' : nil).
that_requires(["Package[#{package_name}]", "Zabbix::Startup[#{service_name}]"])
with_service_provider(facts[:os]['family'] == 'AIX' ? 'init' : nil)
end

it { is_expected.to contain_zabbix__startup(service_name).that_requires("Package[#{package_name}]") }
it { is_expected.not_to contain_zabbix__startup(service_name) }
it { is_expected.to compile.with_all_deps }
it { is_expected.to contain_class('zabbix::params') }
end
Expand Down Expand Up @@ -218,29 +217,37 @@
it { is_expected.not_to contain_firewall('150 zabbix-agent from 10.11.12.13') }
end

context 'it creates a startup script' do
if facts[:kernel] == 'Linux'
case facts[:os]['family']
when 'Archlinux', 'Debian', 'Gentoo', 'RedHat'
it { is_expected.to contain_file("/etc/init.d/#{service_name}").with_ensure('absent') }
it { is_expected.to contain_file("/etc/systemd/system/#{service_name}.service").with_ensure('file') }
when 'windows'
it { is_expected.to contain_exec("install_agent_#{service_name}") }
else
it { is_expected.to contain_file("/etc/init.d/#{service_name}").with_ensure('file') }
it { is_expected.not_to contain_file("/etc/systemd/system/#{service_name}.service") }
end
end
end

context 'when declaring manage_startup_script is false' do
context 'when declaring manage_startup_script is true' do
let :params do
{
manage_startup_script: false
manage_startup_script: true
}
end

it { is_expected.not_to contain_zabbix__startup(service_name) }
context 'it creates a startup script' do
if facts[:kernel] == 'Linux'
case facts[:os]['family']
when 'Archlinux', 'Debian', 'Gentoo', 'RedHat'
it { is_expected.to contain_file("/etc/init.d/#{service_name}").with_ensure('absent') }
it { is_expected.to contain_file("/etc/systemd/system/#{service_name}.service").with_ensure('file') }
when 'windows'
it { is_expected.to contain_exec("install_agent_#{service_name}") }
else
it { is_expected.to contain_file("/etc/init.d/#{service_name}").with_ensure('file') }
it { is_expected.not_to contain_file("/etc/systemd/system/#{service_name}.service") }
end
end
end

it do
is_expected.to contain_service(service_name).
with_ensure('running').
with_enable(true).
with_service_provider(facts[:os]['family'] == 'AIX' ? 'init' : nil).
that_requires(["Package[#{package_name}]", "Zabbix::Startup[#{service_name}]"])
end

it { is_expected.to contain_zabbix__startup(service_name).that_requires("Package[#{package_name}]") }
end

context 'when declaring zabbix_alias' do
Expand Down Expand Up @@ -460,13 +467,13 @@
end
end

describe 'with systemd active' do
describe 'with systemd active', skip: 'user package provided instead systemd::unit_file ' do
if facts[:kernel] == 'Linux'
let :facts do
super().merge(systemd: true)
end

it { is_expected.to contain_systemd__unit_file('zabbix-agent.service') }

Check warning on line 476 in spec/classes/agent_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / 8 (Ruby 3.2) 

zabbix::agent on archlinux-rolling-x86_64 with systemd active 

Skipped: user package provided instead systemd::unit_file

Check warning on line 476 in spec/classes/agent_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / 8 (Ruby 3.2) 

zabbix::agent on centos-7-x86_64 with systemd active 

Skipped: user package provided instead systemd::unit_file

Check warning on line 476 in spec/classes/agent_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / 8 (Ruby 3.2) 

zabbix::agent on debian-11-x86_64 with systemd active 

Skipped: user package provided instead systemd::unit_file

Check warning on line 476 in spec/classes/agent_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / 8 (Ruby 3.2) 

zabbix::agent on debian-12-x86_64 with systemd active 

Skipped: user package provided instead systemd::unit_file

Check warning on line 476 in spec/classes/agent_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / 8 (Ruby 3.2) 

zabbix::agent on ubuntu-20.04-x86_64 with systemd active 

Skipped: user package provided instead systemd::unit_file

Check warning on line 476 in spec/classes/agent_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / 8 (Ruby 3.2) 

zabbix::agent on ubuntu-22.04-x86_64 with systemd active 

Skipped: user package provided instead systemd::unit_file

Check warning on line 476 in spec/classes/agent_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / 7 (Ruby 2.7) 

zabbix::agent on archlinux-rolling-x86_64 with systemd active 

Skipped: user package provided instead systemd::unit_file

Check warning on line 476 in spec/classes/agent_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / 7 (Ruby 2.7) 

zabbix::agent on centos-7-x86_64 with systemd active 

Skipped: user package provided instead systemd::unit_file

Check warning on line 476 in spec/classes/agent_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / 7 (Ruby 2.7) 

zabbix::agent on debian-11-x86_64 with systemd active 

Skipped: user package provided instead systemd::unit_file

Check warning on line 476 in spec/classes/agent_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / 7 (Ruby 2.7) 

zabbix::agent on debian-12-x86_64 with systemd active 

Skipped: user package provided instead systemd::unit_file

Check warning on line 476 in spec/classes/agent_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / 7 (Ruby 2.7) 

zabbix::agent on ubuntu-20.04-x86_64 with systemd active 

Skipped: user package provided instead systemd::unit_file

Check warning on line 476 in spec/classes/agent_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / 7 (Ruby 2.7) 

zabbix::agent on ubuntu-22.04-x86_64 with systemd active 

Skipped: user package provided instead systemd::unit_file
end
end

Expand Down
32 changes: 16 additions & 16 deletions spec/classes/server_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
it { is_expected.to contain_class('zabbix::repo') }
it { is_expected.to contain_class('zabbix::params') }
it { is_expected.to contain_service('zabbix-server').with_ensure('running') }
it { is_expected.to contain_zabbix__startup('zabbix-server') }
it { is_expected.not_to contain_zabbix__startup('zabbix-server') }

it { is_expected.to contain_apt__source('zabbix') } if facts[:os]['family'] == 'Debian'
it { is_expected.to contain_apt__key('zabbix-A1848F5') } if facts[:os]['family'] == 'Debian'
Expand Down Expand Up @@ -159,26 +159,26 @@
it { is_expected.not_to contain_firewall('151 zabbix-server') }
end

context 'it creates a startup script' do
case facts[:os]['family']
when 'Archlinux', 'Debian', 'Gentoo', 'RedHat'
it { is_expected.to contain_file('/etc/init.d/zabbix-server').with_ensure('absent') }
it { is_expected.to contain_file('/etc/systemd/system/zabbix-server.service').with_ensure('file') }
it { is_expected.to contain_systemd__unit_file('zabbix-server.service') }
else
it { is_expected.to contain_file('/etc/init.d/zabbix-server').with_ensure('file') }
it { is_expected.not_to contain_file('/etc/systemd/system/zabbix-server.service') }
end
end

context 'when declaring manage_startup_script is false' do
context 'when declaring manage_startup_script is true' do
let :params do
{
manage_startup_script: false
manage_startup_script: true
}
end

it { is_expected.not_to contain_zabbix__startup('zabbix-server') }
context 'it creates a startup script' do
case facts[:os]['family']
when 'Archlinux', 'Debian', 'Gentoo', 'RedHat'
it { is_expected.to contain_file('/etc/init.d/zabbix-server').with_ensure('absent') }
it { is_expected.to contain_file('/etc/systemd/system/zabbix-server.service').with_ensure('file') }
it { is_expected.to contain_systemd__unit_file('zabbix-server.service') }
else
it { is_expected.to contain_file('/etc/init.d/zabbix-server').with_ensure('file') }
it { is_expected.not_to contain_file('/etc/systemd/system/zabbix-server.service') }
end
end

it { is_expected.to contain_zabbix__startup('zabbix-server') }
end

# If manage_service is true (default), it should create a service
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/web_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class { 'apache':

packages = if facts[:os]['family'] == 'RedHat'
if facts[:os]['release']['major'].to_i == 7 &&
!%w[VirtuozzoLinux OracleLinux Scientific].include?(facts[:os]['name'])
!%w[OracleLinux].include?(facts[:os]['name'])
%w[zabbix-web-pgsql-scl zabbix-web]
else
%w[zabbix-web-pgsql zabbix-web]
Expand Down
4 changes: 2 additions & 2 deletions spec/defines/userparameters_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
it { is_expected.to contain_class('zabbix::params') }
it { is_expected.to contain_class('zabbix::repo') }
it { is_expected.to compile.with_all_deps }
it { is_expected.to contain_file("/etc/init.d/#{service}") }
it { is_expected.not_to contain_file("/etc/init.d/#{service}") }
it { is_expected.to contain_file('/etc/zabbix/zabbix_agentd.conf') }
it { is_expected.to contain_file('/etc/zabbix/zabbix_agentd.d') }
it { is_expected.to contain_package(package) }
it { is_expected.to contain_service(service) }
it { is_expected.to contain_zabbix__startup(service) }
it { is_expected.not_to contain_zabbix__startup(service) }
end

context 'with ensure => absent' do
Expand Down
2 changes: 1 addition & 1 deletion spec/spec_helper_methods.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ def baseline_os_hash
supported_os: [
{
'operatingsystem' => 'CentOS',
'operatingsystemrelease' => %w[7 8]
'operatingsystemrelease' => %w[7]
},
{
'operatingsystem' => 'Debian',
Expand Down
Loading