Skip to content

Pipe STDOUT/STDERR into logger#465

Merged
und1sk0 merged 3 commits intomasterfrom
SAN-3492-add-docker-upstart-logs-loggly
May 12, 2016
Merged

Pipe STDOUT/STDERR into logger#465
und1sk0 merged 3 commits intomasterfrom
SAN-3492-add-docker-upstart-logs-loggly

Conversation

@und1sk0
Copy link
Copy Markdown
Contributor

@und1sk0 und1sk0 commented May 11, 2016

  • Adds a rsyslog.d/21-rotated-docker.conf file for rsyslog to trap docker upstart logs in /var/log/runnable/<YYYY/MM/DD/HH>/.../docker.log
  • Adds a etc/init/docker.conf file to handle the upstart output

Dependancies

Server must be rebooted or docker-engine restarted.

Reviewers

Tests

Test any modifications on one of our environments.

Deployment (post-merge)

Ensure that all environments have the given changes.

  • deployed to epsilon
  • deployed to gamma
  • deployed to delta

@und1sk0 und1sk0 added the review label May 11, 2016
Comment thread ansible/roles/docker/files/docker.conf Outdated
if [ -f /etc/default/$UPSTART_JOB ]; then
. /etc/default/$UPSTART_JOB
fi
exec "$DOCKER" daemon $DOCKER_OPTS 2>&1 | logger -t docker -p local7.info
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This! this is the line that's different! I found it!

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

can you put a comment somewhere in this file either at the top describing the changes or comments where the changes are?

@rsandor
Copy link
Copy Markdown
Contributor

rsandor commented May 12, 2016

@und1sk0 - double check dock-init to ensure we aren't overwriting this file anymore, plz.

@und1sk0
Copy link
Copy Markdown
Contributor Author

und1sk0 commented May 12, 2016

@rsandor dock-init updates /etc/default/docker, different file. This updates the upstart config (/etc/init/docker.conf)

@bkendall
Copy link
Copy Markdown
Contributor

LGTM - does mean that we have to have a small (< 60 second, likely) downtime for the services that we have running in docker to update this...

@und1sk0 und1sk0 merged commit 3fc3ee8 into master May 12, 2016
@und1sk0 und1sk0 deleted the SAN-3492-add-docker-upstart-logs-loggly branch May 12, 2016 21:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants