From 8b82972d06e438e4e5f74709fceb4c6fc8a65f32 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Wed, 26 Aug 2020 18:13:21 +0100
Subject: [PATCH] fluentd / ES fixes

---
 charts/kubezero-istio/values.yaml                  | 2 +-
 charts/kubezero-logging/templates/eck/secrets.yaml | 1 -
 charts/kubezero-logging/values.yaml                | 9 ++++-----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/charts/kubezero-istio/values.yaml b/charts/kubezero-istio/values.yaml
index f679646b..c179f3d2 100644
--- a/charts/kubezero-istio/values.yaml
+++ b/charts/kubezero-istio/values.yaml
@@ -8,7 +8,7 @@ ingress:
   type: NodePort
   private:
     enabled: true
-    nodeSelector: "31080_31443_30671_30672_31224"
+    nodeSelector: "31080_31443_31671_31672_31224"
   dnsNames:
     - "*"
 
diff --git a/charts/kubezero-logging/templates/eck/secrets.yaml b/charts/kubezero-logging/templates/eck/secrets.yaml
index 6fe91516..3bac1437 100644
--- a/charts/kubezero-logging/templates/eck/secrets.yaml
+++ b/charts/kubezero-logging/templates/eck/secrets.yaml
@@ -11,6 +11,5 @@ metadata:
   labels:
 {{ include "kubezero-lib.labels" . | indent 4 }}
 data:
-  username: {{ "elastic" | b64enc | quote }}
   elastic: {{ .Values.elastic_password | b64enc | quote }}
 {{- end }}
diff --git a/charts/kubezero-logging/values.yaml b/charts/kubezero-logging/values.yaml
index 804ca040..f497d926 100644
--- a/charts/kubezero-logging/values.yaml
+++ b/charts/kubezero-logging/values.yaml
@@ -136,11 +136,11 @@ fluentd:
         user "#{ENV['OUTPUT_USER']}"
         password "#{ENV['OUTPUT_PASSWORD']}"
 
+        log_es_400_reason
         logstash_format true
-        reload_connections false
         reconnect_on_error true
-        reload_on_failure true
-        request_timeout 30s
+        # reload_on_failure true
+        request_timeout 15s
         suppress_type_name true
 
         <buffer>
@@ -148,11 +148,10 @@ fluentd:
           path /var/log/fluentd-buffers/kubernetes.system.buffer
           flush_mode interval
           flush_thread_count 2
-          flush_interval 5s
+          flush_interval 30s
           flush_at_shutdown true
           retry_type exponential_backoff
           retry_timeout 60m
-          retry_max_interval 30
           chunk_limit_size "#{ENV['OUTPUT_BUFFER_CHUNK_LIMIT']}"
           queue_limit_length "#{ENV['OUTPUT_BUFFER_QUEUE_LIMIT']}"
           overflow_action drop_oldest_chunk