diff --git a/ansible/roles/common/tasks/config.yml b/ansible/roles/common/tasks/config.yml index 27024db028..8eccc94f20 100644 --- a/ansible/roles/common/tasks/config.yml +++ b/ansible/roles/common/tasks/config.yml @@ -60,7 +60,6 @@ with_items: - "apache_access" - "wsgi_access" - - "wsgi_python" notify: - Restart fluentd container 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 b1fa69d92f..013785250a 100644 --- a/ansible/roles/common/templates/conf/input/00-global.conf.j2 +++ b/ansible/roles/common/templates/conf/input/00-global.conf.j2 @@ -45,5 +45,10 @@ "/var/log/kolla/*/*-error.log"] pos_file /var/run/{{ fluentd_dir }}/kolla-openstack.pos tag kolla.* - format /^(?.*)$/ + format multiline + format_firstline /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3} \d+ \S+ \S+ \[(req-\S+ \S+ \S+ \S+ \S+ \S+|-)\]/ + format1 /^(?\S+ \S+) (?\d+) (?\S+) (?\S+) (\[(req-(?\S+) (?\S+) (?\S+) (?\S+) (?\S+) (?\S+)|-)\])? (?.*)?$/ + time_key Timestamp + time_format %F %T.%L + ignore_repeated_permission_error true diff --git a/ansible/roles/common/templates/fluentd.json.j2 b/ansible/roles/common/templates/fluentd.json.j2 index 95cacc5def..b72dd226c8 100644 --- a/ansible/roles/common/templates/fluentd.json.j2 +++ b/ansible/roles/common/templates/fluentd.json.j2 @@ -64,12 +64,6 @@ "dest": "{{ fluentd_dir }}/format/wsgi_access.conf", "owner": "{{ fluentd_user }}", "perm": "0600" - }, - { - "source": "{{ container_config_directory }}/format/wsgi_python.conf", - "dest": "{{ fluentd_dir }}/format/wsgi_python.conf", - "owner": "{{ fluentd_user }}", - "perm": "0600" },{% if enable_elasticsearch | bool or ( elasticsearch_address != kolla_internal_vip_address ) | bool %} {