Merge pull request #473 from CodeNow/SAN-4129-swarm-manager-logs

San 4129 swarm manager logs

Author: und1sk0

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

@@ -2,9 +2,9 @@ $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") }
+if $syslogtag 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
+$template LogglyFormat_docker_engine,"<%pri%>%protocol-version% %timestamp:::date-rfc3339% %HOSTNAME% %app-name% %procid% %syslogtagid% [f673760d-e0b3-4a93-a15e-2862ea074f91@41058 tag=\"runnable\" tag=\"production-epsilon\"] %syslogtag%\n"
+if $syslogtag contains 'docker_engine' and $syslogfacility-text == 'local7' then @@logs-01.loggly.com:6514;LogglyFormat_docker_engine
+if $syslogtag contains 'docker_engine' and $syslogfacility-text == 'local7' then stop

ansible/roles/loggly/templates/21-output-syslog.conf.j2

@@ -2,9 +2,9 @@ $WorkDirectory /var/spool/rsyslog
 
 # Rotate per hour
 $template RotateHourly_{{ name }},"{{ app_log_dir }}/%$YEAR%/%$MONTH%/%$DAY%/%$HOUR%/{{ name }}.log"
-if $msg contains '{{ name }}' and $syslogfacility-text == 'local7' then { action (type="omfile" DynaFile="RotateHourly_{{ name }}" template="RunnableJSON" dirCreateMode="0755" FileCreateMode="0644") }
+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% %msgid% [{{ loggly_token }}@41058 tag=\"runnable\" tag=\"{{ node_env }}\"] %msg%\n"
-if $msg contains '{{ name }}' and $syslogfacility-text == 'local7' then @@logs-01.loggly.com:6514;LogglyFormat_{{ name }}
-if $msg contains '{{ name }}' and $syslogfacility-text == 'local7' then stop
+$template LogglyFormat_{{ name }},"<%pri%>%protocol-version% %timestamp:::date-rfc3339% %HOSTNAME% %app-name% %procid% %syslogtagid% [{{ loggly_token }}@41058 tag=\"runnable\" tag=\"{{ node_env }}\"] %syslogtag%\n"
+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