Added support for imjournal rate limit settings

This commit is contained in:
Shaun Rampersad 2016-03-07 11:52:40 +02:00
Родитель 82d4592016
Коммит cfa3db9fc1
3 изменённых файлов: 20 добавлений и 9 удалений

Просмотреть файл

@ -48,7 +48,9 @@ class rsyslog (
$default_template = $rsyslog::params::default_template, $default_template = $rsyslog::params::default_template,
$msg_reduction = $rsyslog::params::msg_reduction, $msg_reduction = $rsyslog::params::msg_reduction,
$non_kernel_facility = $rsyslog::params::non_kernel_facility, $non_kernel_facility = $rsyslog::params::non_kernel_facility,
$omit_local_logging = $rsyslog::params::omit_local_logging $omit_local_logging = $rsyslog::params::omit_local_logging,
$im_journal_ratelimit_interval = $rsyslog::params::im_journal_ratelimit_interval,
$im_journal_ratelimit_burst = $rsyslog::params::im_journal_ratelimit_burst
) inherits rsyslog::params { ) inherits rsyslog::params {
class { 'rsyslog::install': } class { 'rsyslog::install': }
class { 'rsyslog::config': } class { 'rsyslog::config': }

Просмотреть файл

@ -123,6 +123,8 @@ class rsyslog::params {
'#$ModLoad immark # provides --MARK-- message capability', '#$ModLoad immark # provides --MARK-- message capability',
] ]
$omit_local_logging = true $omit_local_logging = true
$im_journal_ratelimit_interval = '600'
$im_journal_ratelimit_burst = '20000'
} else { } else {
$rsyslog_package_name = 'rsyslog5' $rsyslog_package_name = 'rsyslog5'
$mysql_package_name = 'rsyslog5-mysql' $mysql_package_name = 'rsyslog5-mysql'

Просмотреть файл

@ -67,6 +67,13 @@ $Umask <%= scope.lookupvar('rsyslog::umask') %>
$OmitLocalLogging on $OmitLocalLogging on
<% end -%> <% end -%>
# Settings for imjournal
<% if scope.lookupvar('rsyslog::im_journal_statfile') -%>
$IMJournalStateFile <%=scope.lookupvar('rsyslog::im_journal_statfile') %>
<% end %>
$imjournalRatelimitInterval <%=scope.lookupvar('rsyslog::im_journal_ratelimit_interval') %>
$imjournalRatelimitBurst <%=scope.lookupvar('rsyslog::im_journal_ratelimit_burst') %>
# #
# Include all config files in <%= scope.lookupvar('rsyslog::rsyslog_d') %> # Include all config files in <%= scope.lookupvar('rsyslog::rsyslog_d') %>
# #