Skip to content

Commit 5fadf56

Browse files
Wasaacyoctozepto
authored andcommitted
Fix fluentd v1 buffer syntax issue
Change-Id: I5b3ab3ab8153cda283dec772bf1393af0caf4137 Closes-Bug: 1919179 (cherry picked from commit b3e2fcc)
1 parent 9c532f4 commit 5fadf56

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,11 @@
3838
logstash_prefix {{ kibana_log_prefix }}
3939
flush_interval 15s
4040
reconnect_on_error true
41-
buffer_type file
42-
buffer_path /var/lib/fluentd/data/elasticsearch.buffer/{{ item.facility }}.*
4341
suppress_type_name true
42+
<buffer>
43+
@type file
44+
path /var/lib/fluentd/data/elasticsearch.buffer/{{ item.facility }}.*
45+
</buffer>
4446
</store>
4547
{% elif enable_monasca | bool and monasca_ingest_control_plane_logs | bool %}
4648
<store>
@@ -53,11 +55,11 @@
5355
domain_id default
5456
project_name {{ monasca_control_plane_project }}
5557
message_field_name Payload
56-
buffer_type file
57-
buffer_path /var/lib/fluentd/data/monasca.buffer/{{ item.facility }}.*
5858
max_retry_wait 1800s
5959
disable_retry_limit true
6060
<buffer>
61+
@type file
62+
path /var/lib/fluentd/data/monasca.buffer/{{ item.facility }}.*
6163
chunk_limit_size 8m
6264
</buffer>
6365
</store>

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@
2323
logstash_prefix {{ kibana_log_prefix }}
2424
flush_interval 15s
2525
reconnect_on_error true
26-
buffer_type file
27-
buffer_path /var/lib/fluentd/data/elasticsearch.buffer/openstack.*
2826
suppress_type_name true
27+
<buffer>
28+
@type file
29+
path /var/lib/fluentd/data/elasticsearch.buffer/openstack.*
30+
</buffer>
2931
</store>
3032
</match>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
domain_id default
1111
project_name {{ monasca_control_plane_project }}
1212
message_field_name Payload
13-
buffer_type file
14-
buffer_path /var/lib/fluentd/data/monasca.buffer/openstack.*
1513
max_retry_wait 1800s
1614
disable_retry_limit true
1715
<buffer>
16+
@type file
17+
path /var/lib/fluentd/data/monasca.buffer/openstack.*
1818
chunk_limit_size 8m
1919
</buffer>
2020
</store>

0 commit comments

Comments
 (0)