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][streaming] - Added OAuth2 support with auto token refresh for websockets #42212

Merged
merged 8 commits into from
Jan 7, 2025
Merged

[filebeat][streaming] - Added OAuth2 support with auto token refresh for websockets #42212

merged 8 commits into from
Jan 7, 2025

Conversation

ShourieG
Copy link
Contributor

@ShourieG ShourieG commented Jan 3, 2025

Type of change

  • Enhancement
  • Docs

Proposed commit message

Added OAuth2 support with auto token refresh for websockets. A manual token refresh logic had to be implemented since the OAuth2 client and the websocket client are separate entities and cannot be clubbed together.

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 3, 2025 17:06
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jan 3, 2025
@mergify Mergify
Copy link
Contributor

mergify bot commented Jan 3, 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 3, 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 3, 2025
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jan 3, 2025
@elasticmachine
Copy link
Collaborator

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

@ShourieG ShourieG added needs_team Indicates that the issue/PR needs a Team:* label backport-8.17 Automated backport with mergify labels Jan 3, 2025
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jan 3, 2025
@ShourieG ShourieG requested a review from chrisberkhout January 3, 2025 17:22
@mergify Mergify
Copy link
Contributor

mergify bot commented Jan 7, 2025

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 streaming/websocket_oauth2 upstream/streaming/websocket_oauth2
git merge upstream/main
git push upstream streaming/websocket_oauth2

@ShourieG
Copy link
Contributor Author

ShourieG commented Jan 7, 2025 •
edited
Loading

@chrisberkhout, I've addressed most of the suggestions, for others have provided some comments.

@ShourieG ShourieG added the backport-8.16 Automated backport with mergify label Jan 7, 2025
@ShourieG ShourieG requested a review from chrisberkhout January 7, 2025 16:10
@ShourieG ShourieG merged commit 4244fa2 into elastic:main Jan 7, 2025
18 of 22 checks passed
mergify bot pushed a commit that referenced this pull request Jan 7, 2025
@ShourieG @mergify
[filebeat][streaming] - Added OAuth2 support with auto token refresh …
e1c80ab 
…for websockets (#42212)

* Added OAuth2 support with auto token refresh for websockets. A manual token refresh logic had to be implemented since the OAuth2 client and the websocket client are separate entities and cannot be clubbed together.

(cherry picked from commit 4244fa2)
mergify bot pushed a commit that referenced this pull request Jan 7, 2025
@ShourieG @mergify
[filebeat][streaming] - Added OAuth2 support with auto token refresh …
7801c7d 
…for websockets (#42212)

* Added OAuth2 support with auto token refresh for websockets. A manual token refresh logic had to be implemented since the OAuth2 client and the websocket client are separate entities and cannot be clubbed together.

(cherry picked from commit 4244fa2)
mergify bot pushed a commit that referenced this pull request Jan 7, 2025
@ShourieG @mergify
[filebeat][streaming] - Added OAuth2 support with auto token refresh …
6dbc1eb 
…for websockets (#42212)

* Added OAuth2 support with auto token refresh for websockets. A manual token refresh logic had to be implemented since the OAuth2 client and the websocket client are separate entities and cannot be clubbed together.

(cherry picked from commit 4244fa2)
This was referenced Jan 7, 2025
Merged
Merged
Merged
ShourieG added a commit that referenced this pull request Jan 7, 2025
@mergify @ShourieG
[8.17](backport #42212) [filebeat][streaming] - Added OAuth2 support …
fc72186 
…with auto token refresh for websockets (#42244)

* [filebeat][streaming] - Added OAuth2 support with auto token refresh for websockets (#42212)

* Added OAuth2 support with auto token refresh for websockets. A manual token refresh logic had to be implemented since the OAuth2 client and the websocket client are separate entities and cannot be clubbed together.

(cherry picked from commit 4244fa2)

* Update CHANGELOG.next.asciidoc

---------

Co-authored-by: Shourie Ganguly <[email protected]>
ShourieG added a commit that referenced this pull request Jan 7, 2025
@mergify @ShourieG
[8.16](backport #42212) [filebeat][streaming] - Added OAuth2 support …
56f3599 
…with auto token refresh for websockets (#42242)

* [filebeat][streaming] - Added OAuth2 support with auto token refresh for websockets (#42212)

* Added OAuth2 support with auto token refresh for websockets. A manual token refresh logic had to be implemented since the OAuth2 client and the websocket client are separate entities and cannot be clubbed together.

(cherry picked from commit 4244fa2)

* Update CHANGELOG.next.asciidoc

---------

Co-authored-by: Shourie Ganguly <[email protected]>
ShourieG added a commit that referenced this pull request Jan 7, 2025
@mergify @ShourieG
[8.x](backport #42212) [filebeat][streaming] - Added OAuth2 support w…
fe44ff2 
…ith auto token refresh for websockets (#42243)

* [filebeat][streaming] - Added OAuth2 support with auto token refresh for websockets (#42212)

* Added OAuth2 support with auto token refresh for websockets. A manual token refresh logic had to be implemented since the OAuth2 client and the websocket client are separate entities and cannot be clubbed together.

(cherry picked from commit 4244fa2)

* Update CHANGELOG.next.asciidoc

---------

Co-authored-by: Shourie Ganguly <[email protected]>
@ShourieG ShourieG deleted the streaming/websocket_oauth2 branch January 8, 2025 10:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chrisberkhout chrisberkhout chrisberkhout 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 docs 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.

[filebeat][streaming] - Standard OAuth2 implementation for websockets.
3 participants
@ShourieG @elasticmachine @chrisberkhout