diff --git a/deployment/roles/common/templates/docker-logs.j2 b/deployment/roles/common/templates/docker-logs.j2 index eb1a095c..0b792760 100644 --- a/deployment/roles/common/templates/docker-logs.j2 +++ b/deployment/roles/common/templates/docker-logs.j2 @@ -1,6 +1,6 @@ /var/log/docker/*/docker.log { rotate 5 - size 1G + size 100M compress missingok delaycompress @@ -8,7 +8,7 @@ } /var/log/docker/*.log { rotate 5 - size 1G + size 100M compress missingok delaycompress diff --git a/deployment/roles/oracle/tasks/logging.yml b/deployment/roles/oracle/tasks/logging.yml index 96bdffe0..cdbe76b3 100644 --- a/deployment/roles/oracle/tasks/logging.yml +++ b/deployment/roles/oracle/tasks/logging.yml @@ -7,7 +7,7 @@ loop_control: loop_var: file -- name: Set the local container logs configuration file +- name: Set the oracle's containers local logs configuration file template: src: 31-oracle-docker.conf.j2 dest: /etc/rsyslog.d/31-oracle-docker.conf @@ -15,6 +15,22 @@ group: root mode: 0644 +- name: Set the redis container local logs configuration file + template: + src: 32-redis-docker.conf.j2 + dest: /etc/rsyslog.d/32-redis-docker.conf + owner: root + group: root + mode: 0644 + +- name: Set the rabbit MQ container local logs configuration file + template: + src: 33-rabbit-docker.conf.j2 + dest: /etc/rsyslog.d/33-rabbit-docker.conf + owner: root + group: root + mode: 0644 + - name: Set the log configuration file to send container logs to remote server template: src: 36-oracle-remote-logging.conf.j2 diff --git a/deployment/roles/oracle/templates/32-redis-docker.conf.j2 b/deployment/roles/oracle/templates/32-redis-docker.conf.j2 new file mode 100644 index 00000000..5a32db69 --- /dev/null +++ b/deployment/roles/oracle/templates/32-redis-docker.conf.j2 @@ -0,0 +1,11 @@ +$FileCreateMode 0644 +template(name="DockerLogFileName_Redis" type="list") { + constant(value="/var/log/docker/") + property(name="syslogtag" securepath="replace" regex.type="ERE" regex.submatch="1" regex.expression="oracle_(.*redis.*)\\/[a-zA-Z0-9]+\\[") + constant(value="/docker.log") +} + +if $programname contains 'oracle' and $programname contains 'redis' then \ + ?DockerLogFileName_Redis + +$FileCreateMode 0600 diff --git a/deployment/roles/oracle/templates/33-rabbit-docker.conf.j2 b/deployment/roles/oracle/templates/33-rabbit-docker.conf.j2 new file mode 100644 index 00000000..0f0753d5 --- /dev/null +++ b/deployment/roles/oracle/templates/33-rabbit-docker.conf.j2 @@ -0,0 +1,11 @@ +$FileCreateMode 0644 +template(name="DockerLogFileName_Rabbit" type="list") { + constant(value="/var/log/docker/") + property(name="syslogtag" securepath="replace" regex.type="ERE" regex.submatch="1" regex.expression="oracle_(.*rabbit.*)\\/[a-zA-Z0-9]+\\[") + constant(value="/docker.log") +} + +if $programname contains 'oracle' and $programname contains 'rabbit' then \ + ?DockerLogFileName_Rabbit + +$FileCreateMode 0600