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

Use docker prospector in examples #5963

Merged
merged 1 commit into from
Dec 28, 2017
Merged

Use docker prospector in examples #5963

merged 1 commit into from
Dec 28, 2017

Conversation

zytek
Copy link
Contributor

@zytek zytek commented Dec 27, 2017

No description provided.

@elasticmachine
Copy link
Collaborator

Can one of the admins verify this patch?

@zytek
Copy link
Contributor Author

zytek commented Dec 27, 2017

cla signed

@karmi
Copy link

karmi commented Dec 27, 2017

Hi @zytek, we have found your signature in our records, but it seems like you have signed with a different e-mail than the one used in yout Git commit. Can you please add both of these e-mails into your Github profile (they can be hidden), so we can match your e-mails to your Github profile?

@zytek
Copy link
Contributor Author

zytek commented Dec 27, 2017

@karmi just fixed that via amend + push force

@zytek
Copy link
Contributor Author

zytek commented Dec 27, 2017

.. and added secondary email to my GH profile

@ruflin ruflin requested a review from exekias December 28, 2017 02:45
@ruflin
Copy link
Contributor

ruflin commented Dec 28, 2017

@exekias You are the best one to review this.

@zytek I think we will also need a changelog for this one.

@ruflin
Copy link
Contributor

ruflin commented Dec 28, 2017

jenkins, test it

@zytek
Use docker prospector in K8S examples, fixes #5934 and #5920
1caea7e 
New docker prospector properly sends log entries in message
field (see #5920). Remove unused POD_NAMESPACE env var from
filebeat manifest.
@zytek
Copy link
Contributor Author

zytek commented Dec 28, 2017

Added changelog entry, squashed all commits.

exekias
exekias approved these changes Dec 28, 2017
View reviewed changes
Copy link
Contributor

@exekias exekias left a comment

Choose a reason for hiding this comment

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

LGTM, thank you for taking this!

@exekias exekias added docs needs_backport PR is waiting to be backported to other branches. v6.1.0 labels Dec 28, 2017
@exekias
Copy link
Contributor

exekias commented Dec 28, 2017

Closes #5920 and #5934

@exekias exekias merged commit 241aa3c into elastic:master Dec 28, 2017
@exekias exekias mentioned this pull request Dec 31, 2017
Closed
exekias pushed a commit to exekias/beats that referenced this pull request Jan 3, 2018
@zytek @exekias
Use docker prospector in K8S examples, fixes elastic#5934 and elastic…
882f3ee 
…#5920 (elastic#5963)

New docker prospector properly sends log entries in message
field (see elastic#5920). Remove unused POD_NAMESPACE env var from
filebeat manifest.
(cherry picked from commit 241aa3c)
@exekias exekias mentioned this pull request Jan 3, 2018
Merged
@exekias exekias removed the needs_backport PR is waiting to be backported to other branches. label Jan 3, 2018
andrewkroh pushed a commit that referenced this pull request Jan 3, 2018
@exekias @andrewkroh
Cherry-pick #5963 to 6.1: Use docker prospector in examples, fixes #5934
dfdeca7 
 and #5920 (#5976)

* Use docker prospector in K8S examples, fixes #5934 and #5920 (#5963)

New docker prospector properly sends log entries in message
field (see #5920). Remove unused POD_NAMESPACE env var from
filebeat manifest.
(cherry picked from commit 241aa3c)

* Update NOTICE.txt
@monicasarbu monicasarbu changed the title Use docker prospector in examples, fixes #5934 and #5920 Use docker prospector in examples Jan 8, 2018
@elasticmachine
Copy link
Collaborator

Can one of the admins verify this patch?

@exekias exekias mentioned this pull request Mar 11, 2018
Closed
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
@exekias @andrewkroh
Cherry-pick elastic#5963 to 6.1: Use docker prospector in examples, f…
eb481df 
…ixes elastic#5934 and elastic#5920 (elastic#5976)

* Use docker prospector in K8S examples, fixes elastic#5934 and elastic#5920 (elastic#5963)

New docker prospector properly sends log entries in message
field (see elastic#5920). Remove unused POD_NAMESPACE env var from
filebeat manifest.
(cherry picked from commit d066553)

* Update NOTICE.txt
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@exekias exekias exekias approved these changes

Assignees
No one assigned
Labels
docs libbeat review v6.1.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@zytek @elasticmachine @karmi @ruflin @exekias