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.

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

Jump to bottom

Fix fluentd-gcp configuration to facilitate JSON parsing #48139

Merged
merged 1 commit into from
Jun 27, 2017
Merged

Fix fluentd-gcp configuration to facilitate JSON parsing #48139

merged 1 commit into from
Jun 27, 2017

Conversation

crassirostris
Copy link

There's a bug in #45734, because of which each records gets additional field and google-cloud plugin thinks it's not JSON (https://github.com/GoogleCloudPlatform/fluent-plugin-google-cloud/blob/master/lib/fluent/plugin/out_google_cloud.rb#L569)

Fixes #48108

/cc @piosz @fgrzadkowski

@crassirostris crassirostris added kind/bug Categorizes issue or PR as related to a bug. release-note-none Denotes a PR that doesn't merit a release note. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. labels Jun 27, 2017
@crassirostris crassirostris added this to the v1.7 milestone Jun 27, 2017
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jun 27, 2017
@k8s-github-robot k8s-github-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jun 27, 2017
@crassirostris crassirostris mentioned this pull request Jun 27, 2017
Merged
@fgrzadkowski
Copy link
Contributor

\lgtm

@fgrzadkowski
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 27, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: crassirostris, fgrzadkowski

Associated issue: 48108

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@crassirostris
Copy link
Author

/test pull-kubernetes-e2e-gce-etcd3

@enisoc enisoc added release-note Denotes a PR that will be considered when it comes time to generate release notes. cherrypick-candidate and removed release-note-none Denotes a PR that doesn't merit a release note. labels Jun 27, 2017
@enisoc
Copy link
Member

enisoc commented Jun 27, 2017

I've added cherrypick-candidate because I assume you want this in 1.7 too. Please remove if that's incorrect.

@crassirostris
Copy link
Author

@enisoc Yes, thanks!

@caesarxuchao caesarxuchao added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jun 27, 2017
@crassirostris
Copy link
Author

/test pull-kubernetes-e2e-kops-aws

1 similar comment
@crassirostris
Copy link
Author

/test pull-kubernetes-e2e-kops-aws

@crassirostris
Copy link
Author

/retest

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 48139, 48042, 47645, 48054, 48003)

@k8s-github-robot k8s-github-robot merged commit f1b58f4 into kubernetes:master Jun 27, 2017
@k8s-github-robot
Copy link

@crassirostris PR needs rebase

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 27, 2017
k8s-github-robot pushed a commit that referenced this pull request Jun 27, 2017
Merge pull request #48140 from crassirostris/automated-cherry-pick-of…
9135947 
…-#48139-upstream-release-1.6

Automatic merge from submit-queue

Automated cherry pick of #48139

Cherry pick of #48139 on release-1.6.

#48139: Fix fluentd-gcp configuration to facilitate JSON parsing
@caesarxuchao caesarxuchao mentioned this pull request Jun 28, 2017
Merged
k8s-github-robot pushed a commit that referenced this pull request Jun 28, 2017
Merge pull request #48169 from caesarxuchao/automated-cherry-pick-of-…
fe04f8f 
…#48139-#48049-#48042-upstream-release-1.7

Automatic merge from submit-queue

Automated cherry pick of #48139 #48049 #48042

Cherry pick of #48139 #48049 #48042 on release-1.7.

#48139: Fix fluentd-gcp configuration to facilitate JSON parsing
#48049: kubeadm: Make kube-proxy RollingUpgradeable
#48042: Reflect kubeadm-specific kubelet changes in the bazel debs
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.7" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

@piosz
Copy link
Member

piosz commented Jun 28, 2017

Thanks @crassirostris for the quick fix!

@crassirostris crassirostris mentioned this pull request Aug 7, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@piosz piosz Awaiting requested review from piosz

@fgrzadkowski fgrzadkowski Awaiting requested review from fgrzadkowski

Assignees

@caesarxuchao caesarxuchao

@piosz piosz

@fgrzadkowski fgrzadkowski

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v1.7
Development

Successfully merging this pull request may close these issues.
9 participants
@crassirostris @fgrzadkowski @k8s-github-robot @enisoc @k8s-cherrypick-bot @piosz @chaintng @caesarxuchao @k8s-ci-robot