increase default CacheSize to 32M, the default in 6.0

manifests/params.pp

@@ -194,7 +194,7 @@
   # Zabbix-server
   $server_alertscriptspath                  = '/etc/zabbix/alertscripts'
   $server_allowroot                         = '0'
-  $server_cachesize                         = '8M'
+  $server_cachesize                         = '32M'
   $server_cacheupdatefrequency              = '60'
   $server_config_group                      = 'zabbix'
   $server_config_owner                      = 'zabbix'
@@ -365,7 +365,7 @@
 
   # Proxy specific params
   $proxy_allowroot                          = '0'
-  $proxy_cachesize                          = '8M'
+  $proxy_cachesize                          = '32M'
   $proxy_configfile_path                    = '/etc/zabbix/zabbix_proxy.conf'
   $proxy_configfrequency                    = '3600'
   $proxy_database_host                      = 'localhost'

spec/acceptance/server_spec.rb

@@ -21,7 +21,7 @@ class { 'postgresql::globals':
           locale   => 'en_US.UTF-8',
           manage_package_repo => $facts['os']['release']['major'] != '8',
           manage_dnf_module => $facts['os']['release']['major'] == '8',
-          version => '12',
+          version => '13',
         }
         -> class { 'postgresql::server': }
         -> class { 'zabbix::database': }
@@ -45,4 +45,55 @@ class { 'postgresql::globals':
       it { is_expected.to be_enabled }
     end
   end
+
+  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'
+
+    context "deploys a zabbix #{zabbix_version} server" do
+      # Using puppet_apply as a helper
+      it 'works idempotently with no errors' do
+        # this is a minimal working example if you've a postgres server
+        # running on another node. multinode testing with beaker is pain,
+        # so we will deploy multiple services into one box
+        # pp = <<-EOS
+        # class { 'zabbix::server':
+        #  manage_database => false,
+        # }
+        # EOS
+
+        # this will actually deploy apache + postgres + zabbix-server + zabbix-web
+        pp = <<-EOS
+          class { 'postgresql::globals':
+            encoding => 'UTF-8',
+            locale   => 'en_US.UTF-8',
+            manage_package_repo => $facts['os']['release']['major'] != '8',
+            manage_dnf_module => $facts['os']['release']['major'] == '8',
+            version => '13',
+          }
+          -> class { 'postgresql::server': }
+          -> class { 'zabbix::database': }
+          -> class { 'zabbix::server':
+            zabbix_version => "#{zabbix_version}"
+          }
+        EOS
+
+        prepare_host
+
+        # Run it twice and test for idempotency
+        apply_manifest(pp, catch_failures: true)
+        apply_manifest(pp, catch_changes: true)
+      end
+
+      # do some basic checks
+      describe package('zabbix-server-pgsql') do
+        it { is_expected.to be_installed }
+      end
+
+      describe service('zabbix-server') do
+        it { is_expected.to be_running }
+        it { is_expected.to be_enabled }
+      end
+    end
+  end
 end

spec/acceptance/zabbix_application_spec.rb

@@ -27,7 +27,7 @@ class { 'postgresql::globals':
           locale   => 'en_US.UTF-8',
           manage_package_repo => $facts['os']['release']['major'] != '8',
           manage_dnf_module => $facts['os']['release']['major'] == '8',
-          version => '12',
+          version => '13',
         }
         -> class { 'postgresql::server': }
 

spec/acceptance/zabbix_host_spec.rb

@@ -36,7 +36,7 @@ class { 'postgresql::globals':
           locale   => 'en_US.UTF-8',
           manage_package_repo => $facts['os']['release']['major'] != '8',
           manage_dnf_module => $facts['os']['release']['major'] == '8',
-          version => '12',
+          version => '13',
         }
         -> class { 'postgresql::server': }
 

spec/acceptance/zabbix_hostgroup_spec.rb

@@ -20,7 +20,7 @@ class { 'postgresql::globals':
           locale   => 'en_US.UTF-8',
           manage_package_repo => $facts['os']['release']['major'] != '8',
           manage_dnf_module => $facts['os']['release']['major'] == '8',
-          version => '12',
+          version => '13',
         }
         -> class { 'postgresql::server': }
 

spec/acceptance/zabbix_proxy_spec.rb

@@ -21,7 +21,7 @@ class { 'postgresql::globals':
         locale   => 'en_US.UTF-8',
         manage_package_repo => $facts['os']['release']['major'] != '8',
         manage_dnf_module => $facts['os']['release']['major'] == '8',
-        version => '12',
+        version => '13',
       }
       -> class { 'postgresql::server': }
 

spec/acceptance/zabbix_template_host_spec.rb

@@ -29,7 +29,7 @@ class { 'postgresql::globals':
           locale   => 'en_US.UTF-8',
           manage_package_repo => $facts['os']['release']['major'] != '8',
           manage_dnf_module => $facts['os']['release']['major'] == '8',
-          version => '12',
+          version => '13',
         }
         -> class { 'postgresql::server': }
 

spec/acceptance/zabbix_template_spec.rb

@@ -20,7 +20,7 @@ class { 'postgresql::globals':
             locale   => 'en_US.UTF-8',
             manage_package_repo => $facts['os']['release']['major'] != '8',
             manage_dnf_module => $facts['os']['release']['major'] == '8',
-            version => '12',
+            version => '13',
           }
           -> class { 'postgresql::server': }
 

spec/classes/proxy_spec.rb

@@ -202,7 +202,7 @@
           let(:params) do
             {
               allowroot: '0',
-              cachesize: '8M',
+              cachesize: '32M',
               configfrequency: '3600',
               database_host: 'localhost',
               database_name: 'zabbix-proxy',
@@ -321,7 +321,7 @@
           it { is_expected.to contain_file('/etc/zabbix/zabbix_proxy.conf').with_content %r{^StartSNMPTrapper=0$} }
           it { is_expected.to contain_file('/etc/zabbix/zabbix_proxy.conf').with_content %r{^ListenIP=192.168.1.1$} }
           it { is_expected.to contain_file('/etc/zabbix/zabbix_proxy.conf').with_content %r{^HousekeepingFrequency=1$} }
-          it { is_expected.to contain_file('/etc/zabbix/zabbix_proxy.conf').with_content %r{^CacheSize=8M$} }
+          it { is_expected.to contain_file('/etc/zabbix/zabbix_proxy.conf').with_content %r{^CacheSize=32M$} }
           it { is_expected.to contain_file('/etc/zabbix/zabbix_proxy.conf').with_content %r{^StartDBSyncers=4$} }
           it { is_expected.to contain_file('/etc/zabbix/zabbix_proxy.conf').with_content %r{^HistoryCacheSize=16M$} }
           it { is_expected.to contain_file('/etc/zabbix/zabbix_proxy.conf').with_content %r{^Timeout=20$} }

spec/classes/server_spec.rb

@@ -194,7 +194,7 @@
           {
             alertscriptspath: '${datadir}/zabbix/alertscripts',
             allowroot: '1',
-            cachesize: '8M',
+            cachesize: '32M',
             cacheupdatefrequency: '30',
             database_host: 'localhost',
             database_name: 'zabbix-server',
@@ -271,7 +271,7 @@
 
         it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^AlertScriptsPath=\$\{datadir\}/zabbix/alertscripts} }
         it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^AllowRoot=1} }
-        it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^CacheSize=8M} }
+        it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^CacheSize=32M} }
         it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^CacheUpdateFrequency=30} }
         it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^DBHost=localhost} }
         it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^DBName=zabbix-server} }