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

[8.x](backport #41229) De-duplicate pipeline steps in system.auth module #41231

Merged
merged 1 commit into from
Oct 15, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 14, 2024

Proposed commit message

See title

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

None

## Author's Checklist

How to test this PR locally

Run the system 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

Related issues

## Use cases
## Screenshots
## Logs


This is an automatic backport of pull request #41229 done by [Mergify](https://mergify.com).

@mergify mergify bot requested a review from a team as a code owner October 14, 2024 19:02
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 14, 2024
@mergify mergify bot requested review from rdner and faec and removed request for a team October 14, 2024 19:02
Copy link
Contributor Author

mergify bot commented Oct 14, 2024

Cherry-pick of f69b501 has failed:

On branch mergify/bp/8.x/pr-41229
Your branch is up to date with 'origin/8.x'.

You are currently cherry-picking commit f69b50127e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   filebeat/module/system/auth/ingest/common.yml
	modified:   filebeat/module/system/auth/ingest/pipeline.yml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   filebeat/module/system/auth/ingest/entrypoint.yml
	deleted by us:   filebeat/module/system/auth/ingest/journald.yml
	both modified:   filebeat/module/system/auth/manifest.yml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 14, 2024
@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Oct 15, 2024
@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 Oct 15, 2024
@pierrehilbert pierrehilbert requested review from belimawr and removed request for rdner and faec October 15, 2024 06:57
Copy link
Contributor Author

mergify bot commented Oct 15, 2024

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.x/pr-41229 upstream/mergify/bp/8.x/pr-41229
git merge upstream/8.x
git push upstream mergify/bp/8.x/pr-41229

@belimawr belimawr merged commit f1359c8 into 8.x Oct 15, 2024
30 checks passed
@belimawr belimawr deleted the mergify/bp/8.x/pr-41229 branch October 15, 2024 20:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants