From f334bd2de0fc78a400158adbd2bb328b404aa339 Mon Sep 17 00:00:00 2001 From: Steffen Zieger Date: Thu, 8 Sep 2016 13:49:44 +0200 Subject: [PATCH 1/5] new release v4.0.2 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index e2603c84..91c601ac 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "saz-rsyslog", - "version": "4.0.1", + "version": "4.0.2", "author": "saz", "summary": "Manage rsyslog client and server", "license": "Apache-2.0", From 403a32284f135c6f9341fe01bcfa283834f0f4f7 Mon Sep 17 00:00:00 2001 From: Chris Andrews Date: Tue, 20 Dec 2016 15:19:33 +0000 Subject: [PATCH 2/5] Allow removal of cron log file. --- manifests/client.pp | 3 ++- templates/client/local.conf.erb | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/manifests/client.pp b/manifests/client.pp index 386df49c..8c92ed5a 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -58,7 +58,8 @@ $high_precision_timestamps = false, $rate_limit_burst = undef, $rate_limit_interval = undef, - $imfiles = undef + $imfiles = undef, + $use_cron = true ) inherits rsyslog { if $custom_config { diff --git a/templates/client/local.conf.erb b/templates/client/local.conf.erb index 684abc14..750d4fed 100644 --- a/templates/client/local.conf.erb +++ b/templates/client/local.conf.erb @@ -17,7 +17,9 @@ auth.info;authpriv.info /var/log/auth.log # First some standard log files. Log by facility. # *.*;auth,authpriv.none -/var/log/syslog +<% if scope.lookupvar('rsyslog::client::use_cron') -%> cron.* /var/log/cron.log +<% end -%> daemon.* -/var/log/daemon.log kern.* -/var/log/kern.log #lpr.* -/var/log/lpr.log From 5d530fb4b2dc36dfbc1fda3ad23ddacd57a512d0 Mon Sep 17 00:00:00 2001 From: Chris Andrews Date: Tue, 20 Dec 2016 16:33:13 +0000 Subject: [PATCH 3/5] Allowed more configurable fields to both the default rsyslog config file and the client config file. This will cater for config wanting to make use of the default values. --- manifests/client.pp | 56 +++++++++++++++++--------------- templates/client/config.conf.erb | 18 +++++++--- templates/rsyslog.conf.erb | 14 ++++++++ 3 files changed, 58 insertions(+), 30 deletions(-) diff --git a/manifests/client.pp b/manifests/client.pp index 8c92ed5a..00c11980 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -34,32 +34,36 @@ # class { 'rsyslog::client': } # class rsyslog::client ( - $log_remote = true, - $spool_size = '1g', - $spool_timeoutenqueue = false, - $remote_type = 'tcp', - $remote_forward_format = 'RSYSLOG_ForwardFormat', - $log_local = false, - $log_local_custom = undef, - $log_auth_local = false, - $listen_localhost = false, - $split_config = false, - $custom_config = undef, - $custom_params = undef, - $server = 'log', - $port = '514', - $remote_servers = false, - $ssl_ca = undef, - $ssl_permitted_peer = undef, - $ssl_auth_mode = 'anon', - $log_templates = false, - $log_filters = false, - $actionfiletemplate = false, - $high_precision_timestamps = false, - $rate_limit_burst = undef, - $rate_limit_interval = undef, - $imfiles = undef, - $use_cron = true + $log_remote = true, + $spool_size = '1g', + $spool_timeoutenqueue = false, + $remote_type = 'tcp', + $remote_forward_format = 'RSYSLOG_ForwardFormat', + $log_local = false, + $log_local_custom = undef, + $log_auth_local = false, + $listen_localhost = false, + $split_config = false, + $custom_config = undef, + $custom_params = undef, + $server = 'log', + $port = '514', + $remote_servers = false, + $ssl_ca = undef, + $ssl_permitted_peer = undef, + $ssl_auth_mode = 'anon', + $log_templates = false, + $log_filters = false, + $actionfiletemplate = false, + $high_precision_timestamps = false, + $rate_limit_burst = undef, + $rate_limit_interval = undef, + $imfiles = undef, + $use_cron = true, + $action_queue_filename = 'queue', + $action_queue_save_on_shutdown = 'no', + $action_queue_type = 'LinkedList', + $action_resume_retry_count = '-1' ) inherits rsyslog { if $custom_config { diff --git a/templates/client/config.conf.erb b/templates/client/config.conf.erb index ef25587c..cb2bcee9 100644 --- a/templates/client/config.conf.erb +++ b/templates/client/config.conf.erb @@ -1,13 +1,23 @@ # An "In-Memory Queue" is created for remote logging. $WorkDirectory <%= scope.lookupvar('rsyslog::spool_dir') -%> # where to place spool files -$ActionQueueFileName queue # unique name prefix for spool files +<% if scope.lookupvar('rsyslog::client::action_queue_filename') -%> +$ActionQueueFileName <%= scope.lookupvar('rsyslog::client::action_queue_filename') -%> # unique name prefix for spool files +<% end -%> +<% if scope.lookupvar('rsyslog::client::spool_size') -%> $ActionQueueMaxDiskSpace <%= scope.lookupvar('rsyslog::client::spool_size') -%> # spool space limit (use as much as possible) -$ActionQueueSaveOnShutdown on # save messages to disk on shutdown +<% end -%> +<% if scope.lookupvar('rsyslog::client::action_queue_save_on_shutdown') -%> +$ActionQueueSaveOnShutdown <%= scope.lookupvar('rsyslog::client::action_queue_save_on_shutdown') -%> # whether to save messages to disk on shutdown +<% end -%> <% if scope.lookupvar('rsyslog::client::spool_timeoutenqueue') -%> $ActionQueueTimeoutEnqueue <%= scope.lookupvar('rsyslog::client::spool_timeoutenqueue') -%> # time to wait before discarding on full spool <% end -%> -$ActionQueueType LinkedList # run asynchronously -$ActionResumeRetryCount -1 # infinety retries if host is down +<% if scope.lookupvar('rsyslog::client::action_queue_type') -%> +$ActionQueueType <%= scope.lookupvar('rsyslog::client::action_queue_type') -%> # processing type +<% end -%> +<% if scope.lookupvar('rsyslog::client::action_resume_retry_count') -%> +$ActionResumeRetryCount <%= scope.lookupvar('rsyslog::client::action_resume_retry_count') -%> # retries if host is down +<% end -%> <% if scope.lookupvar('rsyslog::client::log_templates') and ! scope.lookupvar('rsyslog::client::log_templates').empty?-%> # Define custom logging templates diff --git a/templates/rsyslog.conf.erb b/templates/rsyslog.conf.erb index ede26f1c..708da059 100644 --- a/templates/rsyslog.conf.erb +++ b/templates/rsyslog.conf.erb @@ -24,13 +24,19 @@ $KLogPermitNonKernelFacility on # # Set max message size for sending and receiving # +<% if scope.lookupvar('rsyslog::max_message_size') -%> $MaxMessageSize <%= scope.lookupvar('rsyslog::max_message_size') %> +<% end -%> # # Set rate limit for messages received. # +<% if scope.lookupvar('rsyslog::system_log_rate_limit_interval') -%> $SystemLogRateLimitInterval <%= scope.lookupvar('rsyslog::system_log_rate_limit_interval') %> +<% end -%> +<% if scope.lookupvar('rsyslog::system_log_rate_limit_burst') -%> $SystemLogRateLimitBurst <%= scope.lookupvar('rsyslog::system_log_rate_limit_burst') %> +<% end -%> <% if scope.lookupvar('rsyslog::default_template') and scope.lookupvar('rsyslog::default_template') != :undef -%> # @@ -51,11 +57,19 @@ $RepeatedMsgReduction on $FileOwner <%= scope.lookupvar('rsyslog::log_user') %> $FileGroup <%= scope.lookupvar('rsyslog::log_group') %> $FileCreateMode <%= scope.lookupvar('rsyslog::perm_file') %> +<% if scope.lookupvar('rsyslog::log_user') -%> $DirOwner <%= scope.lookupvar('rsyslog::log_user') %> +<% end -%> +<% if scope.lookupvar('rsyslog::log_group') -%> $DirGroup <%= scope.lookupvar('rsyslog::log_group') %> +<% end -%> $DirCreateMode <%= scope.lookupvar('rsyslog::perm_dir') %> +<% if scope.lookupvar('rsyslog::run_user') -%> $PrivDropToUser <%= scope.lookupvar('rsyslog::run_user') %> +<% end -%> +<% if scope.lookupvar('rsyslog::run_group') -%> $PrivDropToGroup <%= scope.lookupvar('rsyslog::run_group') %> +<% end -%> $WorkDirectory <%= scope.lookupvar('rsyslog::spool_dir') %> <% if scope.lookupvar('rsyslog::umask') -%> $Umask <%= scope.lookupvar('rsyslog::umask') %> From 125587a5ebb78659c652cc480e75b2de2d268acb Mon Sep 17 00:00:00 2001 From: Chris Andrews Date: Tue, 20 Dec 2016 16:59:57 +0000 Subject: [PATCH 4/5] Renamed the value checks on run_user and run_group to priv_drop_user priv_drop_group respectively to allow removal of the PrivDropToUser and PrivDropToGroup config options. --- templates/rsyslog.conf.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/rsyslog.conf.erb b/templates/rsyslog.conf.erb index 708da059..02a362f9 100644 --- a/templates/rsyslog.conf.erb +++ b/templates/rsyslog.conf.erb @@ -64,10 +64,10 @@ $DirOwner <%= scope.lookupvar('rsyslog::log_user') %> $DirGroup <%= scope.lookupvar('rsyslog::log_group') %> <% end -%> $DirCreateMode <%= scope.lookupvar('rsyslog::perm_dir') %> -<% if scope.lookupvar('rsyslog::run_user') -%> +<% if scope.lookupvar('rsyslog::priv_drop_user') -%> $PrivDropToUser <%= scope.lookupvar('rsyslog::run_user') %> <% end -%> -<% if scope.lookupvar('rsyslog::run_group') -%> +<% if scope.lookupvar('rsyslog::priv_drop_group') -%> $PrivDropToGroup <%= scope.lookupvar('rsyslog::run_group') %> <% end -%> $WorkDirectory <%= scope.lookupvar('rsyslog::spool_dir') %> From 7b53c125cd912f38ce81dab2403868efba928a49 Mon Sep 17 00:00:00 2001 From: Chris Andrews Date: Wed, 21 Dec 2016 12:51:36 +0000 Subject: [PATCH 5/5] Added undef checks to the new conditional config values added in fcc93076dbbf2f5b742d7b3d6a8887d42487e08f. --- templates/client/config.conf.erb | 10 +++++----- templates/rsyslog.conf.erb | 22 +++++++++++----------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/templates/client/config.conf.erb b/templates/client/config.conf.erb index cb2bcee9..823bf60e 100644 --- a/templates/client/config.conf.erb +++ b/templates/client/config.conf.erb @@ -1,21 +1,21 @@ # An "In-Memory Queue" is created for remote logging. $WorkDirectory <%= scope.lookupvar('rsyslog::spool_dir') -%> # where to place spool files -<% if scope.lookupvar('rsyslog::client::action_queue_filename') -%> +<% if scope.lookupvar('rsyslog::client::action_queue_filename') and scope.lookupvar('rsyslog::client::action_queue_filename') != :undef -%> $ActionQueueFileName <%= scope.lookupvar('rsyslog::client::action_queue_filename') -%> # unique name prefix for spool files <% end -%> -<% if scope.lookupvar('rsyslog::client::spool_size') -%> +<% if scope.lookupvar('rsyslog::client::spool_size') and scope.lookupvar('rsyslog::client::spool_size') != :undef -%> $ActionQueueMaxDiskSpace <%= scope.lookupvar('rsyslog::client::spool_size') -%> # spool space limit (use as much as possible) <% end -%> -<% if scope.lookupvar('rsyslog::client::action_queue_save_on_shutdown') -%> +<% if scope.lookupvar('rsyslog::client::action_queue_save_on_shutdown') and scope.lookupvar('rsyslog::client::action_queue_save_on_shutdown') != :undef -%> $ActionQueueSaveOnShutdown <%= scope.lookupvar('rsyslog::client::action_queue_save_on_shutdown') -%> # whether to save messages to disk on shutdown <% end -%> <% if scope.lookupvar('rsyslog::client::spool_timeoutenqueue') -%> $ActionQueueTimeoutEnqueue <%= scope.lookupvar('rsyslog::client::spool_timeoutenqueue') -%> # time to wait before discarding on full spool <% end -%> -<% if scope.lookupvar('rsyslog::client::action_queue_type') -%> +<% if scope.lookupvar('rsyslog::client::action_queue_type') and scope.lookupvar('rsyslog::client::action_queue_type') != :undef -%> $ActionQueueType <%= scope.lookupvar('rsyslog::client::action_queue_type') -%> # processing type <% end -%> -<% if scope.lookupvar('rsyslog::client::action_resume_retry_count') -%> +<% if scope.lookupvar('rsyslog::client::action_resume_retry_count') and scope.lookupvar('rsyslog::client::action_resume_retry_count') != :undef -%> $ActionResumeRetryCount <%= scope.lookupvar('rsyslog::client::action_resume_retry_count') -%> # retries if host is down <% end -%> <% if scope.lookupvar('rsyslog::client::log_templates') and ! scope.lookupvar('rsyslog::client::log_templates').empty?-%> diff --git a/templates/rsyslog.conf.erb b/templates/rsyslog.conf.erb index 02a362f9..1d18215f 100644 --- a/templates/rsyslog.conf.erb +++ b/templates/rsyslog.conf.erb @@ -31,10 +31,10 @@ $MaxMessageSize <%= scope.lookupvar('rsyslog::max_message_size') %> # # Set rate limit for messages received. # -<% if scope.lookupvar('rsyslog::system_log_rate_limit_interval') -%> +<% if scope.lookupvar('rsyslog::system_log_rate_limit_interval') and scope.lookupvar('rsyslog::system_log_rate_limit_interval') != :undef -%> $SystemLogRateLimitInterval <%= scope.lookupvar('rsyslog::system_log_rate_limit_interval') %> <% end -%> -<% if scope.lookupvar('rsyslog::system_log_rate_limit_burst') -%> +<% if scope.lookupvar('rsyslog::system_log_rate_limit_burst') and scope.lookupvar('rsyslog::system_log_rate_limit_burst') != :undef -%> $SystemLogRateLimitBurst <%= scope.lookupvar('rsyslog::system_log_rate_limit_burst') %> <% end -%> @@ -57,21 +57,21 @@ $RepeatedMsgReduction on $FileOwner <%= scope.lookupvar('rsyslog::log_user') %> $FileGroup <%= scope.lookupvar('rsyslog::log_group') %> $FileCreateMode <%= scope.lookupvar('rsyslog::perm_file') %> -<% if scope.lookupvar('rsyslog::log_user') -%> +<% if scope.lookupvar('rsyslog::log_user') and scope.lookupvar('rsyslog::log_user') != :undef -%> $DirOwner <%= scope.lookupvar('rsyslog::log_user') %> <% end -%> -<% if scope.lookupvar('rsyslog::log_group') -%> +<% if scope.lookupvar('rsyslog::log_group') and scope.lookupvar('rsyslog::log_group') != :undef -%> $DirGroup <%= scope.lookupvar('rsyslog::log_group') %> <% end -%> $DirCreateMode <%= scope.lookupvar('rsyslog::perm_dir') %> -<% if scope.lookupvar('rsyslog::priv_drop_user') -%> +<% if scope.lookupvar('rsyslog::priv_drop_user') and scope.lookupvar('rsyslog::priv_drop_user') != :undef -%> $PrivDropToUser <%= scope.lookupvar('rsyslog::run_user') %> <% end -%> -<% if scope.lookupvar('rsyslog::priv_drop_group') -%> +<% if scope.lookupvar('rsyslog::priv_drop_group') and scope.lookupvar('rsyslog::priv_drop_group') != :undef -%> $PrivDropToGroup <%= scope.lookupvar('rsyslog::run_group') %> <% end -%> $WorkDirectory <%= scope.lookupvar('rsyslog::spool_dir') %> -<% if scope.lookupvar('rsyslog::umask') -%> +<% if scope.lookupvar('rsyslog::umask') and scope.lookupvar('rsyslog::umask') != :undef -%> $Umask <%= scope.lookupvar('rsyslog::umask') %> <% end -%> @@ -82,16 +82,16 @@ $OmitLocalLogging on <% end -%> # Settings for imjournal (If supported) -<% if scope.lookupvar('rsyslog::im_journal_statefile') -%> +<% if scope.lookupvar('rsyslog::im_journal_statefile') and scope.lookupvar('rsyslog::im_journal_statefile') != :undef -%> $IMJournalStateFile <%=scope.lookupvar('rsyslog::im_journal_statefile') %> <% end %> -<% if scope.lookupvar('rsyslog::im_journal_ignore_previous_messages') -%> +<% if scope.lookupvar('rsyslog::im_journal_ignore_previous_messages') and scope.lookupvar('rsyslog::im_journal_ignore_previous_messages') != :undef -%> $ImjournalIgnorePreviousMessages <%=scope.lookupvar('rsyslog::im_journal_ignore_previous_messages') %> <% end %> -<% if scope.lookupvar('rsyslog::im_journal_ratelimit_interval') -%> +<% if scope.lookupvar('rsyslog::im_journal_ratelimit_interval') and scope.lookupvar('rsyslog::im_journal_ratelimit_interval') != :undef -%> $imjournalRatelimitInterval <%=scope.lookupvar('rsyslog::im_journal_ratelimit_interval') %> <% end %> -<% if scope.lookupvar('rsyslog::im_journal_ratelimit_burst') -%> +<% if scope.lookupvar('rsyslog::im_journal_ratelimit_burst') and scope.lookupvar('rsyslog::im_journal_ratelimit_burst') != :undef -%> $imjournalRatelimitBurst <%=scope.lookupvar('rsyslog::im_journal_ratelimit_burst') %> <% end %>