From 99b42e27815cb61dd9c60b191c7582b6df3a3199 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Tue, 20 Jul 2021 13:28:37 +0200 Subject: [PATCH] fix: prepare for fluent-bit multiline support, still broken though, minor tuning --- charts/kubezero-logging/Chart.yaml | 2 +- .../charts/fluent-bit/templates/_pod.tpl | 4 +- .../fluent-bit/templates/clusterrole.yaml | 4 +- charts/kubezero-logging/fluent-bit.patch | 38 +++++++++---------- charts/kubezero-logging/values.yaml | 12 ++++-- 5 files changed, 33 insertions(+), 27 deletions(-) diff --git a/charts/kubezero-logging/Chart.yaml b/charts/kubezero-logging/Chart.yaml index 651b5dc..5b62cd7 100644 --- a/charts/kubezero-logging/Chart.yaml +++ b/charts/kubezero-logging/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: kubezero-logging description: KubeZero Umbrella Chart for complete EFK stack type: application -version: 0.7.2 +version: 0.7.3 appVersion: 1.6.0 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png diff --git a/charts/kubezero-logging/charts/fluent-bit/templates/_pod.tpl b/charts/kubezero-logging/charts/fluent-bit/templates/_pod.tpl index 22cd951..3f13b47 100644 --- a/charts/kubezero-logging/charts/fluent-bit/templates/_pod.tpl +++ b/charts/kubezero-logging/charts/fluent-bit/templates/_pod.tpl @@ -21,8 +21,8 @@ hostAliases: initContainers: {{- toYaml .Values.initContainers | nindent 2 }} {{- end }} -#hostNetwork: true -#dnsPolicy: ClusterFirstWithHostNet +hostNetwork: true +dnsPolicy: ClusterFirstWithHostNet containers: - name: {{ .Chart.Name }} securityContext: diff --git a/charts/kubezero-logging/charts/fluent-bit/templates/clusterrole.yaml b/charts/kubezero-logging/charts/fluent-bit/templates/clusterrole.yaml index 9414222..818c5ee 100644 --- a/charts/kubezero-logging/charts/fluent-bit/templates/clusterrole.yaml +++ b/charts/kubezero-logging/charts/fluent-bit/templates/clusterrole.yaml @@ -11,8 +11,8 @@ rules: resources: - pods - namespaces - #- nodes - #- nodes/proxy + - nodes + - nodes/proxy verbs: - get - list diff --git a/charts/kubezero-logging/fluent-bit.patch b/charts/kubezero-logging/fluent-bit.patch index 40e1844..8698f25 100644 --- a/charts/kubezero-logging/fluent-bit.patch +++ b/charts/kubezero-logging/fluent-bit.patch @@ -1,30 +1,30 @@ -diff -tubrN charts/fluent-bit/templates/_pod.tpl charts/fluent-bit.zdt/templates/_pod.tpl ---- charts/fluent-bit/templates/_pod.tpl 2021-04-06 13:55:48.000000000 +0200 -+++ charts/fluent-bit.zdt/templates/_pod.tpl 2021-04-07 11:53:45.609030378 +0200 -@@ -13,6 +13,8 @@ - dnsConfig: - {{- toYaml . | nindent 2 }} +diff -tubr charts/fluent-bit/templates/_pod.tpl charts/fluent-bit.zdt/templates/_pod.tpl +--- charts/fluent-bit/templates/_pod.tpl 2021-06-22 12:25:10.000000000 +0200 ++++ charts/fluent-bit.zdt/templates/_pod.tpl 2021-07-20 12:44:55.349873171 +0200 +@@ -21,6 +21,8 @@ + initContainers: + {{- toYaml .Values.initContainers | nindent 2 }} {{- end }} -+#hostNetwork: true -+#dnsPolicy: ClusterFirstWithHostNet ++hostNetwork: true ++dnsPolicy: ClusterFirstWithHostNet containers: - name: {{ .Chart.Name }} securityContext: -diff -tubrN charts/fluent-bit/templates/clusterrole.yaml charts/fluent-bit.zdt/templates/clusterrole.yaml ---- charts/fluent-bit/templates/clusterrole.yaml 2021-04-06 13:55:48.000000000 +0200 -+++ charts/fluent-bit.zdt/templates/clusterrole.yaml 2021-04-07 11:53:26.049029491 +0200 +diff -tubr charts/fluent-bit/templates/clusterrole.yaml charts/fluent-bit.zdt/templates/clusterrole.yaml +--- charts/fluent-bit/templates/clusterrole.yaml 2021-06-22 12:25:10.000000000 +0200 ++++ charts/fluent-bit.zdt/templates/clusterrole.yaml 2021-07-20 12:44:29.936278716 +0200 @@ -11,6 +11,8 @@ resources: - pods - namespaces -+ #- nodes -+ #- nodes/proxy ++ - nodes ++ - nodes/proxy verbs: - get - list -diff -tubrN charts/fluent-bit/templates/tests/test-connection.yaml charts/fluent-bit.zdt/templates/tests/test-connection.yaml ---- charts/fluent-bit/templates/tests/test-connection.yaml 2021-04-06 13:55:48.000000000 +0200 -+++ charts/fluent-bit.zdt/templates/tests/test-connection.yaml 2021-04-07 11:52:34.199027132 +0200 +diff -tubr charts/fluent-bit/templates/tests/test-connection.yaml charts/fluent-bit.zdt/templates/tests/test-connection.yaml +--- charts/fluent-bit/templates/tests/test-connection.yaml 2021-06-22 12:25:10.000000000 +0200 ++++ charts/fluent-bit.zdt/templates/tests/test-connection.yaml 2021-05-17 12:09:02.724057438 +0200 @@ -1,3 +1,4 @@ +{{- if .Values.testFramework.enabled }} apiVersion: v1 @@ -35,9 +35,9 @@ diff -tubrN charts/fluent-bit/templates/tests/test-connection.yaml charts/fluent {{- end }} restartPolicy: Never +{{- end }} -diff -tubrN charts/fluent-bit/values.yaml charts/fluent-bit.zdt/values.yaml ---- charts/fluent-bit/values.yaml 2021-04-06 13:55:48.000000000 +0200 -+++ charts/fluent-bit.zdt/values.yaml 2021-04-07 11:52:54.742361399 +0200 +diff -tubr charts/fluent-bit/values.yaml charts/fluent-bit.zdt/values.yaml +--- charts/fluent-bit/values.yaml 2021-06-22 12:25:10.000000000 +0200 ++++ charts/fluent-bit.zdt/values.yaml 2021-07-19 10:23:01.383398153 +0200 @@ -12,6 +12,7 @@ # tag: diff --git a/charts/kubezero-logging/values.yaml b/charts/kubezero-logging/values.yaml index 68562ce..f8afa01 100644 --- a/charts/kubezero-logging/values.yaml +++ b/charts/kubezero-logging/values.yaml @@ -216,6 +216,9 @@ fluentd: fluent-bit: enabled: false + image: + tag: 1.8.1 + serviceMonitor: enabled: false selector: @@ -245,7 +248,7 @@ fluent-bit: memBufLimit: 4MB refreshInterval: 10 - logLevel: warn + logLevel: info flushInterval: 5 #extraRecords: @@ -266,10 +269,12 @@ fluent-bit: Name tail Path /var/log/containers/*.log Parser cri-log + #multiline.parser cri Tag cri.* Skip_Long_Lines On DB /var/log/flb_kube.db DB.Sync Normal + DB.locking true {{- with .Values.config.input }} Mem_Buf_Limit {{ default "4MB" .memBufLimit }} Refresh_Interval {{ default 10 .refreshInterval }} @@ -291,8 +296,9 @@ fluent-bit: Keep_Log Off K8S-Logging.Parser Off K8S-Logging.Exclude Off + Kube_Meta_Cache_TTL 3600s + Buffer_Size 0 #Use_Kubelet true - #Kubelet_Port 10250 {{- if index .Values "config" "extraRecords" }} @@ -331,7 +337,7 @@ fluent-bit: [PARSER] Name cri-log Format regex - Regex ^(?