Merge pull request #465 from CodeNow/SAN-3492-add-docker-upstart-logs-loggly

Pipe STDOUT/STDERR into logger

Author: und1sk0

ansible/roles/docker/files/docker.conf

@@ -0,0 +1,61 @@
+description "Docker daemon"
+
+start on (local-filesystems and net-device-up IFACE!=lo)
+stop on runlevel [!2345]
+limit nofile 524288 1048576
+limit nproc 524288 1048576
+
+respawn
+
+kill timeout 20
+
+pre-start script
+	# see also https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount
+	if grep -v '^#' /etc/fstab | grep -q cgroup \
+		|| [ ! -e /proc/cgroups ] \
+		|| [ ! -d /sys/fs/cgroup ]; then
+		exit 0
+	fi
+	if ! mountpoint -q /sys/fs/cgroup; then
+		mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup
+	fi
+	(
+		cd /sys/fs/cgroup
+		for sys in $(awk '!/^#/ { if ($4 == 1) print $1 }' /proc/cgroups); do
+			mkdir -p $sys
+			if ! mountpoint -q $sys; then
+				if ! mount -n -t cgroup -o $sys cgroup $sys; then
+					rmdir $sys || true
+				fi
+			fi
+		done
+	)
+end script
+
+script
+	# modify these in /etc/default/$UPSTART_JOB (/etc/default/docker)
+	DOCKER=/usr/bin/$UPSTART_JOB
+	DOCKER_OPTS=
+	if [ -f /etc/default/$UPSTART_JOB ]; then
+		. /etc/default/$UPSTART_JOB
+	fi
+    # redirect STDOUT/STDERR to logger app for rsyslog/loggly
+	exec "$DOCKER" daemon $DOCKER_OPTS 2>&1 | logger -t docker_engine -p local7.info
+end script
+
+# Don't emit "started" event until docker.sock is ready.
+# See https://github.com/docker/docker/issues/6647
+post-start script
+	DOCKER_OPTS=
+	if [ -f /etc/default/$UPSTART_JOB ]; then
+		. /etc/default/$UPSTART_JOB
+	fi
+	if ! printf "%s" "$DOCKER_OPTS" | grep -qE -e '-H|--host'; then
+		while ! [ -e /var/run/docker.sock ]; do
+			initctl status $UPSTART_JOB | grep -qE "(stop|respawn)/" && exit 1
+			echo "Waiting for /var/run/docker.sock"
+			sleep 0.1
+		done
+		echo "/var/run/docker.sock is up"
+	fi
+end script

ansible/roles/docker/tasks/main.yml

@@ -5,6 +5,15 @@
   file:
     path=/etc/ssl/docker
     state=directory
+ 
+- name: copy docker upstart config
+  become: true
+  copy:
+    src=docker.conf
+    dest=/etc/init/docker.conf
+    mode=0444
+    owner=root
+    group=root
 
 - name: copy docker certs
   become: true

ansible/roles/loggly/files/21-rotated-docker.conf

@@ -0,0 +1,10 @@
+$WorkDirectory /var/spool/rsyslog
+
+# Rotate per hour
+$template RotateHourly_docker_engine,"/var/log/runnable/%$YEAR%/%$MONTH%/%$DAY%/%$HOUR%/docker_engine.log"
+if $msg contains 'docker_engine' and $syslogfacility-text == 'local7' then { action (type="omfile" DynaFile="RotateHourly_docker_engine" template="RunnableJSON" dirCreateMode="0755" FileCreateMode="0644") }
+
+# Loggly: Add a tag for docker_engine events
+$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"
+if $msg contains 'docker_engine' and $syslogfacility-text == 'local7' then @@logs-01.loggly.com:6514;LogglyFormat_docker_engine
+if $msg contains 'docker_engine' and $syslogfacility-text == 'local7' then stop

ansible/roles/loggly/tasks/main.yml

@@ -55,6 +55,15 @@
     owner=syslog
     group=syslog
 
+- name: copy docker upstart logs config
+  tags: loggly
+  become: true
+  copy:
+    src=21-rotated-docker.conf
+    dest=/etc/rsyslog.d/21-rotated-docker.conf
+    owner=syslog
+    group=syslog
+
 - name: copy app config
   when: name is defined
   tags: loggly