Fixed fluentd non-json parsing bug by multi_format plugin.

rancher#24545
shanewxy · Dec 24, 2019 · eae4caa · eae4caa
1 parent 0256255
commit eae4caa
Showing 1 changed file with 10 additions and 4 deletions.
diff --git 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}}