Skip to content

Revert system module support for journald #41489

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
Merged
belimawr merged 2 commits into from
Oct 31, 2024
Merged

Revert system module support for journald #41489

belimawr merged 2 commits into from
Oct 31, 2024

Conversation

@belimawr
Copy link
Contributor

@belimawr belimawr commented Oct 30, 2024 •
edited
Loading

After discussing with @cmacknz we understood it would be better to revert this PR to not lock in users with the system-logs "proxy input" at the moment.

Proposed commit message

Revert the system module usage of the system-logs input that was enabling it to run the Journald input. The revert is done in the system module configuration, pipelines and documentation. The system-logs input and its tests are kept.

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.

Disruptive User Impact

## Author's Checklist

How to test this PR locally

Run the tests

mage buildSystemTestBinary
mage docker:ComposeUp
source $(mage PythonVirtualEnv)/bin/activate
INTEGRATION_TESTS=1 BEAT_STRICT_PERMS=false ES_PASS=testing ES_USER=admin TESTING_FILEBEAT_MODULES=system pytest tests/system/test_modules.py

Run the system module

Package filebeat from this PR

# edit modules.d/system.yml and enable both filesets
# edit filebeat.yml and add the ES output and Kibana URL/credentials
./filebeat setup -e -v
./filebeat -e -v

Related issues

## Use cases
## Screenshots
## Logs

@belimawr belimawr added skip-ci Skip the build in the CI but linting Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team labels Oct 30, 2024
@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Oct 30, 2024
@belimawr
Revert system module support for journald
d09981a 
Revert the system module usage of the system-logs input that was
enabling it to run the Journald input. The revert is done in the
system module configuration, pipelines and documentation. The
system-logs input and its tests are kept.
@belimawr belimawr force-pushed the revert-system-module-with-journald branch from ea61a44 to d09981a Compare October 30, 2024 21:04
@belimawr belimawr removed the skip-ci Skip the build in the CI but linting label Oct 30, 2024
@belimawr belimawr marked this pull request as ready for review October 30, 2024 21:12
@belimawr belimawr requested a review from a team as a code owner October 30, 2024 21:12
@belimawr belimawr requested review from AndersonQ and VihasMakwana and removed request for a team October 30, 2024 21:12
@elasticmachine
Copy link
Contributor

elasticmachine commented Oct 30, 2024

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

@belimawr belimawr requested a review from cmacknz October 30, 2024 21:31
@belimawr belimawr mentioned this pull request Oct 30, 2024
Merged
3 tasks
@cmacknz cmacknz added forwardport-main Automated forwardport with mergify backport-8.x Automated backport to the 8.x branch with mergify labels Oct 30, 2024
@belimawr belimawr enabled auto-merge (squash) October 31, 2024 01:46
@belimawr
Copy link
Contributor Author

belimawr commented Oct 31, 2024

I've enabled auto-merge

@belimawr
Copy link
Contributor Author

belimawr commented Oct 31, 2024

buildkite test this

@belimawr belimawr merged commit 00d7161 into elastic:8.16 Oct 31, 2024
mergify bot pushed a commit that referenced this pull request Oct 31, 2024
@belimawr @mergify
Revert system module support for journald (#41489)
df504f2 
Revert the system module usage of the system-logs input that was
enabling it to run the Journald input. The revert is done in the
system module configuration, pipelines and documentation. The
system-logs input and its tests are kept.

(cherry picked from commit 00d7161)

# Conflicts:
#	filebeat/module/system/auth/config/auth.yml
#	filebeat/module/system/syslog/config/syslog.yml
#	filebeat/tests/integration/systemlogs_linux_test.go
mergify bot pushed a commit that referenced this pull request Oct 31, 2024
@belimawr @mergify
Revert system module support for journald (#41489)
4bbe0b0 
Revert the system module usage of the system-logs input that was
enabling it to run the Journald input. The revert is done in the
system module configuration, pipelines and documentation. The
system-logs input and its tests are kept.

(cherry picked from commit 00d7161)
This was referenced Oct 31, 2024
Merged
Merged
pierrehilbert pushed a commit that referenced this pull request Oct 31, 2024
@mergify @belimawr
Revert system module support for journald (#41489) (#41491)
649fa3a 
Revert the system module usage of the system-logs input that was
enabling it to run the Journald input. The revert is done in the
system module configuration, pipelines and documentation. The
system-logs input and its tests are kept.

(cherry picked from commit 00d7161)

Co-authored-by: Tiago Queiroz <[email protected]>
pierrehilbert pushed a commit that referenced this pull request Nov 1, 2024
@mergify @belimawr
[main](backport #41489) Revert system module support for journald (#4…
3c16c29 
…1490)

* Revert system module support for journald (#41489)

Revert the system module usage of the system-logs input that was
enabling it to run the Journald input. The revert is done in the
system module configuration, pipelines and documentation. The
system-logs input and its tests are kept.

(cherry picked from commit 00d7161)

# Conflicts:
#	filebeat/module/system/auth/config/auth.yml
#	filebeat/module/system/syslog/config/syslog.yml
#	filebeat/tests/integration/systemlogs_linux_test.go

* resolve merge conflicts

* skip system-logs tests

---------

Co-authored-by: Tiago Queiroz <[email protected]>
@pierrehilbert pierrehilbert mentioned this pull request Nov 3, 2024
Closed
@belimawr belimawr deleted the revert-system-module-with-journald branch December 19, 2024 13:56
@khushijain21 khushijain21 mentioned this pull request Jun 23, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cmacknz cmacknz cmacknz approved these changes

@AndersonQ AndersonQ Awaiting requested review from AndersonQ AndersonQ is a code owner automatically assigned from elastic/elastic-agent-data-plane

@VihasMakwana VihasMakwana Awaiting requested review from VihasMakwana VihasMakwana is a code owner automatically assigned from elastic/elastic-agent-data-plane

Assignees

@belimawr belimawr

Labels

backport-8.x Automated backport to the 8.x branch with mergify forwardport-main Automated forwardport 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.

3 participants

@belimawr @elasticmachine @cmacknz