add use_logsink_server parameter

NEWS

@@ -4,6 +4,11 @@ unreleased (207x-xx-xx)
 
 release/005.010 (2017-10-02)
 
+    [syslog] Add use_logsink_server parameter that allows servers to not
+    send logs to the logsink server. Once everyone is using Splunk, ELK,
+    etc., we will set this default to false. In the meantime, the default
+    is true. [adamhl]
+
     [kerberos] Use three rather than four "kdc" lines in
     /etc/krb5.conf. [adamhl]
 

manifests/syslog/config/rsyslog.pp

@@ -47,6 +47,7 @@ define base::syslog::config::rsyslog(
   $use_syslog_conf = false,
   $use_default     = true,
   $use_v5          = false,
+  $use_logsink_server = true,
 ) {
 
   if ($use_syslog_conf != 'true' and $use_syslog_conf != true) {

templates/syslog/etc/rsyslog.d/95-default-v5.conf.erb

 # Write syslog messages to the normal places locally
 
 *.debug  /var/log/messages;FileFormat
+<%- if (@use_logsink_server) then -%>
 *.debug  @<%= syslog_server %>:514;ForwardFormat
+<%- end -%>
 *.err    /dev/console
 *.emerg  :omusrmsg:*

templates/syslog/etc/rsyslog.d/95-default.conf.erb

@@ -59,6 +59,7 @@
                name     = "defaultLocal"
                file     = "/var/log/messages"
                template = "FileFormat")
+<%- if (@use_logsink_server) then -%>
 *.debug action(type = "omfwd"
                name     = "defaultRemote"
                Target   = "<%= @syslog_server %>"
@@ -75,6 +76,7 @@
                queue.TimeoutEnqueue = "0"
                action.ResumeRetryCount = "-1"
                template = "ForwardFormat")
+<%- end -%>
 *.err   action(type = "omfile"
                name = "err"
                file = "/dev/console")