Skip to content

Add support for CRI-O based logs autodiscover#10687

Merged
jsoriano merged 4 commits intoelastic:masterfrom
vjsamuel:add_cri-o
Feb 21, 2019
Merged

Add support for CRI-O based logs autodiscover#10687
jsoriano merged 4 commits intoelastic:masterfrom
vjsamuel:add_cri-o

Conversation

@vjsamuel
Copy link
Copy Markdown
Contributor

@vjsamuel vjsamuel commented Feb 12, 2019

This PR attempts to do two things:

  • Allow docker input to be used generically for file paths instead of explicitly using container names.
  • Make autodiscover generate CRI-O paths by default.

@vjsamuel vjsamuel requested a review from a team as a code owner February 12, 2019 07:45
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Feb 12, 2019

Since this is a community submitted pull request, a Jenkins build has not been kicked off automatically. Can an Elastic organization member please verify the contents of this patch and then kick off a build manually?

@ruflin ruflin added review containers Related to containers use case Team:Integrations Label for the Integrations team labels Feb 12, 2019
@ruflin ruflin requested a review from jsoriano February 12, 2019 14:48
@vjsamuel
Copy link
Copy Markdown
Contributor Author

vjsamuel commented Feb 12, 2019

Fixes #8985 and #8988

@vjsamuel
Copy link
Copy Markdown
Contributor Author

vjsamuel commented Feb 13, 2019

Failure looks like a flaky test

jsoriano
jsoriano reviewed Feb 14, 2019
View reviewed changes
Copy link
Copy Markdown
Member

@jsoriano jsoriano left a comment

Choose a reason for hiding this comment

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

Thanks @vjsamuel for working on this, I think this new path option will be really helpful, it mostly LGTM.

I think we could maintain both options long-term, I still see ids as a more straightforward option for docker use cases and we may think on providing new inputs for other runtimes in the future, so I wouldn't think as ids as deprecated for docker. For this reason I'd also keep the tests for ids and would add tests for paths.

jsoriano
jsoriano reviewed Feb 14, 2019
View reviewed changes
@jsoriano
Copy link
Copy Markdown
Member

jsoriano commented Feb 14, 2019

Failure looks like a flaky test

Try to update the branch with master, I think that at least the ML-related failures are fixed there.

@vjsamuel
Copy link
Copy Markdown
Contributor Author

vjsamuel commented Feb 14, 2019

seems like yet another flaky test case on metricbeat

@jsoriano
Copy link
Copy Markdown
Member

jsoriano commented Feb 19, 2019

jenkins, test this

@jsoriano
Copy link
Copy Markdown
Member

jsoriano commented Feb 20, 2019

jenkins, test this again please

@jsoriano
Copy link
Copy Markdown
Member

jsoriano commented Feb 20, 2019

@vjsamuel for the followup (or here) could you also mention the new paths option in the changelog?

@jsoriano jsoriano merged commit 6e56b99 into elastic:master Feb 21, 2019
@jsoriano jsoriano mentioned this pull request Feb 21, 2019
Merged
@jsoriano
Copy link
Copy Markdown
Member

jsoriano commented Feb 21, 2019

@vjsamuel I have merged this and opened a follow up to fix the changelog and add some docs for the new option #10864

@vjsamuel vjsamuel deleted the add_cri-o branch March 27, 2019 04:09
@exekias exekias mentioned this pull request May 10, 2019
Merged
exekias pushed a commit to exekias/beats that referenced this pull request May 10, 2019
Revert (unreleased) changes done in elastic#10687
67644b2
@adelbot
Copy link
Copy Markdown

adelbot commented Mar 11, 2020

Hi, i don't understand the minimum beat version who is compatible CRI-O ?

@jsoriano
Copy link
Copy Markdown
Member

jsoriano commented Mar 11, 2020

Hey @adelbot, this change is available since 7.2.0.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jsoriano jsoriano jsoriano approved these changes

Assignees

No one assigned

Labels

containers Related to containers use case review Team:Integrations Label for the Integrations team v7.2.0

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@vjsamuel @elasticmachine @jsoriano @adelbot @ruflin