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 #42315) [streaming] - Made namespace consistent in logging & put a null check to stop paincs on shutdown #42338

Merged
merged 5 commits into from
Jan 18, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 17, 2025

Type of change

  • Bug

Proposed commit message

  1. Made namespace consistent in suggested debug logs.
  2. Put in a null check during input shutdown to avoid a panic.

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 #42315 done by [Mergify](https://mergify.com).

… to stop paincs on shutdown (#42315)

* made namespace consistent in logging & put a null check to stop paincs on shutdown

(cherry picked from commit ef3bd69)

# Conflicts:
#	x-pack/filebeat/input/streaming/crowdstrike.go
#	x-pack/filebeat/input/streaming/websocket.go
@mergify mergify bot added the backport label Jan 17, 2025
@mergify mergify bot requested a review from a team as a code owner January 17, 2025 10:02
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jan 17, 2025
Copy link
Contributor Author

mergify bot commented Jan 17, 2025

Cherry-pick of ef3bd69 has failed:

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

You are currently cherry-picking commit ef3bd69d3.
  (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:   x-pack/filebeat/input/streaming/crowdstrike.go
	both modified:   x-pack/filebeat/input/streaming/websocket.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 Jan 17, 2025
@botelastic
Copy link

botelastic bot commented Jan 17, 2025

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

fixed merge conflict
fixed merge conflict in crowdstrike.go
@ShourieG ShourieG merged commit 93e523f into 8.17 Jan 18, 2025
22 checks passed
@ShourieG ShourieG deleted the mergify/bp/8.17/pr-42315 branch January 18, 2025 06:50
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.

1 participant