From 1cc31ac6b179a58bade40f71e40799fd95d27d2f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Ferenc=20T=C3=B3th?= <ferenc.2.toth@nokia.com>
Date: Fri, 16 Aug 2019 04:09:31 +0200
Subject: [PATCH] Remove fluentd buffering
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

If output buffering is used, fluentd tends to send out the log
entries multiple times.

Signed-off-by: Ferenc Tóth <ferenc.2.toth@nokia.com>
Change-Id: I00ec3713fc1698de7e391092a7934a9797f48d48
---
 SPECS/infra-charts.spec                       |  2 +-
 infra-charts/templates/fluentd-configmap.yaml | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/SPECS/infra-charts.spec b/SPECS/infra-charts.spec
index bd6ce64..db86251 100644
--- a/SPECS/infra-charts.spec
+++ b/SPECS/infra-charts.spec
@@ -15,7 +15,7 @@
 %define COMPONENT infra-charts
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 1.0.0
-%define RPM_MINOR_VERSION 20
+%define RPM_MINOR_VERSION 21
 
 Name:           %{RPM_NAME}
 Version:        %{RPM_MAJOR_VERSION}
diff --git a/infra-charts/templates/fluentd-configmap.yaml b/infra-charts/templates/fluentd-configmap.yaml
index d3addd1..a583612 100644
--- a/infra-charts/templates/fluentd-configmap.yaml
+++ b/infra-charts/templates/fluentd-configmap.yaml
@@ -36,7 +36,6 @@ limitations under the License.
     <match kubernetes**>
        @type elasticsearch
        @log_level info
-       include_tag_key true
 {{- end }}
 {{- define "es_end.part" }}
        ssl_verify true
@@ -44,12 +43,6 @@ limitations under the License.
        logstash_format true
        reconnect_on_error true
        resurrect_after 5s
-       <buffer tag>
-          chunk_limit_size 256m
-          flush_at_shutdown true
-          flush_interval 5s
-          flush_thread_count 2
-       </buffer>
     </match>
 {{- end }}
 {{- define "remote_syslog.part" }}
@@ -63,10 +56,6 @@ limitations under the License.
        port 1025
        protocol tcp
 {{- end }}
-      <buffer>
-        chunk_limit_size 256m
-        flush_at_shutdown "true"
-      </buffer>
     </match>
 {{- end }}
 ---
-- 
2.16.6