From b3e2fcc793884780722c1a2e10b46a71acca782e Mon Sep 17 00:00:00 2001
From: Isaac Prior <isaac@stackhpc.com>
Date: Mon, 15 Mar 2021 15:16:33 +0000
Subject: [PATCH] Fix fluentd v1 buffer syntax issue

Change-Id: I5b3ab3ab8153cda283dec772bf1393af0caf4137
Closes-Bug: 1919179
---
 .../common/templates/conf/output/00-local.conf.j2      | 10 ++++++----
 .../roles/common/templates/conf/output/01-es.conf.j2   |  6 ++++--
 .../common/templates/conf/output/02-monasca.conf.j2    |  4 ++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/ansible/roles/common/templates/conf/output/00-local.conf.j2 b/ansible/roles/common/templates/conf/output/00-local.conf.j2
index 33e821ac74..2f628f8111 100644
--- a/ansible/roles/common/templates/conf/output/00-local.conf.j2
+++ b/ansible/roles/common/templates/conf/output/00-local.conf.j2
@@ -38,9 +38,11 @@
        logstash_prefix {{ kibana_log_prefix }}
        flush_interval 15s
        reconnect_on_error true
-       buffer_type file
-       buffer_path /var/lib/fluentd/data/elasticsearch.buffer/{{ item.facility }}.*
        suppress_type_name true
+       <buffer>
+         @type file
+         path /var/lib/fluentd/data/elasticsearch.buffer/{{ item.facility }}.*
+       </buffer>
   </store>
 {% elif enable_monasca | bool and monasca_ingest_control_plane_logs | bool %}
   <store>
@@ -53,11 +55,11 @@
      domain_id default
      project_name {{ monasca_control_plane_project }}
      message_field_name Payload
-     buffer_type file
-     buffer_path /var/lib/fluentd/data/monasca.buffer/{{ item.facility }}.*
      max_retry_wait 1800s
      disable_retry_limit true
      <buffer>
+       @type file
+       path /var/lib/fluentd/data/monasca.buffer/{{ item.facility }}.*
        chunk_limit_size 8m
      </buffer>
   </store>
diff --git a/ansible/roles/common/templates/conf/output/01-es.conf.j2 b/ansible/roles/common/templates/conf/output/01-es.conf.j2
index 34fb2332a7..dd653d0830 100644
--- a/ansible/roles/common/templates/conf/output/01-es.conf.j2
+++ b/ansible/roles/common/templates/conf/output/01-es.conf.j2
@@ -23,8 +23,10 @@
        logstash_prefix {{ kibana_log_prefix }}
        flush_interval 15s
        reconnect_on_error true
-       buffer_type file
-       buffer_path /var/lib/fluentd/data/elasticsearch.buffer/openstack.*
        suppress_type_name true
+       <buffer>
+         @type file
+         path /var/lib/fluentd/data/elasticsearch.buffer/openstack.*
+       </buffer>
     </store>
 </match>
diff --git a/ansible/roles/common/templates/conf/output/02-monasca.conf.j2 b/ansible/roles/common/templates/conf/output/02-monasca.conf.j2
index 2da4549c07..b0aeeeff28 100644
--- a/ansible/roles/common/templates/conf/output/02-monasca.conf.j2
+++ b/ansible/roles/common/templates/conf/output/02-monasca.conf.j2
@@ -10,11 +10,11 @@
        domain_id default
        project_name {{ monasca_control_plane_project }}
        message_field_name Payload
-       buffer_type file
-       buffer_path /var/lib/fluentd/data/monasca.buffer/openstack.*
        max_retry_wait 1800s
        disable_retry_limit true
        <buffer>
+         @type file
+         path /var/lib/fluentd/data/monasca.buffer/openstack.*
          chunk_limit_size 8m
        </buffer>
     </store>