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

Remove Journalbeat #29131

Merged
merged 5 commits into from
Nov 30, 2021
Merged

Remove Journalbeat #29131

merged 5 commits into from
Nov 30, 2021

Conversation

kvch
Copy link
Contributor

@kvch kvch commented Nov 24, 2021

What does this PR do?

This PR removes Journalbeat from Beats. The Beat has been experimental for years. Now it is released as a Filebeat input, so we no longer need the Beat.

Why is it important?

Cleanup.

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.

@kvch kvch requested a review from a team as a code owner November 24, 2021 16:08
@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label Team:Automation Label for the Observability productivity team and removed needs_team Indicates that the issue/PR needs a Team:* label labels Nov 24, 2021
@mergify
Copy link
Contributor

mergify bot commented Nov 24, 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 24, 2021
@kvch kvch requested review from ruflin and michalpristas November 24, 2021 16:08
@kvch kvch mentioned this pull request Nov 24, 2021
3 tasks
@kvch kvch added backport-v7.16.0 Automated backport with mergify backport-v8.0.0 Automated backport with mergify labels Nov 24, 2021
@mergify mergify bot removed the backport-skip Skip notification from the automated backport with mergify label Nov 24, 2021
@elasticmachine
Copy link
Collaborator

elasticmachine commented Nov 24, 2021

💚 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

  • Start Time: 2021-11-29T11:39:37.379+0000

  • Duration: 149 min 25 sec

  • Commit: 58d543c

Test stats 🧪

Test Results
Failed 0
Passed 48621
Skipped 4286
Total 52907

💚 Flaky test report

Tests succeeded.

🤖 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.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

Copy link
Contributor

@ruflin ruflin left a comment

Choose a reason for hiding this comment

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

Overall change LGTM. Lets get it into 8.0 and as a follow up lets see if we still have time to make it into 7.16.

CI is not happy including docs. I suspect there are a few dependencies. I would also not be suprised if the release manager also has some references to it and needs updating.

@@ -1,15 +0,0 @@
journalbeat:
Copy link
Contributor

Choose a reason for hiding this comment

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

Argh, we supported it even in Elastic Agent? @nimarezainia We likely need to mention this somewhere also in Elastic Agent 8.0 breaking changes that log/journal was removed.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I thought journald input was exposed under log/journal. Is that not correct?

Copy link
Contributor

Choose a reason for hiding this comment

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

The problem is that it is correct. Under what path do we expose the filebeat journal input?

@cachedout
Copy link
Contributor

I would also not be suprised if the release manager also has some references to it and needs updating.

There's a sprinkling of references across the infra repo. Many of these look related to previous releases and shouldn't need to be touched, but a few many not be. I think that @elastic/infra-release probably need to be looped in here to take a look.

@kvch
Copy link
Contributor Author

kvch commented Nov 25, 2021

I would also not be suprised if the release manager also has some references to it and needs updating.

There's a sprinkling of references across the infra repo. Many of these look related to previous releases and shouldn't need to be touched, but a few many not be. I think that @elastic/infra-release probably need to be looped in here to take a look.

I have already checked it. I mentioned in the original issue that the infra team has already removed Journalbeat from the release process, from download pages, etc: #28476 There is nothing else we have to do.

@kvch
Copy link
Contributor Author

kvch commented Nov 25, 2021

jenkins run tests

1 similar comment
@kvch
Copy link
Contributor Author

kvch commented Nov 29, 2021

jenkins run tests

@dedemorton
Copy link
Contributor

@elasticmachine run elasticsearch-ci/docs

@kvch kvch merged commit af2eb73 into elastic:master Nov 30, 2021
@kvch
Copy link
Contributor Author

kvch commented Nov 30, 2021

I have accidentally merged this PR. If you have any comments, I will address them in a follow-up PR.

v1v added a commit to v1v/beats that referenced this pull request Nov 30, 2021
* upstream/master: (577 commits)
  Remove Journalbeat (elastic#29131)
  Add note that there is no warranty or support for generator code (elastic#28797)
  packetbeat: preparation for npcap addition (elastic#29017)
  Use the generic helper for opening file to read in filestream (elastic#29180)
  Workflow for macos (elastic#29174)
  Fix `decode_json_fields` processor to always add error key (elastic#29107)
  Workflow for macos (elastic#29156)
  Fix agent download timeout values in yaml files (elastic#29039)
  Added workflow file for builds with macos (elastic#29148)
  CI: enable AWS cloud testing on a PR basis if changes in certain files (elastic#29047)
  Remove links to Journalbeat (elastic#29134)
  Fix rds metadata in cloudwatch metricset (elastic#29106)
  [mergify]: notify conflicts in PRs that are still open (elastic#29122)
  Use NamedWatcher in Agent's k8s provider (elastic#29095)
  override host on statsd metricset (elastic#29103)
  Skip config check in autodiscover for duplicated configurations (elastic#29048)
  Change "filebeat.config.modules.enabled" to "true" (elastic#28769)
  Remove deprecated spool queue from Beats (elastic#28869)
  Add `beat` field back to beat.stats (elastic#29094)
  Revert "Move labels and annotations under kubernetes.namespace. (elastic#27917)" (elastic#29069)
  ...
kvch added a commit that referenced this pull request Nov 30, 2021
Use journald input instead.

(cherry picked from commit af2eb73)
kvch added a commit that referenced this pull request Nov 30, 2021
Use journald input instead.

(cherry picked from commit af2eb73)
kvch added a commit that referenced this pull request Nov 30, 2021
Use journald input instead.

(cherry picked from commit af2eb73)

Co-authored-by: Noémi Ványi <kvch@users.noreply.github.com>
kvch added a commit that referenced this pull request Nov 30, 2021
Use journald input instead.

(cherry picked from commit af2eb73)

Co-authored-by: Noémi Ványi <kvch@users.noreply.github.com>
elasticmachine pushed a commit to nxei/beats that referenced this pull request Dec 1, 2021
* upstream/master:
  [libbeat] Fix add_labels flattening of arrays values (elastic#29211)
  Change elastic-agent pprof default to false (elastic#29155)
  elastic#28472 fix flaky tests in libbeat fmtstr to use time.UTC instead of time.Local (elastic#28473)
  Adopt `parsers` in Filebeat's journald input (elastic#29070)
  [Elastic Agent] Add process error handling guidelines (elastic#29152)
  winlogbeat/sys/winevent: use reflect IsZero method (elastic#29190)
  Remove Journalbeat (elastic#29131)
  Add note that there is no warranty or support for generator code (elastic#28797)
  packetbeat: preparation for npcap addition (elastic#29017)
  Use the generic helper for opening file to read in filestream (elastic#29180)
  Workflow for macos (elastic#29174)
  Fix `decode_json_fields` processor to always add error key (elastic#29107)
Luzifer added a commit to luzifer-arch/beats that referenced this pull request Jan 10, 2022
as journalbeat as dropped upstream with 7.16 release in elastic/beats#29131

Signed-off-by: Knut Ahlers <knut@ahlers.me>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-v7.16.0 Automated backport with mergify backport-v8.0.0 Automated backport with mergify Team:Automation Label for the Observability productivity team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants