Skip to content

K
k3s
Commit af93275f authored by Alex Robinson's avatar Alex Robinson
Browse files
Options

Merge pull request #21482 from chrisleck/cle-sub-second-fluentd

Enable fluentd to parse the sub-second portion of timestamps coming from docker logs
parents 3f7705b4 c34ecf71
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf
View file @ af93275f
...@@ -105,11 +105,13 @@ ...@@ -105,11 +105,13 @@
type null type null
</match> </match>
# 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"}
<source> <source>
type tail type tail
path /var/log/containers/*.log path /var/log/containers/*.log
pos_file /var/log/es-containers.log.pos pos_file /var/log/es-containers.log.pos
time_format %Y-%m-%dT%H:%M:%S time_format %Y-%m-%dT%H:%M:%S.%NZ
tag kubernetes.* tag kubernetes.*
format json format json
read_from_head true read_from_head true
...@@ -142,7 +144,7 @@ ...@@ -142,7 +144,7 @@
<source> <source>
type tail type tail
format /^time="(?<time>[^)]*)" level=(?<severity>[^ ]*) msg="(?<message>[^"]*)"( err="(?<error>[^"]*)")?( statusCode=($<status_code>\d+))?/ format /^time="(?<time>[^)]*)" level=(?<severity>[^ ]*) msg="(?<message>[^"]*)"( err="(?<error>[^"]*)")?( statusCode=($<status_code>\d+))?/
time_format %Y-%m-%dT%H:%M:%S.%N%z time_format %Y-%m-%dT%H:%M:%S.%NZ
path /var/log/docker.log path /var/log/docker.log
pos_file /var/log/es-docker.log.pos pos_file /var/log/es-docker.log.pos
tag docker tag docker
......
cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf
View file @ af93275f
...@@ -47,13 +47,15 @@ ...@@ -47,13 +47,15 @@
type null type null
</match> </match>
# 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"}
<source> <source>
type tail type tail
format json format json
time_key time time_key time
path /var/log/containers/*.log path /var/log/containers/*.log
pos_file /var/log/gcp-containers.log.pos pos_file /var/log/gcp-containers.log.pos
time_format %Y-%m-%dT%H:%M:%S time_format %Y-%m-%dT%H:%M:%S.%NZ
tag reform.* tag reform.*
read_from_head true read_from_head true
</source> </source>
...@@ -91,7 +93,7 @@ ...@@ -91,7 +93,7 @@
<source> <source>
type tail type tail
format /^time="(?<time>[^)]*)" level=(?<severity>[^ ]*) msg="(?<message>[^"]*)"( err="(?<error>[^"]*)")?( statusCode=($<status_code>\d+))?/ format /^time="(?<time>[^)]*)" level=(?<severity>[^ ]*) msg="(?<message>[^"]*)"( err="(?<error>[^"]*)")?( statusCode=($<status_code>\d+))?/
time_format %Y-%m-%dT%H:%M:%S.%N%z time_format %Y-%m-%dT%H:%M:%S.%NZ
path /var/log/docker.log path /var/log/docker.log
pos_file /var/log/gcp-docker.log.pos pos_file /var/log/gcp-docker.log.pos
tag docker tag docker
......
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