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.

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

[filebeat][websocket] - Added infinite & blanket retry options to websockets and improved logging and retry logic #42225

Merged
merged 5 commits into from
Jan 7, 2025
Merged

[filebeat][websocket] - Added infinite & blanket retry options to websockets and improved logging and retry logic #42225

merged 5 commits into from
Jan 7, 2025

Conversation

ShourieG
Copy link
Contributor

@ShourieG ShourieG commented Jan 7, 2025 •
edited
Loading

Type of change

  • Enhancement
  • Docs

Proposed commit message

Added new config options to enable blanket & infinite retries selectively. There might be edge case scenarios in production environments which might require to retry infinitely (with backoff) in all scenarios. These options can be individually controlled and are not coupled together. Also improved logging for the retry section.

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

Related issues

Use cases

Screenshots

Logs

@ShourieG ShourieG requested a review from a team as a code owner January 7, 2025 04:41
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jan 7, 2025
@ShourieG ShourieG self-assigned this Jan 7, 2025
@mergify Mergify
Copy link
Contributor

mergify bot commented Jan 7, 2025

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @ShourieG? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit

@mergify Mergify
Copy link
Contributor

mergify bot commented Jan 7, 2025

backport-8.x has been added to help with the transition to the new branch 8.x.
If you don't need it please use backport-skip label and remove the backport-8.x label.

@mergify mergify bot added the backport-8.x Automated backport to the 8.x branch with mergify label Jan 7, 2025
@ShourieG ShourieG added Team:Security-Service Integrations Security Service Integrations Team and removed backport-8.x Automated backport to the 8.x branch with mergify labels Jan 7, 2025
@elasticmachine
Copy link
Collaborator

Pinging @elastic/security-service-integrations (Team:Security-Service Integrations)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jan 7, 2025
@mergify mergify bot added the backport-8.x Automated backport to the 8.x branch with mergify label Jan 7, 2025
@ShourieG ShourieG added enhancement backport-8.16 Automated backport with mergify backport-8.17 Automated backport with mergify labels Jan 7, 2025
kcreddy
kcreddy approved these changes Jan 7, 2025
View reviewed changes
Copy link
Contributor

@kcreddy kcreddy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍🏼

@ShourieG ShourieG merged commit 177a47a into elastic:main Jan 7, 2025
20 of 22 checks passed
mergify bot pushed a commit that referenced this pull request Jan 7, 2025
@ShourieG @mergify
[filebeat][websocket] - Added infinite & blanket retry options to web…
6b3da92 
…sockets and improved logging and retry logic (#42225)

* added blanket & infinite retry options and improved logging

(cherry picked from commit 177a47a)
mergify bot pushed a commit that referenced this pull request Jan 7, 2025
@ShourieG @mergify
[filebeat][websocket] - Added infinite & blanket retry options to web…
c9fe9a4 
…sockets and improved logging and retry logic (#42225)

* added blanket & infinite retry options and improved logging

(cherry picked from commit 177a47a)
@mergify mergify bot mentioned this pull request Jan 7, 2025
Merged
5 tasks
mergify bot pushed a commit that referenced this pull request Jan 7, 2025
@ShourieG @mergify
[filebeat][websocket] - Added infinite & blanket retry options to web…
a21e029 
…sockets and improved logging and retry logic (#42225)

* added blanket & infinite retry options and improved logging

(cherry picked from commit 177a47a)
This was referenced Jan 7, 2025
Merged
Merged
@ShourieG ShourieG deleted the websocket/blanket_retries branch January 7, 2025 12:15
ShourieG added a commit that referenced this pull request Jan 7, 2025
@mergify @ShourieG
[8.16](backport #42225) [filebeat][websocket] - Added infinite & blan…
80b0af9 
…ket retry options to websockets and improved logging and retry logic (#42234)

* [filebeat][websocket] - Added infinite & blanket retry options to websockets and improved logging and retry logic  (#42225)

* added blanket & infinite retry options and improved logging

(cherry picked from commit 177a47a)

* Update CHANGELOG.next.asciidoc

---------

Co-authored-by: ShourieG <shourie.ganguly@elastic.co>
ShourieG added a commit that referenced this pull request Jan 7, 2025
@mergify @ShourieG
[8.x](backport #42225) [filebeat][websocket] - Added infinite & blank…
1564b54 
…et retry options to websockets and improved logging and retry logic (#42235)

* [filebeat][websocket] - Added infinite & blanket retry options to websockets and improved logging and retry logic  (#42225)

* added blanket & infinite retry options and improved logging

(cherry picked from commit 177a47a)

* Update CHANGELOG.next.asciidoc

---------

Co-authored-by: ShourieG <shourie.ganguly@elastic.co>
ShourieG added a commit that referenced this pull request Jan 7, 2025
@mergify @ShourieG
[8.17](backport #42225) [filebeat][websocket] - Added infinite & blan…
2349011 
…ket retry options to websockets and improved logging and retry logic (#42236)

* [filebeat][websocket] - Added infinite & blanket retry options to websockets and improved logging and retry logic  (#42225)

* added blanket & infinite retry options and improved logging

(cherry picked from commit 177a47a)

* Update CHANGELOG.next.asciidoc

---------

Co-authored-by: ShourieG <shourie.ganguly@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kcreddy kcreddy kcreddy approved these changes

Assignees

@ShourieG ShourieG

Labels
backport-8.x Automated backport to the 8.x branch with mergify backport-8.16 Automated backport with mergify backport-8.17 Automated backport with mergify enhancement Filebeat Filebeat input:streaming Team:Security-Service Integrations Security Service Integrations Team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ShourieG @elasticmachine @kcreddy