Skip to content

Commit 77b4b36

Browse files
author
Christopher M. Neill
committed
change match string to something more specific
1 parent 323e8ea commit 77b4b36

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

ansible/roles/docker/files/docker.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ script
3939
if [ -f /etc/default/$UPSTART_JOB ]; then
4040
. /etc/default/$UPSTART_JOB
4141
fi
42-
exec "$DOCKER" daemon $DOCKER_OPTS 2>&1 | logger -t docker -p local7.info
42+
exec "$DOCKER" daemon $DOCKER_OPTS 2>&1 | logger -t docker_engine -p local7.info
4343
end script
4444

4545
# Don't emit "started" event until docker.sock is ready.
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
$WorkDirectory /var/spool/rsyslog
22

33
# Rotate per hour
4-
$template RotateHourly_docker,"/var/log/runnable/%$YEAR%/%$MONTH%/%$DAY%/%$HOUR%/docker.log"
5-
if $msg contains 'docker' and $syslogfacility-text == 'local7' then { action (type="omfile" DynaFile="RotateHourly_docker" template="RunnableJSON" dirCreateMode="0755" FileCreateMode="0644") }
4+
$template RotateHourly_docker_engine,"/var/log/runnable/%$YEAR%/%$MONTH%/%$DAY%/%$HOUR%/docker_engine.log"
5+
if $msg contains 'docker_engine' and $syslogfacility-text == 'local7' then { action (type="omfile" DynaFile="RotateHourly_docker_engine" template="RunnableJSON" dirCreateMode="0755" FileCreateMode="0644") }
66

7-
# Loggly: Add a tag for docker events
8-
$template LogglyFormat_docker,"<%pri%>%protocol-version% %timestamp:::date-rfc3339% %HOSTNAME% %app-name% %procid% %msgid% [f673760d-e0b3-4a93-a15e-2862ea074f91@41058 tag=\"runnable\" tag=\"production-epsilon\"] %msg%\n"
9-
if $msg contains 'docker' and $syslogfacility-text == 'local7' then @@logs-01.loggly.com:6514;LogglyFormat_docker
10-
if $msg contains 'docker' and $syslogfacility-text == 'local7' then stop
7+
# Loggly: Add a tag for docker_engine events
8+
$template LogglyFormat_docker_engine,"<%pri%>%protocol-version% %timestamp:::date-rfc3339% %HOSTNAME% %app-name% %procid% %msgid% [f673760d-e0b3-4a93-a15e-2862ea074f91@41058 tag=\"runnable\" tag=\"production-epsilon\"] %msg%\n"
9+
if $msg contains 'docker_engine' and $syslogfacility-text == 'local7' then @@logs-01.loggly.com:6514;LogglyFormat_docker_engine
10+
if $msg contains 'docker_engine' and $syslogfacility-text == 'local7' then stop

0 commit comments

Comments
 (0)