diff --git a/README.md b/README.md index ffe9dc3ba..a79d74e12 100644 --- a/README.md +++ b/README.md @@ -427,7 +427,7 @@ Take a look at the [REFERENCE.md](https://github.com/voxpupuli/puppet-zabbix/blo ## Limitations -This module supports Zabbix 4.0, 5.0, 5.2, 5.4 and 6.0. The upstream supported versions are documented [here](https://www.zabbix.com/de/life_cycle_and_release_policy) +This module supports Zabbix 4.0, 5.0, and 6.0. The upstream supported versions are documented [here](https://www.zabbix.com/life_cycle_and_release_policy) Please have a look into the metadata.json for all supported operating systems. This module is supported on both the community and the Enterprise version of Puppet. diff --git a/REFERENCE.md b/REFERENCE.md index e41d1806c..ffbded34d 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -1317,7 +1317,7 @@ This will install and configure the zabbix-agent deamon ```puppet class { 'zabbix::agent': - zabbix_version => '5.2', + zabbix_version => '6.0', server => '192.168.1.1', } ``` @@ -2336,7 +2336,7 @@ This will install and configure the zabbix-agent deamon ```puppet class { 'zabbix::javagateway': - zabbix_version => '5.2', + zabbix_version => '6.0', } ``` diff --git a/manifests/agent.pp b/manifests/agent.pp index db5b1ce14..25c80d475 100644 --- a/manifests/agent.pp +++ b/manifests/agent.pp @@ -125,7 +125,7 @@ # agent_configfile_path) # @example Basic installation: # class { 'zabbix::agent': -# zabbix_version => '5.2', +# zabbix_version => '6.0', # server => '192.168.1.1', # } # @@ -221,12 +221,6 @@ String $service_type = $zabbix::params::service_type, Boolean $manage_startup_script = $zabbix::params::manage_startup_script, ) inherits zabbix::params { - if $facts['os']['family'] == 'Debian' and versioncmp($facts['os']['release']['major'], '11') == 0 { - if versioncmp($zabbix_version, '5.2') == 0 { - fail('Zabbix 5.2 is not supported on Debian 11!') - } - } - # Find if listenip is set. If not, we can set to specific ip or # to network name. If more than 1 interfaces are available, we # can find the ipaddress of this specific interface if listenip diff --git a/manifests/javagateway.pp b/manifests/javagateway.pp index b88b9a86b..2e4e9c68e 100644 --- a/manifests/javagateway.pp +++ b/manifests/javagateway.pp @@ -10,7 +10,7 @@ # @param timeout Number of worker threads to start. # @example # class { 'zabbix::javagateway': -# zabbix_version => '5.2', +# zabbix_version => '6.0', # } # @author Werner Dijkerman ikben@werner-dijkerman.nl class zabbix::javagateway ( diff --git a/manifests/proxy.pp b/manifests/proxy.pp index 741dbf8e6..ccc385448 100644 --- a/manifests/proxy.pp +++ b/manifests/proxy.pp @@ -305,12 +305,6 @@ fail('Archlinux is currently not supported for zabbix::proxy ') } - if $facts['os']['family'] == 'Debian' and versioncmp($facts['os']['release']['major'], '11') == 0 { - if versioncmp($zabbix_version, '5.2') == 0 { - fail('Zabbix 5.2 is not supported on Debian 11!') - } - } - # Find if listenip is set. If not, we can set to specific ip or # to network name. If more than 1 interfaces are available, we # can find the ipaddress of this specific interface if listenip diff --git a/manifests/server.pp b/manifests/server.pp index 41d8f73b0..9c1c5dd55 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -281,12 +281,6 @@ } } - if $facts['os']['family'] == 'Debian' and versioncmp($facts['os']['release']['major'], '11') == 0 { - if versioncmp($zabbix_version, '5.2') == 0 { - fail('Zabbix 5.2 is not supported on Debian 11!') - } - } - # Only include the repo class if it has not yet been included unless defined(Class['Zabbix::Repo']) { class { 'zabbix::repo': diff --git a/manifests/web.pp b/manifests/web.pp index 7d7700145..a44f3d48d 100644 --- a/manifests/web.pp +++ b/manifests/web.pp @@ -158,12 +158,6 @@ } } - if $facts['os']['family'] == 'Debian' and versioncmp($facts['os']['release']['major'], '11') == 0 { - if versioncmp($zabbix_version, '5.2') == 0 { - fail('Zabbix 5.2 is not supported on Debian 11!') - } - } - # Only include the repo class if it has not yet been included unless defined(Class['Zabbix::Repo']) { class { 'zabbix::repo': diff --git a/spec/acceptance/agent_spec.rb b/spec/acceptance/agent_spec.rb index 7035a39b2..0c469e94b 100644 --- a/spec/acceptance/agent_spec.rb +++ b/spec/acceptance/agent_spec.rb @@ -3,9 +3,6 @@ require 'spec_helper_acceptance' supported_versions.each do |version| - # No Zabbix 5.2 packages on Debian 11 - next if version == '5.2' && default[:platform] == 'debian-11-amd64' - describe "zabbix::agent class with zabbix_version #{version}" do it 'works idempotently with no errors' do pp = <<-EOS diff --git a/spec/acceptance/zabbix_application_spec.rb b/spec/acceptance/zabbix_application_spec.rb index ed6a325ff..bc4d5e024 100644 --- a/spec/acceptance/zabbix_application_spec.rb +++ b/spec/acceptance/zabbix_application_spec.rb @@ -5,12 +5,8 @@ describe 'zabbix_application type', unless: default[:platform] =~ %r{archlinux} do supported_versions.each do |zabbix_version| - # 5.2 and 5.4 server packages are not available for RHEL 7 - next if zabbix_version == '5.2' && default[:platform] == 'el-7-x86_64' # Application API was removed in Zabbix 5.4 next if zabbix_version >= '5.4' - # No Zabbix 5.2 packages on Debian 11 - next if zabbix_version == '5.2' && default[:platform] == 'debian-11-amd64' template = case zabbix_version when '4.0' diff --git a/spec/acceptance/zabbix_host_spec.rb b/spec/acceptance/zabbix_host_spec.rb index d65211562..bbfabb365 100644 --- a/spec/acceptance/zabbix_host_spec.rb +++ b/spec/acceptance/zabbix_host_spec.rb @@ -8,8 +8,6 @@ supported_versions.each do |zabbix_version| # >= 5.2 server packages are not available for RHEL 7 next if zabbix_version >= '5.2' && default[:platform] == 'el-7-x86_64' - # No Zabbix 5.2 packages on Debian 11 - next if zabbix_version == '5.2' && default[:platform] == 'debian-11-amd64' context "create zabbix_host resources with zabbix version #{zabbix_version}" do # This will deploy a running Zabbix setup (server, web, db) which we can @@ -29,8 +27,6 @@ ['Template OS Linux SNMPv2'] when '5.0' ['Template OS Linux SNMP'] - when '5.2', '5.4' - ['Linux SNMP'] else ['Linux by SNMP'] end diff --git a/spec/acceptance/zabbix_hostgroup_spec.rb b/spec/acceptance/zabbix_hostgroup_spec.rb index cbcf61b94..99fb43575 100644 --- a/spec/acceptance/zabbix_hostgroup_spec.rb +++ b/spec/acceptance/zabbix_hostgroup_spec.rb @@ -7,8 +7,6 @@ supported_versions.each do |zabbix_version| # >= 5.2 server packages are not available for RHEL 7 next if zabbix_version >= '5.2' && default[:platform] == 'el-7-x86_64' - # No Zabbix 5.2 packages on Debian 11 - next if zabbix_version == '5.2' && default[:platform] == 'debian-11-amd64' context "create zabbix_hostgroup resources with zabbix version #{zabbix_version}" do # This will deploy a running Zabbix setup (server, web, db) which we can diff --git a/spec/acceptance/zabbix_proxy_spec.rb b/spec/acceptance/zabbix_proxy_spec.rb index 69e9e18f2..b7c5da3ba 100644 --- a/spec/acceptance/zabbix_proxy_spec.rb +++ b/spec/acceptance/zabbix_proxy_spec.rb @@ -8,8 +8,6 @@ supported_versions.each do |zabbix_version| # >= 5.2 server packages are not available for RHEL 7 next if zabbix_version >= '5.2' && default[:platform] == 'el-7-x86_64' - # No Zabbix 5.2 packages on Debian 11 - next if zabbix_version == '5.2' && default[:platform] == 'debian-11-amd64' context "create zabbix_proxy resources with zabbix version #{zabbix_version}" do # This will deploy a running Zabbix setup (server, web, db) which we can diff --git a/spec/acceptance/zabbix_template_host_spec.rb b/spec/acceptance/zabbix_template_host_spec.rb index eafe18daa..410a72778 100644 --- a/spec/acceptance/zabbix_template_host_spec.rb +++ b/spec/acceptance/zabbix_template_host_spec.rb @@ -9,8 +9,6 @@ next if zabbix_version == '6.0' # >= 5.2 server packages are not available for RHEL 7 next if zabbix_version >= '5.2' && default[:platform] == 'el-7-x86_64' - # No Zabbix 5.2 packages on Debian 11 - next if zabbix_version == '5.2' && default[:platform] == 'debian-11-amd64' context "create zabbix_template_host resources with zabbix version #{zabbix_version}" do template = case zabbix_version diff --git a/spec/acceptance/zabbix_template_spec.rb b/spec/acceptance/zabbix_template_spec.rb index 224d849fb..2fe4c7991 100644 --- a/spec/acceptance/zabbix_template_spec.rb +++ b/spec/acceptance/zabbix_template_spec.rb @@ -7,8 +7,6 @@ supported_versions.each do |zabbix_version| # >= 5.2 server packages are not available for RHEL 7 next if zabbix_version >= '5.2' && default[:platform] == 'el-7-x86_64' - # No Zabbix 5.2 packages on Debian 11 - next if zabbix_version == '5.2' && default[:platform] == 'debian-11-amd64' context "create zabbix_template resources with zabbix version #{zabbix_version}" do # This will deploy a running Zabbix setup (server, web, db) which we can diff --git a/spec/classes/proxy_spec.rb b/spec/classes/proxy_spec.rb index 36e2f9ad3..79ce5e08e 100644 --- a/spec/classes/proxy_spec.rb +++ b/spec/classes/proxy_spec.rb @@ -437,21 +437,6 @@ it { is_expected.to contain_file('/etc/zabbix/zabbix_proxy.conf').with_content %r{^LogFileSize=10$} } end end - - describe 'with zabbix_version 5.2 and Vault parameters defined' do - let :params do - { - zabbix_version: '5.2', - vaultdbpath: 'secret/zabbix/database', - vaulttoken: 'FKTYPEGL156DK', - vaulturl: 'https://127.0.0.1:8200', - } - end - - it { is_expected.to contain_file('/etc/zabbix/zabbix_proxy.conf').with_content %r{^VaultDBPath=secret/zabbix/database$} } - it { is_expected.to contain_file('/etc/zabbix/zabbix_proxy.conf').with_content %r{^VaultToken=FKTYPEGL156DK$} } - it { is_expected.to contain_file('/etc/zabbix/zabbix_proxy.conf').with_content %r{^VaultURL=https://127.0.0.1:8200$} } - end end end end diff --git a/spec/classes/server_spec.rb b/spec/classes/server_spec.rb index 5da1b15e7..0933507f9 100644 --- a/spec/classes/server_spec.rb +++ b/spec/classes/server_spec.rb @@ -392,37 +392,6 @@ it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^LogFileSize=10$} } end end - - # Zabbix Server 5.2 is not supported on RedHat family and Debian 11 - if facts[:osfamily] != 'RedHat' && facts[:os]['release']['major'] != '11' - describe 'with zabbix_version 5.2 and Vault parameters defined' do - let :params do - { - zabbix_version: '5.2', - vaultdbpath: 'secret/zabbix/database', - vaulttoken: 'FKTYPEGL156DK', - vaulturl: 'https://127.0.0.1:8200', - } - end - - it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^VaultDBPath=secret/zabbix/database$} } - it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^VaultToken=FKTYPEGL156DK$} } - it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^VaultURL=https://127.0.0.1:8200$} } - end - - describe 'with zabbix_version 5.4 and report parameters defined' do - let :params do - { - zabbix_version: '5.4', - startreportwriters: 1, - webserviceurl: 'http://localhost:10053/report', - } - end - - it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^StartReportWriters=1} } - it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^WebServiceURL=http://localhost:10053/report} } - end - end end end end diff --git a/spec/classes/web_spec.rb b/spec/classes/web_spec.rb index fca7b2ed2..758191d5e 100644 --- a/spec/classes/web_spec.rb +++ b/spec/classes/web_spec.rb @@ -19,8 +19,6 @@ next if facts[:os]['name'] == 'windows' next if facts[:os]['name'] == 'Archlinux' next if facts[:os]['name'] == 'Gentoo' - # There are no zabbix 5.2 packages for Debian 11 - next if facts[:os]['name'] == 'Debian' && facts[:os]['release']['major'] == '11' && zabbix_version == '5.2' context "on #{os}" do let :facts do diff --git a/spec/support/acceptance/supported_versions.rb b/spec/support/acceptance/supported_versions.rb index e92d38094..06d4db64b 100644 --- a/spec/support/acceptance/supported_versions.rb +++ b/spec/support/acceptance/supported_versions.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true def supported_versions - %w[4.0 5.0 5.2 5.4 6.0] + %w[4.0 5.0 6.0] end