openstack/kolla-ansible
Code Issues Proposed changes

Merge "Add suppress_type_name to stop warnings with ES7"

Browse Source
This commit is contained in:
Zuul 2021-08-10 16:26:11 +00:00 committed by Gerrit Code Review
commit 578ca1d647
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/common/templates/conf/output/00-local.conf.j2
View File

@ -35,6 +35,7 @@
reconnect_on_error true reconnect_on_error true
buffer_type file buffer_type file
buffer_path /var/lib/fluentd/data/elasticsearch.buffer/{{ syslog_swift_facility }}.* buffer_path /var/lib/fluentd/data/elasticsearch.buffer/{{ syslog_swift_facility }}.*
suppress_type_name true
</store> </store>
{% elif enable_monasca | bool and monasca_ingest_control_plane_logs | bool %} {% elif enable_monasca | bool and monasca_ingest_control_plane_logs | bool %}
<store> <store>
@ -97,6 +98,7 @@
reconnect_on_error true reconnect_on_error true
buffer_type file buffer_type file
buffer_path /var/lib/fluentd/data/elasticsearch.buffer/{{ syslog_haproxy_facility }}.* buffer_path /var/lib/fluentd/data/elasticsearch.buffer/{{ syslog_haproxy_facility }}.*
suppress_type_name true
</store> </store>
{% elif enable_monasca | bool and monasca_ingest_control_plane_logs | bool %} {% elif enable_monasca | bool and monasca_ingest_control_plane_logs | bool %}
<store> <store>
@ -157,6 +159,7 @@
reconnect_on_error true reconnect_on_error true
buffer_type file buffer_type file
buffer_path /var/lib/fluentd/data/elasticsearch.buffer/{{ syslog_glance_tls_proxy_facility }}.* buffer_path /var/lib/fluentd/data/elasticsearch.buffer/{{ syslog_glance_tls_proxy_facility }}.*
suppress_type_name true
</store> </store>
{% elif enable_monasca | bool and monasca_ingest_control_plane_logs | bool %} {% elif enable_monasca | bool and monasca_ingest_control_plane_logs | bool %}
<store> <store>
@ -218,6 +221,7 @@
reconnect_on_error true reconnect_on_error true
buffer_type file buffer_type file
buffer_path /var/lib/fluentd/data/elasticsearch.buffer/{{ syslog_neutron_tls_proxy_facility }}.* buffer_path /var/lib/fluentd/data/elasticsearch.buffer/{{ syslog_neutron_tls_proxy_facility }}.*
suppress_type_name true
</store> </store>
{% elif enable_monasca | bool and monasca_ingest_control_plane_logs | bool %} {% elif enable_monasca | bool and monasca_ingest_control_plane_logs | bool %}
<store> <store>

1
ansible/roles/common/templates/conf/output/01-es.conf.j2
View File

@ -25,5 +25,6 @@
reconnect_on_error true reconnect_on_error true
buffer_type file buffer_type file
buffer_path /var/lib/fluentd/data/elasticsearch.buffer/openstack.* buffer_path /var/lib/fluentd/data/elasticsearch.buffer/openstack.*
suppress_type_name true
</store> </store>
</match> </match>

5
releasenotes/notes/fix_supress_type_warning-59f87fe62f83bd12.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
Stops Fluentd warning message when posting to Elasticsearch 7 bulk
API.