diff --git a/ansible/roles/common/templates/conf/input/00-global.conf.j2 b/ansible/roles/common/templates/conf/input/00-global.conf.j2 index 38766e00a7..ff55f737ef 100644 --- a/ansible/roles/common/templates/conf/input/00-global.conf.j2 +++ b/ansible/roles/common/templates/conf/input/00-global.conf.j2 @@ -48,7 +48,9 @@ "/var/log/kolla/monasca/monasca-log-api.log", "/var/log/kolla/neutron/dnsmasq.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_dir }}/kolla-openstack.pos tag kolla.* format multiline diff --git a/ansible/roles/common/templates/conf/input/04-openstack-wsgi.conf.j2 b/ansible/roles/common/templates/conf/input/04-openstack-wsgi.conf.j2 index b4e272ab9e..42cd8908aa 100644 --- a/ansible/roles/common/templates/conf/input/04-openstack-wsgi.conf.j2 +++ b/ansible/roles/common/templates/conf/input/04-openstack-wsgi.conf.j2 @@ -2,7 +2,7 @@ {% set fluentd_dir = 'td-agent' if kolla_base_distro in ['ubuntu', 'debian'] else 'fluentd' %} @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_dir }}/kolla-openstack-wsgi.pos tag kolla.* format /^(?.*)$/ diff --git a/releasenotes/notes/fix-wsgi-log-collection-c9f347096394df5c.yaml b/releasenotes/notes/fix-wsgi-log-collection-c9f347096394df5c.yaml new file mode 100644 index 0000000000..16c92686ad --- /dev/null +++ b/releasenotes/notes/fix-wsgi-log-collection-c9f347096394df5c.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fixes an issue with fluentd parsing of WSGI logs for Aodh, Masakari, + Qinling, Vitrage and Zun. See `bug 1720371 + `__ for details.