Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
B
base
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Lonlone Lee
base
Commits
bcc2e691
Verified
Commit
bcc2e691
authored
Oct 25, 2017
by
Adam Lewenberg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add use_logsink_server parameter
parent
85a59b42
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
0 deletions
+10
-0
NEWS
NEWS
+5
-0
manifests/syslog/config/rsyslog.pp
manifests/syslog/config/rsyslog.pp
+1
-0
templates/syslog/etc/rsyslog.d/95-default-v5.conf.erb
templates/syslog/etc/rsyslog.d/95-default-v5.conf.erb
+2
-0
templates/syslog/etc/rsyslog.d/95-default.conf.erb
templates/syslog/etc/rsyslog.d/95-default.conf.erb
+2
-0
No files found.
NEWS
View file @
bcc2e691
...
...
@@ -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
View file @
bcc2e691
...
...
@@ -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
View file @
bcc2e691
# 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
View file @
bcc2e691
...
...
@@ -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")
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment