Skip to content

Set rsyslog queue types #479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
und1sk0 merged 7 commits into from
Jun 2, 2016
Merged

Set rsyslog queue types #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
486bc80
Test various queue types.
May 25, 2016
ff06bcb
Wrong. syslogtagid no exist. Also, %msg%
May 25, 2016
96f1b0a
yolo
May 25, 2016
2fba137
Direct for all others.
May 25, 2016
757147a
undo
May 25, 2016
a7d2586
trailing space
May 25, 2016
336a331
Merge branch 'master' into set-rsyslog-queue-types
Jun 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ansible/roles/loggly/files/50-default.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
#
# For more information see rsyslog.conf(5) and /etc/rsyslog.conf

# No buffering
$ActionQueueType Direct

#
# First some standard log files. Log by facility.
#
Expand Down
6 changes: 6 additions & 0 deletions ansible/roles/loggly/files/rsyslog.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ $KLogPermitNonKernelFacility on
#### GLOBAL DIRECTIVES ####
###########################

#
# Set main message queue to use direct queuing (not queued) mode
#

$MainMsgQueueType Direct

#
# Use traditional timestamp format.
# To enable high precision timestamps, comment out the following line.
Expand Down
4 changes: 3 additions & 1 deletion ansible/roles/loggly/templates/21-output-syslog.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
$WorkDirectory /var/spool/rsyslog

# Rotate per hour
$ActionQueueType Direct
$template RotateHourly_{{ name }},"{{ app_log_dir }}/%$YEAR%/%$MONTH%/%$DAY%/%$HOUR%/{{ name }}.log"
if $syslogtag contains '{{ name }}' and $syslogfacility-text == 'local7' then { action (type="omfile" DynaFile="RotateHourly_{{ name }}" template="RunnableJSON" dirCreateMode="0755" FileCreateMode="0644") }

# Loggly: Add a tag for {{ name }} events
$template LogglyFormat_{{ name }},"<%pri%>%protocol-version% %timestamp:::date-rfc3339% %HOSTNAME% %app-name% %procid% %syslogtagid% [{{ loggly_token }}@41058 tag=\"runnable\" tag=\"{{ node_env }}\"] %syslogtag%\n"
$ActionQueueType LinkedList
Copy link
Copy Markdown
Contributor Author

@und1sk0 und1sk0 May 25, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is an in-memory queue.

$template LogglyFormat_{{ name }},"<%pri%>%protocol-version% %timestamp:::date-rfc3339% %HOSTNAME% %app-name% %procid% %syslogtag% [{{ loggly_token }}@41058 tag=\"runnable\" tag=\"{{ node_env }}\"] %msg%\n"
Copy link
Copy Markdown
Contributor Author

@und1sk0 und1sk0 May 25, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no such thing as %syslogtagid%, and we want to send the %msg% not the %syslogtagid% OR the %syslogtag%; this line had been being ignored prior to this change.

if $syslogtag contains '{{ name }}' and $syslogfacility-text == 'local7' then @@logs-01.loggly.com:6514;LogglyFormat_{{ name }}
if $syslogtag contains '{{ name }}' and $syslogfacility-text == 'local7' then stop