Added support for imjournal rate limit settings

manifests/init.pp

@@ -48,7 +48,9 @@ class rsyslog (
   $default_template               = $rsyslog::params::default_template,
   $msg_reduction                  = $rsyslog::params::msg_reduction,
   $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 {
   class { 'rsyslog::install': }
   class { 'rsyslog::config': }

manifests/params.pp

@@ -110,19 +110,21 @@ class rsyslog::params {
         $omit_local_logging     = false
       }
       elsif versioncmp($::operatingsystemmajrelease, '7') >= 0 {
-        $rsyslog_package_name   = 'rsyslog'
-        $mysql_package_name     = 'rsyslog-mysql'
-        $pgsql_package_name     = 'rsyslog-pgsql'
-        $gnutls_package_name    = 'rsyslog-gnutls'
-        $relp_package_name      = 'rsyslog-relp'
-        $default_config_file    = 'rsyslog_default_rhel7'
-        $modules                = [
+        $rsyslog_package_name           = 'rsyslog'
+        $mysql_package_name             = 'rsyslog-mysql'
+        $pgsql_package_name             = 'rsyslog-pgsql'
+        $gnutls_package_name            = 'rsyslog-gnutls'
+        $relp_package_name              = 'rsyslog-relp'
+        $default_config_file            = 'rsyslog_default_rhel7'
+        $modules                        = [
           '$ModLoad imuxsock # provides support for local system logging',
           '$ModLoad imjournal # provides access to the systemd journal',
           '#$ModLoad imklog   # provides kernel logging support (previously done by rklogd)',
           '#$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 {
         $rsyslog_package_name   = 'rsyslog5'
         $mysql_package_name     = 'rsyslog5-mysql'

templates/rsyslog.conf.erb

@@ -67,6 +67,13 @@ $Umask <%= scope.lookupvar('rsyslog::umask') %>
 $OmitLocalLogging on
 <% 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') %>
 #