github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 07:20:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #65361 from xperimental/fix-detect-exceptions

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 65361, 64527). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Fix exception detection in new version of fluentd-gcp addon

**What this PR does / why we need it**:
The `detect_exceptions` plugin is used to group log entries that belong to a common exception together into one log message. A [recent change](1ca851baec/cluster/addons/fluentd-gcp/fluentd-gcp-configmap.yaml (L100)) to the configuration modified which field is used for the log message, but this change was not applied to the configuration of the `detect_exceptions` plugin, so currently no collation of exception lines is happening.

This change fixes the issue by changing the field the `detect_exceptions` plugin is using.
**Special notes for your reviewer**:

**Release note**:

```release-note
Fixed exception detection in fluentd-gcp plugin.
```
This commit is contained in:
Kubernetes Submit Queue 2018-06-28 11:55:02 -07:00 committed by GitHub
commit e81cbf5797
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/addons/fluentd-gcp/fluentd-gcp-configmap.yaml
View File

@ -108,7 +108,7 @@ data:
@type detect_exceptions
remove_tag_prefix raw
message log
message message
stream stream
multiline_flush_interval 5
max_bytes 500000