From bcc2e691fe3aff5c47487ac76be3a72938cb5365 Mon Sep 17 00:00:00 2001
From: Adam Henry Lewenberg <adamhl@stanford.edu>
Date: Wed, 25 Oct 2017 13:55:08 -0700
Subject: [PATCH] add use_logsink_server parameter
---
NEWS | 5 +++++
manifests/syslog/config/rsyslog.pp | 1 +
templates/syslog/etc/rsyslog.d/95-default-v5.conf.erb | 2 ++
templates/syslog/etc/rsyslog.d/95-default.conf.erb | 2 ++
4 files changed, 10 insertions(+)
diff --git a/NEWS b/NEWS
index 47a6c39..3c720fd 100644
--- a/NEWS
+++ b/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]
diff --git a/manifests/syslog/config/rsyslog.pp b/manifests/syslog/config/rsyslog.pp
index b2673eb..459f819 100644
--- a/manifests/syslog/config/rsyslog.pp
+++ b/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) {
diff --git a/templates/syslog/etc/rsyslog.d/95-default-v5.conf.erb b/templates/syslog/etc/rsyslog.d/95-default-v5.conf.erb
index 14eee54..51dfe99 100644
--- a/templates/syslog/etc/rsyslog.d/95-default-v5.conf.erb
+++ b/templates/syslog/etc/rsyslog.d/95-default-v5.conf.erb
@@ -1,6 +1,8 @@
# 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:*
diff --git a/templates/syslog/etc/rsyslog.d/95-default.conf.erb b/templates/syslog/etc/rsyslog.d/95-default.conf.erb
index ffb21fd..6beda35 100644
--- a/templates/syslog/etc/rsyslog.d/95-default.conf.erb
+++ b/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")
--
GitLab