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

Add support for CRI-O based logs autodiscover #10687

Merged
merged 4 commits into from
Feb 21, 2019

Conversation

vjsamuel
Copy link
Contributor

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
Collaborator

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
Contributor Author

Fixes #8985 and #8988

@vjsamuel
Copy link
Contributor Author

Failure looks like a flaky test

Copy link
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.

filebeat/autodiscover/builder/hints/logs_test.go Outdated Show resolved Hide resolved
filebeat/input/docker/config.go Outdated Show resolved Hide resolved
filebeat/input/docker/input.go Outdated Show resolved Hide resolved
filebeat/autodiscover/builder/hints/config.go Outdated Show resolved Hide resolved
@jsoriano
Copy link
Member

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
Contributor Author

seems like yet another flaky test case on metricbeat

@jsoriano
Copy link
Member

jenkins, test this

@jsoriano
Copy link
Member

jenkins, test this again please

@jsoriano
Copy link
Member

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

@jsoriano
Copy link
Member

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

exekias pushed a commit to exekias/beats that referenced this pull request May 10, 2019
@adelbot
Copy link

adelbot commented Mar 11, 2020

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

@jsoriano
Copy link
Member

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
Labels
containers Related to containers use case review Team:Integrations Label for the Integrations team v7.2.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants