Skip to content

K
k3s
Commit 09b614ab authored by Lantao Liu's avatar Lantao Liu
Browse files
Options

Do not add new field in fluentd CRI log format.

parent a69f9dad
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
cluster/addons/fluentd-elasticsearch/fluentd-es-configmap.yaml
View file @ 09b614ab
...@@ -99,7 +99,7 @@ data: ...@@ -99,7 +99,7 @@ data:
# Json Log Example: # Json Log Example:
# {"log":"[info:2016-02-16T16:04:05.930-08:00] Some log text here\n","stream":"stdout","time":"2016-02-17T00:04:05.931087621Z"} # {"log":"[info:2016-02-16T16:04:05.930-08:00] Some log text here\n","stream":"stdout","time":"2016-02-17T00:04:05.931087621Z"}
# CRI Log Example: # CRI Log Example:
# 2016-02-17T00:04:05.931087621Z stdout [info:2016-02-16T16:04:05.930-08:00] Some log text here # 2016-02-17T00:04:05.931087621Z stdout F [info:2016-02-16T16:04:05.930-08:00] Some log text here
<source> <source>
type tail type tail
path /var/log/containers/*.log path /var/log/containers/*.log
...@@ -114,7 +114,7 @@ data: ...@@ -114,7 +114,7 @@ data:
time_format %Y-%m-%dT%H:%M:%S.%NZ time_format %Y-%m-%dT%H:%M:%S.%NZ
</pattern> </pattern>
<pattern> <pattern>
format /^(?<time>.+) (?<stream>stdout|stderr) (?<tag>.*) (?<log>.*)$/ format /^(?<time>.+) (?<stream>stdout|stderr) [^ ]* (?<log>.*)$/
time_format %Y-%m-%dT%H:%M:%S.%N%:z time_format %Y-%m-%dT%H:%M:%S.%N%:z
</pattern> </pattern>
</source> </source>
......
cluster/addons/fluentd-gcp/fluentd-gcp-configmap.yaml
View file @ 09b614ab
...@@ -44,7 +44,7 @@ data: ...@@ -44,7 +44,7 @@ data:
# Json Log Example: # Json Log Example:
# {"log":"[info:2016-02-16T16:04:05.930-08:00] Some log text here\n","stream":"stdout","time":"2016-02-17T00:04:05.931087621Z"} # {"log":"[info:2016-02-16T16:04:05.930-08:00] Some log text here\n","stream":"stdout","time":"2016-02-17T00:04:05.931087621Z"}
# CRI Log Example: # CRI Log Example:
# 2016-02-17T00:04:05.931087621Z stdout [info:2016-02-16T16:04:05.930-08:00] Some log text here # 2016-02-17T00:04:05.931087621Z stdout F [info:2016-02-16T16:04:05.930-08:00] Some log text here
<source> <source>
type tail type tail
path /var/log/containers/*.log path /var/log/containers/*.log
...@@ -58,7 +58,7 @@ data: ...@@ -58,7 +58,7 @@ data:
time_format %Y-%m-%dT%H:%M:%S.%NZ time_format %Y-%m-%dT%H:%M:%S.%NZ
</pattern> </pattern>
<pattern> <pattern>
format /^(?<time>.+) (?<stream>stdout|stderr) (?<tag>.*) (?<log>.*)$/ format /^(?<time>.+) (?<stream>stdout|stderr) [^ ]* (?<log>.*)$/
time_format %Y-%m-%dT%H:%M:%S.%N%:z time_format %Y-%m-%dT%H:%M:%S.%N%:z
</pattern> </pattern>
</source> </source>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment