Skip to content

[8.18](backport #46376) [winlogbeat] Fix EventLog reset logic to avoid closing renderers#46686

Merged
marc-gr merged 3 commits into8.18from
mergify/bp/8.18/pr-46376
Sep 18, 2025
Merged

[8.18](backport #46376) [winlogbeat] Fix EventLog reset logic to avoid closing renderers#46686
marc-gr merged 3 commits into8.18from
mergify/bp/8.18/pr-46376

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Sep 18, 2025

Proposed commit message

Fix EventLog reset logic to avoid closing renderers

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

Related issues

Use cases

Screenshots

Logs


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

(cherry picked from commit c5e8d26)

# Conflicts:
#	winlogbeat/eventlog/wineventlog.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 18, 2025
@mergify mergify bot requested a review from a team as a code owner September 18, 2025 08:57
@mergify
Copy link
Contributor Author

mergify bot commented Sep 18, 2025

Cherry-pick of c5e8d26 has failed:

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

You are currently cherry-picking commit c5e8d26ec.
  (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

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   winlogbeat/eventlog/wineventlog.go

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 Sep 18, 2025
@github-actions github-actions bot added bugfix Team:Security-Windows Platform Windows Platform Team in Security Solution windows labels Sep 18, 2025
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Sep 18, 2025
@elasticmachine
Copy link
Contributor

Pinging @elastic/sec-windows-platform (Team:Security-Windows Platform)

@marc-gr marc-gr enabled auto-merge (squash) September 18, 2025 09:12
@marc-gr
Copy link
Contributor

marc-gr commented Sep 18, 2025

/docs

@marc-gr marc-gr merged commit 19fef74 into 8.18 Sep 18, 2025
27 of 29 checks passed
@marc-gr marc-gr deleted the mergify/bp/8.18/pr-46376 branch September 18, 2025 11:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport bugfix conflicts There is a conflict in the backported pull request Team:Security-Windows Platform Windows Platform Team in Security Solution windows

2 participants