From eae4caa0c6061fa968bfb5c3f05259333a574d6c Mon Sep 17 00:00:00 2001
From: shanewxy <592491808@qq.com>
Date: Tue, 24 Dec 2019 17:43:24 +0800
Subject: [PATCH] Fixed fluentd non-json parsing bug by multi_format plugin.

https://github.com/rancher/rancher/issues/24545
---
 .../user/logging/generator/templatefilter.go       | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkg/controllers/user/logging/generator/templatefilter.go b/pkg/controllers/user/logging/generator/templatefilter.go
index 857335c202e..544c0e3e8b4 100644
--- a/pkg/controllers/user/logging/generator/templatefilter.go
+++ b/pkg/controllers/user/logging/generator/templatefilter.go
@@ -125,13 +125,19 @@ var FilterTemplate = `
 
 {{define "filter-json"}}
 {{- if .EnableJSONParsing}}
-<filter {{ .ContainerLogSourceTag}}.**>
+<filter cluster.**>
   @type parser
-  key_name log
-  reserve_data true
   <parse>
-    @type json
+    @type multi_format
+    <pattern>
+      format json
+    </pattern>
+    <pattern>
+      format none
+    </pattern>
   </parse>
+  key_name log
+  reserve_data true
 </filter>
 {{end}}
 {{end}}