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

Remove Docker input from Filebeat #28817

Merged
merged 7 commits into from
Nov 8, 2021
Merged

Remove Docker input from Filebeat #28817

merged 7 commits into from
Nov 8, 2021

Conversation

kvch
Copy link
Contributor

@kvch kvch commented Nov 4, 2021 •
edited
Loading

What does this PR do?

This PR removes the deprecated docker input from Filebeat. You should use container input instead.

Why is it important?

The input has been deprecated since 7.2. Now it is time to remove it from the codebase in 8.0.0.

Checklist

  • My code follows the style guidelines of this project
    - [ ] I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
    - [ ] I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Nov 4, 2021
@mergify
Copy link
Contributor

mergify bot commented Nov 4, 2021

This pull request does not have a backport label. Could you fix it @kvch? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v./d./d./d is the label to automatically backport to the 7./d branch. /d is the digit

NOTE: backport-skip has been added to this pull request.

@mergify mergify bot added the backport-skip Skip notification from the automated backport with mergify label Nov 4, 2021
@kvch kvch added backport-v8.0.0 Automated backport with mergify Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team labels Nov 4, 2021
@mergify mergify bot removed the backport-skip Skip notification from the automated backport with mergify label Nov 4, 2021
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Nov 4, 2021
@kvch kvch requested review from ruflin and jsoriano November 4, 2021 16:47
@elasticmachine
Copy link
Collaborator

elasticmachine commented Nov 4, 2021 •
edited by jenkins-beats-ci bot
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Duration: 117 min 42 sec

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

@jsoriano
Copy link
Member

jsoriano commented Nov 5, 2021

/package

@jsoriano
Copy link
Member

jsoriano commented Nov 5, 2021

Running E2E tests to check with the autodiscover scenarios.

jsoriano
jsoriano reviewed Nov 5, 2021
View reviewed changes
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 for taking care of this! LGTM, but let's wait for tests.

Please @ChrsMark take also a look to these changes.

filebeat/tests/system/test_registrar.py Show resolved Hide resolved
ruflin
ruflin reviewed Nov 5, 2021
View reviewed changes
CHANGELOG.next.asciidoc Outdated Show resolved Hide resolved
@kvch
Copy link
Contributor Author

kvch commented Nov 5, 2021

The doc failure seems unrelated, but it is something I want to fix.

ChrsMark
ChrsMark approved these changes Nov 5, 2021
View reviewed changes
Copy link
Member

@ChrsMark ChrsMark left a comment

Choose a reason for hiding this comment

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

lgtm, good to see that cleanup happening

@kvch kvch merged commit fa1cbbe into elastic:master Nov 8, 2021
mergify bot pushed a commit that referenced this pull request Nov 8, 2021
@kvch
Remove Docker input from Filebeat (#28817)
f7aca66 
Users should use either `container` input or `filestream` input with `container` parser.

(cherry picked from commit fa1cbbe)
@mergify mergify bot mentioned this pull request Nov 8, 2021
Merged
kvch added a commit that referenced this pull request Nov 8, 2021
@mergify @kvch
Remove Docker input from Filebeat (#28817) (#28863)
25f6d68 
Users should use either `container` input or `filestream` input with `container` parser.

(cherry picked from commit fa1cbbe)

Co-authored-by: Noémi Ványi <kvch@users.noreply.github.com>
v1v added a commit to v1v/beats that referenced this pull request Nov 8, 2021
@v1v
Merge remote-tracking branch 'upstream/master' into feature/use-arch-…
3afea6c 
…in-the-package-binareis

* upstream/master:
  allows disable pod events enrichment with deployment name (elastic#28521)
  Remove Docker input from Filebeat (elastic#28817)
  [breaking] Make default_field: false the default for all fields (elastic#28596)
  Osquerybeat: Improve osquery client connect code (elastic#28848)
  Add crawler  metrics into the stats metricset for Enterprise Search (elastic#28790)
  Remove the now deprecated appsearch module from metricbeat (elastic#28850)
  Remove Beat generators (elastic#28816)
  chore: upload files to Google Storage when they exist (elastic#28836)
  Revert "chore(ci): disable E2E tests in Beats (elastic#28715)" (elastic#28812)
  Deprecate generating custom Beats (elastic#28814)
  [Metricbeat] upgrade flatbuffers to 1.12.1 (elastic#28094)
  Osquerybeat: Fix restart flags after previously bad config (elastic#28827)
  Force ECS and JSON logging for libbeat/logp (elastic#28573)
  Filebeat: Error on startup for unconfigured module (elastic#28818)
  Deprecate log input in favour of filestream (elastic#28623)
  Fix some spelling mistakes (elastic#28080)
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
@v1v
Merge remote-tracking branch 'upstream/master' into feature/use-arch-…
061692b 
…in-the-package-binareis

* upstream/master:
  allows disable pod events enrichment with deployment name (elastic#28521)
  Remove Docker input from Filebeat (elastic#28817)
  [breaking] Make default_field: false the default for all fields (elastic#28596)
  Osquerybeat: Improve osquery client connect code (elastic#28848)
  Add crawler  metrics into the stats metricset for Enterprise Search (elastic#28790)
  Remove the now deprecated appsearch module from metricbeat (elastic#28850)
  Remove Beat generators (elastic#28816)
  chore: upload files to Google Storage when they exist (elastic#28836)
  Revert "chore(ci): disable E2E tests in Beats (elastic#28715)" (elastic#28812)
  Deprecate generating custom Beats (elastic#28814)
  [Metricbeat] upgrade flatbuffers to 1.12.1 (elastic#28094)
  Osquerybeat: Fix restart flags after previously bad config (elastic#28827)
  Force ECS and JSON logging for libbeat/logp (elastic#28573)
  Filebeat: Error on startup for unconfigured module (elastic#28818)
  Deprecate log input in favour of filestream (elastic#28623)
  Fix some spelling mistakes (elastic#28080)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ruflin ruflin ruflin left review comments

@jsoriano jsoriano jsoriano left review comments

@ChrsMark ChrsMark ChrsMark approved these changes

Assignees
No one assigned
Labels
backport-v8.0.0 Automated backport with mergify Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@kvch @elasticmachine @jsoriano @ruflin @ChrsMark