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 4cc414d9bd48ccdd933797751eecea562f52fd33..f70c5bdb5d597cbde708c3485564fdf1efa6392d 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>