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.17](backport #43027) [winlogbeat] Fix boolean key in security pipelines and sync pipelines with integration #43035

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 5, 2025

Proposed commit message

  • Fix boolean key in security pipelines and sync pipelines with integration

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.

Related issues


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

…tion. (#43027)

(cherry picked from commit 7237209)

# Conflicts:
#	x-pack/winlogbeat/module/security/ingest/security.yml
@mergify mergify bot requested a review from a team as a code owner March 5, 2025 11:51
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Mar 5, 2025
@mergify mergify bot assigned marc-gr Mar 5, 2025
Copy link
Contributor Author

mergify bot commented Mar 5, 2025

Cherry-pick of 7237209 has failed:

On branch mergify/bp/8.17/pr-43027
Your branch is up to date with 'origin/8.17'.

You are currently cherry-picking commit 7237209ca.
  (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:
	modified:   CHANGELOG.next.asciidoc
	modified:   x-pack/winlogbeat/module/powershell/ingest/powershell.yml
	modified:   x-pack/winlogbeat/module/powershell/ingest/powershell_operational.yml
	modified:   x-pack/winlogbeat/module/routing/ingest/routing.yml
	new file:   x-pack/winlogbeat/module/security/ingest/security_standard.yml
	modified:   x-pack/winlogbeat/module/sysmon/ingest/sysmon.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x-pack/winlogbeat/module/security/ingest/security.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 Mar 5, 2025
@botelastic
Copy link

botelastic bot commented Mar 5, 2025

This pull request doesn't have a Team:<team> label.

@marc-gr marc-gr enabled auto-merge (squash) March 5, 2025 12:01
@marc-gr marc-gr closed this Mar 5, 2025
auto-merge was automatically disabled March 5, 2025 13:14

Pull request was closed

@marc-gr marc-gr deleted the mergify/bp/8.17/pr-43027 branch March 5, 2025 13:14
@marc-gr marc-gr restored the mergify/bp/8.17/pr-43027 branch March 5, 2025 13:15
@marc-gr marc-gr reopened this Mar 5, 2025
@marc-gr
Copy link
Contributor

marc-gr commented Mar 5, 2025

/test

@marc-gr marc-gr closed this Mar 5, 2025
@marc-gr marc-gr deleted the mergify/bp/8.17/pr-43027 branch March 5, 2025 13:17
@pierrehilbert
Copy link
Collaborator

@marc-gr any reason why this one has been closed considering you merged it in 8.16?

@marc-gr
Copy link
Contributor

marc-gr commented Mar 10, 2025

This backport fixed it assuming some changes that we only in >=8.18, hence the conflicts, in 8.16 was merged by mistake and reverted.

If needed in 8.16 and 8.17 I can make a specific PR for these

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 needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants