openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix fluentd v1 buffer syntax issue"

Browse Source
This commit is contained in:
Zuul
2022-02-16 20:55:37 +00:00
committed by Gerrit Code Review
parent c37c9b59b4 b3e2fcc793
commit df4b46a31b
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,9 +38,11 @@
logstash_prefix {{ kibana_log_prefix }} logstash_prefix {{ kibana_log_prefix }}
flush_interval 15s flush_interval 15s
reconnect_on_error true reconnect_on_error true
buffer_type file
buffer_path /var/lib/fluentd/data/elasticsearch.buffer/{{ item.facility }}.*
suppress_type_name true suppress_type_name true
<buffer>
@type file
path /var/lib/fluentd/data/elasticsearch.buffer/{{ item.facility }}.*
</buffer>
</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>
@@ -53,11 +55,11 @@
domain_id default domain_id default
project_name {{ monasca_control_plane_project }} project_name {{ monasca_control_plane_project }}
message_field_name Payload message_field_name Payload
buffer_type file
buffer_path /var/lib/fluentd/data/monasca.buffer/{{ item.facility }}.*
max_retry_wait 1800s max_retry_wait 1800s
disable_retry_limit true disable_retry_limit true
<buffer> <buffer>
@type file
path /var/lib/fluentd/data/monasca.buffer/{{ item.facility }}.*
chunk_limit_size 8m chunk_limit_size 8m
</buffer> </buffer>
</store> </store>

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

@@ -23,8 +23,10 @@
logstash_prefix {{ kibana_log_prefix }} logstash_prefix {{ kibana_log_prefix }}
flush_interval 15s flush_interval 15s
reconnect_on_error true reconnect_on_error true
buffer_type file
buffer_path /var/lib/fluentd/data/elasticsearch.buffer/openstack.*
suppress_type_name true suppress_type_name true
<buffer>
@type file
path /var/lib/fluentd/data/elasticsearch.buffer/openstack.*
</buffer>
</store> </store>
</match> </match>

4
ansible/roles/common/templates/conf/output/02-monasca.conf.j2
View File

@@ -10,11 +10,11 @@
domain_id default domain_id default
project_name {{ monasca_control_plane_project }} project_name {{ monasca_control_plane_project }}
message_field_name Payload message_field_name Payload
buffer_type file
buffer_path /var/lib/fluentd/data/monasca.buffer/openstack.*
max_retry_wait 1800s max_retry_wait 1800s
disable_retry_limit true disable_retry_limit true
<buffer> <buffer>
@type file
path /var/lib/fluentd/data/monasca.buffer/openstack.*
chunk_limit_size 8m chunk_limit_size 8m
</buffer> </buffer>
</store> </store>