openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fluentd "progname" field not always generated"

Browse Source
This commit is contained in:
Jenkins 2017-09-04 13:41:46 +00:00 committed by Gerrit Code Review
commit 0e50f147e0
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ansible/roles/common/templates/conf/filter/00-record_transformer.conf.j2
View File

@ -6,3 +6,10 @@
programname ${tag_parts[5]} programname ${tag_parts[5]}
</record> </record>
</filter> </filter>
<filter infra.*>
@type record_transformer
<record>
programname ${tag_parts[1]}
</record>
</filter>

2
ansible/roles/common/templates/conf/input/02-mariadb.conf.j2
View File

@ -3,7 +3,7 @@
@type tail @type tail
path /var/log/kolla/mariadb/mariadb.log path /var/log/kolla/mariadb/mariadb.log
pos_file /var/run/{{ fluentd_dir }}/mariadb.pos pos_file /var/run/{{ fluentd_dir }}/mariadb.pos
tag mariadb.* tag infra.mariadb
format multiline format multiline
format_firstline /^\d{6}/ format_firstline /^\d{6}/
format1 /^(?<time>\d{6} \d{1,2}:\d{1,2}:\d{1,2}) \[(?<severity_label>\S+)\] (?<Payload>.*)/ format1 /^(?<time>\d{6} \d{1,2}:\d{1,2}:\d{1,2}) \[(?<severity_label>\S+)\] (?<Payload>.*)/

2
ansible/roles/common/templates/conf/input/03-rabbitmq.conf.j2
View File

@ -3,7 +3,7 @@
@type tail @type tail
path /var/log/kolla/rabbitmq/rabbit.log path /var/log/kolla/rabbitmq/rabbit.log
pos_file /var/run/{{ fluentd_dir }}/rabbit.pos pos_file /var/run/{{ fluentd_dir }}/rabbit.pos
tag rabbit.* tag infra.rabbitmq
format multiline format multiline
format_firstline /^\s*$/ format_firstline /^\s*$/
format1 /^=(?<log_level>\w+) REPORT==== (?<Times>[^ ]+) ===\n/ format1 /^=(?<log_level>\w+) REPORT==== (?<Times>[^ ]+) ===\n/