Skip to content

Commit 1785781

Browse files
tanderson-svitanderson-svi
committed
Enable 4 new 7+ server parameters
1 parent feb6014 commit 1785781

File tree

5 files changed

+155
-94
lines changed

5 files changed

+155
-94
lines changed

‎REFERENCE.md‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,10 @@ The following parameters are available in the `zabbix` class:
145145
* [`database_tlsconnect`](#-zabbix--database_tlsconnect)
146146
* [`database_tlscafile`](#-zabbix--database_tlscafile)
147147
* [`startpollers`](#-zabbix--startpollers)
148+
* [`startagentpollers`](#-zabbix--startagentpollers)
149+
* [`starthttpagentpollers`](#-zabbix--starthttpagentpollers)
150+
* [`startsnmppollers`](#-zabbix--startsnmppollers)
151+
* [`maxconcurrentchecksperpoller`](#-zabbix--maxconcurrentchecksperpoller)
148152
* [`startpreprocessors`](#-zabbix--startpreprocessors)
149153
* [`startipmipollers`](#-zabbix--startipmipollers)
150154
* [`startodbcpollers`](#-zabbix--startodbcpollers)
@@ -726,6 +730,39 @@ Number of pre-forked instances of pollers.
726730

727731
Default value: `$zabbix::params::server_startpollers`
728732

733+
##### <a name="-zabbix--startagentpollers"></a>`startagentpollers`
734+
735+
Data type: `Integer[1, 1000]`
736+
737+
Number of pre-forked instances of asynchronous Zabbix agent pollers. Also see MaxConcurrentChecksPerPoller.
738+
739+
Default value: `$zabbix::params::server_startagentpollers`
740+
741+
##### <a name="-zabbix--starthttpagentpollers"></a>`starthttpagentpollers`
742+
743+
Data type: `Integer[1, 1000]`
744+
745+
Number of pre-forked instances of asynchronous HTTP agent pollers. Also see MaxConcurrentChecksPerPoller.
746+
747+
Default value: `$zabbix::params::server_starthttpagentpollers`
748+
749+
##### <a name="-zabbix--startsnmppollers"></a>`startsnmppollers`
750+
751+
Data type: `Integer[1, 1000]`
752+
753+
Number of pre-forked instances of asynchronous SNMP pollers. Also see MaxConcurrentChecksPerPoller.
754+
755+
Default value: `$zabbix::params::server_startsnmppollers`
756+
757+
##### <a name="-zabbix--maxconcurrentchecksperpoller"></a>`maxconcurrentchecksperpoller`
758+
759+
Data type: `Integer[1, 1000]`
760+
761+
Maximum number of asynchronous checks that can be executed at once by each HTTP agent poller or agent poller.
762+
763+
Default value: `$zabbix::params::server_maxconcurrentchecksperpoller`
764+
765+
729766
##### <a name="-zabbix--startpreprocessors"></a>`startpreprocessors`
730767

731768
Data type: `Integer[1, 1000]`

‎manifests/init.pp‎

Lines changed: 102 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,10 @@
103103
# * verify_full - connect using TLS, verify certificate and verify that database identity specified by DBHost matches its certificate
104104
# @param database_tlscafile Full pathname of a file containing the top-level CA(s) certificates for database certificate verification.
105105
# @param startpollers Number of pre-forked instances of pollers.
106+
# @param startagentpollers Number of pre-forked instances of asynchronous Zabbix agent pollers. Also see MaxConcurrentChecksPerPoller.
107+
# @param starthttpagentpollers Number of pre-forked instances of asynchronous HTTP agent pollers. Also see MaxConcurrentChecksPerPoller.
108+
# @param startsnmppollers Number of pre-forked instances of asynchronous SNMP pollers. Also see MaxConcurrentChecksPerPoller.
109+
# @param maxconcurrentchecksperpoller Maximum number of asynchronous checks that can be executed at once by each HTTP agent poller or agent poller.
106110
# @param startpreprocessors Number of pre-forked instances of preprocessing workers
107111
# @param startipmipollers Number of pre-forked instances of ipmi pollers.
108112
# @param startodbcpollers Number of pre-forked instances of ODBC pollers.
@@ -274,6 +278,10 @@
274278
Optional[Enum['required', 'verify_ca', 'verify_full']] $database_tlsconnect = $zabbix::params::server_database_tlsconnect,
275279
Optional[Stdlib::Absolutepath] $database_tlscafile = $zabbix::params::server_database_tlscafile,
276280
$startpollers = $zabbix::params::server_startpollers,
281+
Integer[1, 100] $startagentpollers = $zabbix::params::server_startagentpollers,
282+
Integer[1, 100] $starthttpagentpollers = $zabbix::params::server_starthttpagentpollers,
283+
Integer[1, 100] $startsnmppollers = $zabbix::params::server_startsnmppollers,
284+
Integer[1, 1000] $maxconcurrentchecksperpoller = $zabbix::params::server_maxconcurrentchecksperpoller,
277285
$startipmipollers = $zabbix::params::server_startipmipollers,
278286
Integer[0, 1000] $startodbcpollers = $zabbix::params::server_startodbcpollers,
279287
$startpollersunreachable = $zabbix::params::server_startpollersunreachable,
@@ -399,96 +407,100 @@
399407
}
400408

401409
class { 'zabbix::server':
402-
database_type => $database_type,
403-
database_path => $database_path,
404-
zabbix_version => $zabbix_version,
405-
zabbix_package_state => $zabbix_package_state,
406-
manage_firewall => $manage_firewall,
407-
manage_repo => $manage_repo,
408-
manage_database => $manage_database,
409-
manage_service => $manage_service,
410-
listenport => $listenport,
411-
sourceip => $sourceip,
412-
logfile => $logfile,
413-
logfilesize => $logfilesize,
414-
logtype => $logtype,
415-
debuglevel => $debuglevel,
416-
pidfile => $pidfile,
417-
database_host => $database_host,
418-
database_name => $database_name,
419-
database_schema => $database_schema,
420-
database_user => $database_user,
421-
database_password => $database_password,
422-
database_socket => $database_socket,
423-
database_port => $database_port,
424-
database_tlsconnect => $database_tlsconnect,
425-
database_tlscafile => $database_tlscafile,
426-
startpollers => $startpollers,
427-
startipmipollers => $startipmipollers,
428-
startpollersunreachable => $startpollersunreachable,
429-
startpreprocessors => $startpreprocessors,
430-
starttrappers => $starttrappers,
431-
startpingers => $startpingers,
432-
startalerters => $startalerters,
433-
startdiscoverers => $startdiscoverers,
434-
startescalators => $startescalators,
435-
starthttppollers => $starthttppollers,
436-
starttimers => $starttimers,
437-
javagateway => $javagateway,
438-
javagatewayport => $javagatewayport,
439-
startjavapollers => $startjavapollers,
440-
startlldprocessors => $startlldprocessors,
441-
startvmwarecollectors => $startvmwarecollectors,
442-
vaultdbpath => $vaultdbpath,
443-
vaulttoken => $vaulttoken,
444-
vaulturl => $vaulturl,
445-
vmwarefrequency => $vmwarefrequency,
446-
vmwarecachesize => $vmwarecachesize,
447-
vmwaretimeout => $vmwaretimeout,
448-
snmptrapperfile => $snmptrapperfile,
449-
startsnmptrapper => $startsnmptrapper,
450-
listenip => $listenip,
451-
housekeepingfrequency => $housekeepingfrequency,
452-
maxhousekeeperdelete => $maxhousekeeperdelete,
453-
cachesize => $cachesize,
454-
cacheupdatefrequency => $cacheupdatefrequency,
455-
startdbsyncers => $startdbsyncers,
456-
historycachesize => $historycachesize,
457-
trendcachesize => $trendcachesize,
458-
historyindexcachesize => $historyindexcachesize,
459-
valuecachesize => $valuecachesize,
460-
timeout => $timeout,
461-
tlscafile => $tlscafile,
462-
tlscertfile => $tlscertfile,
463-
tlscrlfile => $tlscrlfile,
464-
tlskeyfile => $tlskeyfile,
465-
tlscipherall => $tlscipherall,
466-
tlscipherall13 => $tlscipherall13,
467-
tlsciphercert => $tlsciphercert,
468-
tlsciphercert13 => $tlsciphercert13,
469-
tlscipherpsk => $tlscipherpsk,
470-
tlscipherpsk13 => $tlscipherpsk13,
471-
trappertimeout => $trappertimeout,
472-
unreachableperiod => $unreachableperiod,
473-
unavailabledelay => $unavailabledelay,
474-
unreachabledelay => $unreachabledelay,
475-
alertscriptspath => $alertscriptspath,
476-
externalscripts => $externalscripts,
477-
fpinglocation => $fpinglocation,
478-
fping6location => $fping6location,
479-
sshkeylocation => $sshkeylocation,
480-
logslowqueries => $logslowqueries,
481-
tmpdir => $tmpdir,
482-
startproxypollers => $startproxypollers,
483-
proxyconfigfrequency => $proxyconfigfrequency,
484-
proxydatafrequency => $proxydatafrequency,
485-
allowroot => $allowroot,
486-
include_dir => $include_dir,
487-
loadmodulepath => $loadmodulepath,
488-
loadmodule => $loadmodule,
489-
manage_selinux => $manage_selinux,
490-
additional_service_params => $additional_service_params,
491-
require => Class['zabbix::database'],
410+
database_type => $database_type,
411+
database_path => $database_path,
412+
zabbix_version => $zabbix_version,
413+
zabbix_package_state => $zabbix_package_state,
414+
manage_firewall => $manage_firewall,
415+
manage_repo => $manage_repo,
416+
manage_database => $manage_database,
417+
manage_service => $manage_service,
418+
listenport => $listenport,
419+
sourceip => $sourceip,
420+
logfile => $logfile,
421+
logfilesize => $logfilesize,
422+
logtype => $logtype,
423+
debuglevel => $debuglevel,
424+
pidfile => $pidfile,
425+
database_host => $database_host,
426+
database_name => $database_name,
427+
database_schema => $database_schema,
428+
database_user => $database_user,
429+
database_password => $database_password,
430+
database_socket => $database_socket,
431+
database_port => $database_port,
432+
database_tlsconnect => $database_tlsconnect,
433+
database_tlscafile => $database_tlscafile,
434+
startpollers => $startpollers,
435+
startagentpollers => $startagentpollers,
436+
starthttpagentpollers => $starthttpagentpollers,
437+
startsnmppollers => $startsnmppollers,
438+
maxconcurrentchecksperpoller => $maxconcurrentchecksperpoller,
439+
startipmipollers => $startipmipollers,
440+
startpollersunreachable => $startpollersunreachable,
441+
startpreprocessors => $startpreprocessors,
442+
starttrappers => $starttrappers,
443+
startpingers => $startpingers,
444+
startalerters => $startalerters,
445+
startdiscoverers => $startdiscoverers,
446+
startescalators => $startescalators,
447+
starthttppollers => $starthttppollers,
448+
starttimers => $starttimers,
449+
javagateway => $javagateway,
450+
javagatewayport => $javagatewayport,
451+
startjavapollers => $startjavapollers,
452+
startlldprocessors => $startlldprocessors,
453+
startvmwarecollectors => $startvmwarecollectors,
454+
vaultdbpath => $vaultdbpath,
455+
vaulttoken => $vaulttoken,
456+
vaulturl => $vaulturl,
457+
vmwarefrequency => $vmwarefrequency,
458+
vmwarecachesize => $vmwarecachesize,
459+
vmwaretimeout => $vmwaretimeout,
460+
snmptrapperfile => $snmptrapperfile,
461+
startsnmptrapper => $startsnmptrapper,
462+
listenip => $listenip,
463+
housekeepingfrequency => $housekeepingfrequency,
464+
maxhousekeeperdelete => $maxhousekeeperdelete,
465+
cachesize => $cachesize,
466+
cacheupdatefrequency => $cacheupdatefrequency,
467+
startdbsyncers => $startdbsyncers,
468+
historycachesize => $historycachesize,
469+
trendcachesize => $trendcachesize,
470+
historyindexcachesize => $historyindexcachesize,
471+
valuecachesize => $valuecachesize,
472+
timeout => $timeout,
473+
tlscafile => $tlscafile,
474+
tlscertfile => $tlscertfile,
475+
tlscrlfile => $tlscrlfile,
476+
tlskeyfile => $tlskeyfile,
477+
tlscipherall => $tlscipherall,
478+
tlscipherall13 => $tlscipherall13,
479+
tlsciphercert => $tlsciphercert,
480+
tlsciphercert13 => $tlsciphercert13,
481+
tlscipherpsk => $tlscipherpsk,
482+
tlscipherpsk13 => $tlscipherpsk13,
483+
trappertimeout => $trappertimeout,
484+
unreachableperiod => $unreachableperiod,
485+
unavailabledelay => $unavailabledelay,
486+
unreachabledelay => $unreachabledelay,
487+
alertscriptspath => $alertscriptspath,
488+
externalscripts => $externalscripts,
489+
fpinglocation => $fpinglocation,
490+
fping6location => $fping6location,
491+
sshkeylocation => $sshkeylocation,
492+
logslowqueries => $logslowqueries,
493+
tmpdir => $tmpdir,
494+
startproxypollers => $startproxypollers,
495+
proxyconfigfrequency => $proxyconfigfrequency,
496+
proxydatafrequency => $proxydatafrequency,
497+
allowroot => $allowroot,
498+
include_dir => $include_dir,
499+
loadmodulepath => $loadmodulepath,
500+
loadmodule => $loadmodule,
501+
manage_selinux => $manage_selinux,
502+
additional_service_params => $additional_service_params,
503+
require => Class['zabbix::database'],
492504
}
493505

494506
class { 'zabbix::database':

‎manifests/params.pp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,10 @@
252252
$server_startodbcpollers = 1
253253
$server_startpingers = '1'
254254
$server_startpollers = '5'
255+
$server_startagentpollers = 1
256+
$server_starthttpagentpollers = 1
257+
$server_startsnmppollers = 1
258+
$server_maxconcurrentchecksperpoller = 1000
255259
$server_startpollersunreachable = '1'
256260
$server_startpreprocessors = 3
257261
$server_startproxypollers = '1'

‎manifests/server.pp‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@
4848
# @param database_tlscipher The list of encryption ciphers that Zabbix server permits for TLS protocols up through TLSv1.2.
4949
# @param database_tlscipher13 The list of encryption ciphersuites that Zabbix server permits for TLSv1.3 protocol.
5050
# @param startpollers Number of pre-forked instances of pollers.
51+
# @param startagentpollers Number of pre-forked instances of asynchronous Zabbix agent pollers. Also see MaxConcurrentChecksPerPoller.
52+
# @param starthttpagentpollers Number of pre-forked instances of asynchronous HTTP agent pollers. Also see MaxConcurrentChecksPerPoller.
53+
# @param startsnmppollers Number of pre-forked instances of asynchronous SNMP pollers. Also see MaxConcurrentChecksPerPoller.
54+
# @param maxconcurrentchecksperpoller Maximum number of asynchronous checks that can be executed at once by each HTTP agent poller or agent poller.
5155
# @param startpreprocessors Number of pre-forked instances of preprocessing workers
5256
# @param startipmipollers Number of pre-forked instances of ipmi pollers.
5357
# @param startodbcpollers Number of pre-forked instances of ODBC pollers.
@@ -205,6 +209,10 @@
205209
Optional[String[1]] $database_tlscipher = $zabbix::params::server_database_tlscipher,
206210
Optional[String[1]] $database_tlscipher13 = $zabbix::params::server_database_tlscipher13,
207211
$startpollers = $zabbix::params::server_startpollers,
212+
Integer[1, 100] $startagentpollers = $zabbix::params::server_startagentpollers,
213+
Integer[1, 100] $starthttpagentpollers = $zabbix::params::server_starthttpagentpollers,
214+
Integer[1, 100] $startsnmppollers = $zabbix::params::server_startsnmppollers,
215+
Integer[1, 1000] $maxconcurrentchecksperpoller = $zabbix::params::server_maxconcurrentchecksperpoller,
208216
$startipmipollers = $zabbix::params::server_startipmipollers,
209217
Integer[0, 1000] $startodbcpollers = $zabbix::params::server_startodbcpollers,
210218
$startpollersunreachable = $zabbix::params::server_startpollersunreachable,

‎templates/zabbix_server.conf.erb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,31 +190,31 @@ StartPollers=<%= @startpollers %>
190190
# Mandatory: no
191191
# Range: 0-1000
192192
# Default:
193-
# StartAgentPollers=1
193+
StartAgentPollers=<%= @startagentpollers %>
194194

195195
### Option: StartHTTPAgentPollers
196196
# Number of pre-forked instances of asynchronous HTTP agent pollers. Also see MaxConcurrentChecksPerPoller.
197197
#
198198
# Mandatory: no
199199
# Range: 0-1000
200200
# Default:
201-
# StartHTTPAgentPollers=1
201+
StartHTTPAgentPollers=<%= @starthttpagentpollers %>
202202

203203
### Option: StartSNMPPollers
204204
# Number of pre-forked instances of asynchronous SNMP pollers. Also see MaxConcurrentChecksPerPoller.
205205
#
206206
# Mandatory: no
207207
# Range: 0-1000
208208
# Default:
209-
# StartSNMPPollers=1
209+
StartSNMPPollers=<%= @startsnmppollers %>
210210

211211
### Option: MaxConcurrentChecksPerPoller
212212
# Maximum number of asynchronous checks that can be executed at once by each HTTP agent poller or agent poller.
213213
#
214214
# Mandatory: no
215215
# Range: 1-1000
216216
# Default:
217-
# MaxConcurrentChecksPerPoller=1000
217+
MaxConcurrentChecksPerPoller=<%= @maxconcurrentchecksperpoller %>
218218
<% end %>
219219

220220
### Option: StartIPMIPollers

0 commit comments

Comments
 (0)