From bf979282a1bf31a4897e007589e029ba92d2b40a Mon Sep 17 00:00:00 2001
From: lklimin <lklimin@gmail.com>
Date: Tue, 5 Nov 2019 13:44:13 +0300
Subject: [PATCH] Collect rabbitmq logs by fluentd
Change-Id: I49b24545501085d5a44f4de73f0c6dd21e06e2a0
Closes-Bug: #1835501
---
.../roles/common/templates/conf/input/03-rabbitmq.conf.j2 | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/ansible/roles/common/templates/conf/input/03-rabbitmq.conf.j2 b/ansible/roles/common/templates/conf/input/03-rabbitmq.conf.j2
index 4cc414d9bd..f70c5bdb5d 100644
--- a/ansible/roles/common/templates/conf/input/03-rabbitmq.conf.j2
+++ b/ansible/roles/common/templates/conf/input/03-rabbitmq.conf.j2
@@ -1,11 +1,10 @@
<source>
@type tail
- path /var/log/kolla/rabbitmq/rabbit.log
+ path /var/log/kolla/rabbitmq/rabbit@{{ ansible_hostname }}.log
pos_file /var/run/{{ fluentd_binary }}/rabbit.pos
tag infra.rabbit
format multiline
- format_firstline /^\s*$/
- format1 /^=(?<log_level>\w+) REPORT==== (?<Times>[^ ]+) ===\n/
- format2 /^(?<Payload>.*)/
+ format_firstline /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3}/
+ format1 /^(?<Timestamp>\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3}) \[(?<log_level>\w+)\] (?<Payload>.*)/
enable_watch_timer false
</source>
--
GitLab