Fix fluentd parsing of WSGI logs

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
(cherry picked from commit a32cddca49)

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

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' %}
 <source>
   @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 /^(?<Payload>.*)$/

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
+    <https://bugs.launchpad.net/kolla-ansible/+bug/1720371>`__ for details.