Skip to content
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.

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

ingest retry succeeded logs and expose param in values file #671

Merged
merged 2 commits into from
May 26, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion deploy/helm/sumologic/conf/logs/logs.source.containers.conf
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,16 @@
<label @NORMAL>
# only match fluentd logs based on fluentd container name. by default, this is
# <filter **collection-sumologic**>
{{ if .Values.fluentd.logLevelFilter }}
{{ printf "<filter **%s**>" (include "sumologic.fullname" .) }}
# only ingest fluentd logs of levels: {error, fatal} and warning messages if buffer is full
@type grep
<regexp>
key log
pattern /\[error\]|\[fatal\]|drop_oldest_chunk/
pattern /\[error\]|\[fatal\]|drop_oldest_chunk|retry succeeded/
</regexp>
</filter>
{{- end}}
# third-party kubernetes metadata filter plugin
<filter containers.**>
@type kubernetes_metadata
Expand Down
2 changes: 2 additions & 0 deletions deploy/helm/sumologic/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ fluentd:
## Sumo will only ingest the error log level and some specific warnings, the info logs can be seen in kubectl logs.
## ref: https://docs.fluentd.org/deployment/logging
logLevel: "info"
## to ingest all fluentd logs, turn the logLevelFilter to false
logLevelFilter: true

## Verify SumoLogic HTTPS certificates
verifySsl: true
Expand Down
3 changes: 2 additions & 1 deletion deploy/kubernetes/fluentd-sumologic.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,13 @@ data:
<label @NORMAL>
# only match fluentd logs based on fluentd container name. by default, this is
# <filter **collection-sumologic**>

<filter **collection-sumologic**>
# only ingest fluentd logs of levels: {error, fatal} and warning messages if buffer is full
@type grep
<regexp>
key log
pattern /\[error\]|\[fatal\]|drop_oldest_chunk/
pattern /\[error\]|\[fatal\]|drop_oldest_chunk|retry succeeded/
</regexp>
</filter>
# third-party kubernetes metadata filter plugin
Expand Down