Skip to content

Commit b65a7ff

Browse files
committed
increase default CacheSize to 32M, the default in 6.0
1 parent 91921a3 commit b65a7ff

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

manifests/params.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@
194194
# Zabbix-server
195195
$server_alertscriptspath = '/etc/zabbix/alertscripts'
196196
$server_allowroot = '0'
197-
$server_cachesize = '8M'
197+
$server_cachesize = '32M'
198198
$server_cacheupdatefrequency = '60'
199199
$server_config_group = 'zabbix'
200200
$server_config_owner = 'zabbix'
@@ -365,7 +365,7 @@
365365

366366
# Proxy specific params
367367
$proxy_allowroot = '0'
368-
$proxy_cachesize = '8M'
368+
$proxy_cachesize = '32M'
369369
$proxy_configfile_path = '/etc/zabbix/zabbix_proxy.conf'
370370
$proxy_configfrequency = '3600'
371371
$proxy_database_host = 'localhost'

spec/classes/proxy_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@
202202
let(:params) do
203203
{
204204
allowroot: '0',
205-
cachesize: '8M',
205+
cachesize: '32M',
206206
configfrequency: '3600',
207207
database_host: 'localhost',
208208
database_name: 'zabbix-proxy',
@@ -321,7 +321,7 @@
321321
it { is_expected.to contain_file('/etc/zabbix/zabbix_proxy.conf').with_content %r{^StartSNMPTrapper=0$} }
322322
it { is_expected.to contain_file('/etc/zabbix/zabbix_proxy.conf').with_content %r{^ListenIP=192.168.1.1$} }
323323
it { is_expected.to contain_file('/etc/zabbix/zabbix_proxy.conf').with_content %r{^HousekeepingFrequency=1$} }
324-
it { is_expected.to contain_file('/etc/zabbix/zabbix_proxy.conf').with_content %r{^CacheSize=8M$} }
324+
it { is_expected.to contain_file('/etc/zabbix/zabbix_proxy.conf').with_content %r{^CacheSize=32M$} }
325325
it { is_expected.to contain_file('/etc/zabbix/zabbix_proxy.conf').with_content %r{^StartDBSyncers=4$} }
326326
it { is_expected.to contain_file('/etc/zabbix/zabbix_proxy.conf').with_content %r{^HistoryCacheSize=16M$} }
327327
it { is_expected.to contain_file('/etc/zabbix/zabbix_proxy.conf').with_content %r{^Timeout=20$} }

spec/classes/server_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@
194194
{
195195
alertscriptspath: '${datadir}/zabbix/alertscripts',
196196
allowroot: '1',
197-
cachesize: '8M',
197+
cachesize: '32M',
198198
cacheupdatefrequency: '30',
199199
database_host: 'localhost',
200200
database_name: 'zabbix-server',
@@ -271,7 +271,7 @@
271271

272272
it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^AlertScriptsPath=\$\{datadir\}/zabbix/alertscripts} }
273273
it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^AllowRoot=1} }
274-
it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^CacheSize=8M} }
274+
it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^CacheSize=32M} }
275275
it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^CacheUpdateFrequency=30} }
276276
it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^DBHost=localhost} }
277277
it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^DBName=zabbix-server} }

0 commit comments

Comments
 (0)