Add configuration parameters to Server and Agent

- Server:
   - making StartHistoryPollers configurable
   - adding TrendFunctionCacheSize parameter to config file

Author: githubgehrmann

REFERENCE.md

@@ -4013,6 +4013,7 @@ The following parameters are available in the `zabbix::server` class:
 * [`startalerters`](#-zabbix--server--startalerters)
 * [`startdiscoverers`](#-zabbix--server--startdiscoverers)
 * [`startescalators`](#-zabbix--server--startescalators)
+* [`starthistorypollers`](#-zabbix--server--starthistorypollers)
 * [`starthttppollers`](#-zabbix--server--starthttppollers)
 * [`starttimers`](#-zabbix--server--starttimers)
 * [`javagateway`](#-zabbix--server--javagateway)
@@ -4040,6 +4041,7 @@ The following parameters are available in the `zabbix::server` class:
 * [`historycachesize`](#-zabbix--server--historycachesize)
 * [`historyindexcachesize`](#-zabbix--server--historyindexcachesize)
 * [`trendcachesize`](#-zabbix--server--trendcachesize)
+* [`trendfunctioncachesize`](#-zabbix--server--trendfunctioncachesize)
 * [`valuecachesize`](#-zabbix--server--valuecachesize)
 * [`timeout`](#-zabbix--server--timeout)
 * [`tlscafile`](#-zabbix--server--tlscafile)
@@ -4450,6 +4452,14 @@ Number of pre-forked instances of escalators.
 
 Default value: `$zabbix::params::server_startescalators`
 
+##### <a name="-zabbix--server--starthistorypollers"></a>`starthistorypollers`
+
+Data type: `Optional[Integer[0, 100]]`
+
+Number of pre-forked instances of history pollers.
+
+Default value: `$zabbix::params::server_starthistorypollers`
+
 ##### <a name="-zabbix--server--starthttppollers"></a>`starthttppollers`
 
 Data type: `Any`
@@ -4672,6 +4682,14 @@ Size of trend cache, in bytes.
 
 Default value: `$zabbix::params::server_trendcachesize`
 
+##### <a name="-zabbix--server--trendfunctioncachesize"></a>`trendfunctioncachesize`
+
+Data type: `Optional[String[1]]`
+
+Size of trend function cache, in bytes.
+
+Default value: `$zabbix::params::server_trendfunctioncachesize`
+
 ##### <a name="-zabbix--server--valuecachesize"></a>`valuecachesize`
 
 Data type: `Any`

manifests/params.pp

@@ -248,6 +248,7 @@
   $server_startalerters                     = 3
   $server_startdiscoverers                  = '1'
   $server_startescalators                   = 1
+  $server_starthistorypollers               = 5
   $server_starthttppollers                  = '1'
   $server_startipmipollers                  = '0'
   $server_startjavapollers                  = '5'
@@ -283,6 +284,7 @@
   $server_tmpdir                            = '/tmp'
   $server_trappertimeout                    = '300'
   $server_trendcachesize                    = '4M'
+  $server_trendfunctioncachesize            = undef
   $server_unavailabledelay                  = '60'
   $server_unreachabledelay                  = '15'
   $server_unreachableperiod                 = '45'

manifests/server.pp

@@ -57,6 +57,7 @@
 # @param startalerters Number of pre-forked instances of alerters.
 # @param startdiscoverers Number of pre-forked instances of discoverers.
 # @param startescalators Number of pre-forked instances of escalators.
+# @param starthistorypollers Number of pre-forked instances of history pollers.
 # @param starthttppollers Number of pre-forked instances of http pollers.
 # @param starttimers Number of pre-forked instances of timers.
 # @param javagateway IP address (or hostname) of zabbix java gateway.
@@ -92,6 +93,7 @@
 # @param historycachesize Size of history cache, in bytes.
 # @param historyindexcachesize Size of history index cache, in bytes.
 # @param trendcachesize Size of trend cache, in bytes.
+# @param trendfunctioncachesize Size of trend function cache, in bytes.
 # @param valuecachesize Size of history value cache, in bytes.
 # @param timeout Specifies how long we wait for agent, snmp device or external check (in seconds).
 # @param tlscafile Full pathname of a file containing the top-level CA(s) certificates for peer certificate verification.
@@ -216,6 +218,7 @@
   Integer[1, 100] $startalerters                                              = $zabbix::params::server_startalerters,
   $startdiscoverers                                                           = $zabbix::params::server_startdiscoverers,
   Integer[1, 100] $startescalators                                            = $zabbix::params::server_startescalators,
+  Optional[Integer[0, 100]] $starthistorypollers                              = $zabbix::params::server_starthistorypollers,
   $starthttppollers                                                           = $zabbix::params::server_starthttppollers,
   $starttimers                                                                = $zabbix::params::server_starttimers,
   $javagateway                                                                = $zabbix::params::server_javagateway,
@@ -241,6 +244,7 @@
   $historycachesize                                                           = $zabbix::params::server_historycachesize,
   $historyindexcachesize                                                      = $zabbix::params::server_historyindexcachesize,
   $trendcachesize                                                             = $zabbix::params::server_trendcachesize,
+  Optional[String[1]] $trendfunctioncachesize                                 = $zabbix::params::server_trendfunctioncachesize,
   $valuecachesize                                                             = $zabbix::params::server_valuecachesize,
   $timeout                                                                    = $zabbix::params::server_timeout,
   $tlscafile                                                                  = $zabbix::params::server_tlscafile,

spec/classes/server_spec.rb

@@ -261,6 +261,7 @@
             tmpdir: '/tmp',
             trappertimeout: '30',
             trendcachesize: '4M',
+            trendfunctioncachesize: '4M',
             unavailabledelay: '30',
             unreachabledelay: '30',
             unreachableperiod: '30',
@@ -338,6 +339,7 @@
         it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^TmpDir=/tmp} }
         it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^TrapperTimeout=30} }
         it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^TrendCacheSize=4M} }
+        it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^TrendFunctionCacheSize=4M} }
         it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^UnavailableDelay=30} }
         it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^UnreachableDelay=30} }
         it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^UnreachablePeriod=30} }
@@ -371,11 +373,13 @@
         let :params do
           {
             smsdevices: ['/dev/ttyS0'],
+            starthistorypollers: 5,
             zabbix_version: '7.0'
           }
         end
 
         it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^SMSDevices=/dev/ttyS0} }
+        it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^StartHistoryPollers=5} }
       end
 
       context 'with zabbix_server.conf and version 7.2' do

templates/zabbix_server.conf.erb

@@ -251,6 +251,7 @@ StartPollersUnreachable=<%= @startpollersunreachable %>
 # Range: 0-1000
 # Default:
 # StartHistoryPollers=5
+<% if @starthistorypollers %>StartHistoryPollers=<%= @starthistorypollers %><% end %>
 
 <% end %>
 <% if @zabbix_version.to_f >= 6.0 %>
@@ -472,6 +473,14 @@ HistoryCacheSize=<%= @historycachesize %>
 # Range: 128K-2G
 TrendCacheSize=<%= @trendcachesize %>
 
+### Option: TrendFunctionCacheSize
+#   Size of trend function cache, in bytes.
+#   Shared memory size for caching calculated trend function data
+#
+# Mandatory: no
+# Range: 128K-2G
+<% if @trendfunctioncachesize %>TrendFunctionCacheSize=<%= @trendfunctioncachesize %><% end %>
+
 ### Option: ValueCacheSize
 #	Size of history value cache, in bytes.
 #	Shared memory size for caching item history data requests.