Skip to content

Use detect_exceptions for /var/log to combine multi line logs #979

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
google-prow-robot merged 2 commits into from
May 30, 2018
Merged

Use detect_exceptions for /var/log to combine multi line logs #979

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a63e55
use detect_exceptions for varlog to combine multi line logs
yanweiguo May 25, 2018
e2d1b86
add a comment
yanweiguo May 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions pkg/controller/revision/ela_fluentd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const fluentdSidecarPreOutputConfig = `
@type tail
path /var/log/revisions/**/*.*
pos_file /var/log/varlog.log.pos
tag *
tag raw.*
<parse>
@type multi_format
<pattern>
Expand All @@ -46,18 +46,34 @@ const fluentdSidecarPreOutputConfig = `
read_from_head true
</source>

<filter var.log.**>
<filter raw.var.log.**>
@type record_transformer
enable_ruby true
<record>
kubernetes.container_name "#{ENV['ELA_CONTAINER_NAME']}"
kubernetes.labels.elafros_dev/configuration "#{ENV['ELA_CONFIGURATION']}"
kubernetes.labels.elafros_dev/revision "#{ENV['ELA_REVISION']}"
kubernetes.namespace_name "#{ENV['ELA_NAMESPACE']}"
kubernetes.pod_name "#{ENV['ELA_POD_NAME']}"
stream varlog
# Line breaks may be trimmed when collecting from files. Add them back so that
# multi line logs are still in multi line after combined by detect_exceptions.
# Remove this if https://github.com/GoogleCloudPlatform/fluent-plugin-detect-exceptions/pull/10 is released
log ${ if record["log"].end_with?("\n") then record["log"] else record["log"] + "\n" end }
</record>
</filter>

<match raw.var.log.**>
@id raw.var.log
@type detect_exceptions
remove_tag_prefix raw
message log
stream stream
multiline_flush_interval 5
max_bytes 500000
max_lines 1000
</match>

`

const fluentdConfigMapName = "fluentd-varlog-config"
Expand Down