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

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](https://github.com/kubernetes/kubernetes/blob/1ca851baec6a245bbb2bd3aea284e6cb4f364348/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. ```

Merge pull request #65361 from xperimental/fix-detect-exceptions
e81cbf57 · Kubernetes Submit Queue · GitHub · f8c4907b · 8f340c6c · e81cbf57
Unverified Commit e81cbf57 authored Jun 28, 2018 by Kubernetes Submit Queue Committed by GitHub Jun 28, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

fluentd-gcp-configmap.yaml cluster/addons/fluentd-gcp/fluentd-gcp-configmap.yaml +1 -1

No files found.
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-configmap.yaml
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-configmap.yaml
@@ -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