From cd561228e7327868de5b5401c8775d2c4175eb9f Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Thu, 10 Dec 2020 06:44:58 -0800
Subject: [PATCH] More logging tuning

---
 charts/kubezero-logging/Chart.yaml            |  4 +-
 .../charts/fluent-bit/conf/fluent-bit.conf    |  6 +-
 .../charts/fluent-bit/values.yaml             | 65 +------------------
 3 files changed, 6 insertions(+), 69 deletions(-)

diff --git a/charts/kubezero-logging/Chart.yaml b/charts/kubezero-logging/Chart.yaml
index d4cd152..344c0b1 100644
--- a/charts/kubezero-logging/Chart.yaml
+++ b/charts/kubezero-logging/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: kubezero-logging
 description: KubeZero Umbrella Chart for complete EFK stack
 type: application
-version: 0.5.0
-appVersion: 1.3.0
+version: 0.5.1
+appVersion: 1.3.1
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
diff --git a/charts/kubezero-logging/charts/fluent-bit/conf/fluent-bit.conf b/charts/kubezero-logging/charts/fluent-bit/conf/fluent-bit.conf
index cc0776c..23d86ee 100644
--- a/charts/kubezero-logging/charts/fluent-bit/conf/fluent-bit.conf
+++ b/charts/kubezero-logging/charts/fluent-bit/conf/fluent-bit.conf
@@ -59,10 +59,9 @@
     script  /fluent-bit/etc/functions.lua
     call    nest_k8s_ns
 
-{{- if not .Values.config.output }}
+{{- if .Values.config.outputs }}
 {{ .Values.config.outputs }}
-{{- end }}
-
+{{- else }}
 {{- with .Values.config.output }}
 [OUTPUT]
     Match *
@@ -74,3 +73,4 @@
     Send_options true
     Require_ack_response true
 {{- end }}
+{{- end }}
diff --git a/charts/kubezero-logging/charts/fluent-bit/values.yaml b/charts/kubezero-logging/charts/fluent-bit/values.yaml
index 3fc4b76..f9bcd9c 100644
--- a/charts/kubezero-logging/charts/fluent-bit/values.yaml
+++ b/charts/kubezero-logging/charts/fluent-bit/values.yaml
@@ -105,67 +105,4 @@ updateStrategy: {}
 existingConfigMap: ""
 
 ## https://docs.fluentbit.io/manual/administration/configuring-fluent-bit
-config:
-  ## https://docs.fluentbit.io/manual/service
-  service: |
-    [SERVICE]
-        Flush 1
-        Daemon Off
-        Log_Level info
-        Parsers_File parsers.conf
-        Parsers_File custom_parsers.conf
-        HTTP_Server On
-        HTTP_Listen 0.0.0.0
-        HTTP_Port 2020
-
-  ## https://docs.fluentbit.io/manual/pipeline/inputs
-  inputs: |
-    [INPUT]
-        Name tail
-        Path /var/log/containers/*.log
-        Parser docker
-        Tag kube.*
-        Mem_Buf_Limit 5MB
-        Skip_Long_Lines On
-
-    [INPUT]
-        Name systemd
-        Tag host.*
-        Systemd_Filter _SYSTEMD_UNIT=kubelet.service
-        Read_From_Tail On
-
-  ## https://docs.fluentbit.io/manual/pipeline/filters
-  filters: |
-    [FILTER]
-        Name kubernetes
-        Match kube.*
-        Merge_Log On
-        Keep_Log Off
-        K8S-Logging.Parser On
-        K8S-Logging.Exclude On
-
-  ## https://docs.fluentbit.io/manual/pipeline/outputs
-  outputs: |
-    [OUTPUT]
-        Name es
-        Match kube.*
-        Host elasticsearch-master
-        Logstash_Format On
-        Retry_Limit False
-
-    [OUTPUT]
-        Name es
-        Match host.*
-        Host elasticsearch-master
-        Logstash_Format On
-        Logstash_Prefix node
-        Retry_Limit False
-
-  ## https://docs.fluentbit.io/manual/pipeline/parsers
-  customParsers: |
-    [PARSER]
-        Name docker_no_time
-        Format json
-        Time_Keep Off
-        Time_Key time
-        Time_Format %Y-%m-%dT%H:%M:%S.%L
+config: {}