openstack/kolla-ansible
Code Issues Proposed changes

Fix fluentd parsing of WSGI logs

Browse Source 
WSGI log files use a different input configuration than OpenStack log
files. Currently this depends on log files matching either *-access.log
or *-error.log. Some services use *_access.log or *_error.log, so are
not parsed correctly.

This change modifies the fluentd configuration to accept an underscore
or hyphen for WSGI log file names.

Change-Id: I566d6cac0b6749054fd5422ec8f36f99dacb1db7
Closes-Bug: #1720371
This commit is contained in:
Mark Goddard 2019-12-09 13:52:38 +00:00
parent 58b5acbf65
commit a32cddca49
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/common/templates/conf/input/00-global.conf.j2
View File

@ -49,7 +49,9 @@
"/var/log/kolla/monasca/monasca-log-api.log", "/var/log/kolla/monasca/monasca-log-api.log",
"/var/log/kolla/neutron/dnsmasq.log", "/var/log/kolla/neutron/dnsmasq.log",
"/var/log/kolla/*/*-access.log", "/var/log/kolla/*/*-access.log",
"/var/log/kolla/*/*-error.log"] "/var/log/kolla/*/*-error.log",
"/var/log/kolla/*/*_access.log",
"/var/log/kolla/*/*_error.log"]
pos_file /var/run/{{ fluentd_binary }}/kolla-openstack.pos pos_file /var/run/{{ fluentd_binary }}/kolla-openstack.pos
tag kolla.* tag kolla.*
format multiline format multiline

2
ansible/roles/common/templates/conf/input/04-openstack-wsgi.conf.j2
View File

@ -1,7 +1,7 @@
# Note (blallau): to manage Apache and WSGI log files # Note (blallau): to manage Apache and WSGI log files
<source> <source>
@type tail @type tail
path /var/log/kolla/*/*-access.log,/var/log/kolla/*/*-error.log path /var/log/kolla/*/*-access.log,/var/log/kolla/*/*-error.log,/var/log/kolla/*/*_access.log,/var/log/kolla/*/*_error.log
pos_file /var/run/{{ fluentd_binary }}/kolla-openstack-wsgi.pos pos_file /var/run/{{ fluentd_binary }}/kolla-openstack-wsgi.pos
tag kolla.* tag kolla.*
format /^(?<Payload>.*)$/ format /^(?<Payload>.*)$/

6
releasenotes/notes/fix-wsgi-log-collection-c9f347096394df5c.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
Fixes an issue with fluentd parsing of WSGI logs for Aodh, Masakari,
Qinling, Vitrage and Zun. See `bug 1720371
<https://bugs.launchpad.net/kolla-ansible/+bug/1720371>`__ for details.