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

fixes json logging in fluentd-elasticsearch image #67544

Merged
merged 4 commits into from
Aug 20, 2018
Merged

fixes json logging in fluentd-elasticsearch image #67544

merged 4 commits into from
Aug 20, 2018

Conversation

monotek
Copy link
Member

@monotek monotek commented Aug 17, 2018 •
edited
Loading

What this PR does / why we need it:

  • fixes json logging in fluentd-elasticsearch image by downgrading fluent-plugin-kubernetes_metadata_filter plugin to version 2.0.0
  • adds missing pos files to fluentd config
  • adds mapping type name

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

Release note:

fixes json logging in fluentd-elasticsearch image by downgrading fluent-plugin-kubernetes_metadata_filter plugin to version 2.0.0

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Aug 17, 2018
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Aug 17, 2018
@monotek
Copy link
Member Author

monotek commented Aug 17, 2018

/assign @coffeepac

@monotek monotek mentioned this pull request Aug 17, 2018
Closed
coffeepac
coffeepac reviewed Aug 17, 2018
View reviewed changes
cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml Outdated
@@ -48,24 +48,24 @@ roleRef:
apiVersion: apps/v1
kind: DaemonSet
metadata:
name: fluentd-es-v2.2.0
name: fluentd-es-v2..0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please correct the version number.

@coffeepac
Copy link
Contributor

@monotek can you split this into two PRs? one for updating the image and one for updating the template?

this lets us rev the image without breaking the build as we still need to get outside help to manage the image build process.

@coffeepac
Copy link
Contributor

/approve
/ok-to-test

@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Aug 17, 2018
@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 17, 2018
@monotek
Copy link
Member Author

monotek commented Aug 17, 2018

used image version 2.2.0 again.
adding new pr for the template when image is build.

@monotek
Copy link
Member Author

monotek commented Aug 17, 2018

/retest

1 similar comment
@monotek
Copy link
Member Author

monotek commented Aug 19, 2018

/retest

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Aug 20, 2018
@coffeepac
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 Aug 20, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: coffeepac, monotek

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

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 67593, 67544). If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-github-robot k8s-github-robot merged commit e9de06d into kubernetes:master Aug 20, 2018
@monotek monotek mentioned this pull request Aug 23, 2018
Merged
@neolit123
Copy link
Member

/sig instrumentation
for the release note tool.

@k8s-ci-robot k8s-ci-robot added the sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. label Aug 24, 2018
@monotek monotek mentioned this pull request Dec 5, 2018
Closed
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@coffeepac coffeepac coffeepac left review comments

@piosz piosz Awaiting requested review from piosz

Assignees

@coffeepac coffeepac

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. 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/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@monotek @coffeepac @k8s-ci-robot @k8s-github-robot @neolit123