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

Update fluentd-gcp such that exported logs are associated with kubernetes #13886

Merged
merged 3 commits into from Sep 16, 2015

Conversation

a-robinson
Copy link
Contributor

This includes a few changes:

This gets us most of the way to #8001 on the GCP side, with the final step of using the filter_kubernetes_metadata plugin being blocked on the daemon controller being ready so that fluentd can authenticate to the apiserver.

I've verified the new plugin manually, but can't actually build the Docker image until @mr-salty cuts the new google-fluentd release on Monday, so this will fail e2e until I can do so on Monday.

@k8s-bot
Copy link

k8s-bot commented Sep 12, 2015

GCE e2e build/test passed for commit db0b4a229fbd86789b388a7d179ee2b0385c3388.

@k8s-github-robot k8s-github-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Sep 13, 2015
@k8s-github-robot
Copy link

Labelling this PR as size/M

changes to fluent-plugin-google-cloud to attach Kubernetes metadata to
logs.

Along with this, separate logs from containers in the cluster out from
logs from the daemons running on the node by instantiating two instances
of the output plugin, one which uses the new metadata (for containers)
and one which doesn't (for things like docker and the kubelet).
@a-robinson
Copy link
Contributor Author

PTAL. The new google-fluentd build was made available today, so I've built the image and spun up a new cluster with these changes to verify it. This is now in a functioning, mergeable state.

@roberthbailey
Copy link
Contributor

Can you squash your commits?

@a-robinson
Copy link
Contributor Author

They're logically separate changes that I stuck together for less reviewing overhead. I can combine the first two if you'd like since they're both effectively cleanups, but the third is a major functionality change which belongs on its own.

@k8s-bot
Copy link

k8s-bot commented Sep 16, 2015

GCE e2e build/test passed for commit 8040f75.

@roberthbailey roberthbailey added release-note Denotes a PR that will be considered when it comes time to generate release notes. lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Sep 16, 2015
@roberthbailey
Copy link
Contributor

LGTM.

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Sep 16, 2015

GCE e2e build/test failed for commit 8040f75.

@k8s-bot
Copy link

k8s-bot commented Sep 16, 2015

GCE e2e build/test passed for commit 8040f75.

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Sep 16, 2015

GCE e2e build/test passed for commit 8040f75.

@k8s-github-robot
Copy link

Automatic merge from SubmitQueue

k8s-github-robot pushed a commit that referenced this pull request Sep 16, 2015
Auto commit by PR queue bot
@k8s-github-robot k8s-github-robot merged commit 14ccba8 into kubernetes:master Sep 16, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Make it possible to disable collection of kubelet/docker logs
5 participants