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

x-pack/filebeat/input/{cel,httpjson}: make transport keep-alives configurable #34014

Merged
merged 2 commits into from
Dec 16, 2022
Merged

x-pack/filebeat/input/{cel,httpjson}: make transport keep-alives configurable #34014

merged 2 commits into from
Dec 16, 2022

Conversation

efd6
Copy link
Contributor

@efd6 efd6 commented Dec 12, 2022

What does this PR do?

This makes it possible for users to configure idle connection keep-alive behaviour. The behaviour defaults to the old behaviour, but exposes the full set of httpcommon.WithKeepaliveSettings configuration options.

Why is it important?

Keep-alive behaviour can have a performance and API-limit impact in some cases.

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.

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

@efd6 efd6 added enhancement Filebeat Filebeat Team:Security-External Integrations backport-skip Skip notification from the automated backport with mergify 8.7-candidate labels Dec 12, 2022
@efd6 efd6 self-assigned this Dec 12, 2022
@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Dec 12, 2022
@efd6 efd6 marked this pull request as ready for review December 12, 2022 01:06
@efd6 efd6 requested a review from a team as a code owner December 12, 2022 01:06
@elasticmachine
Copy link
Collaborator

Pinging @elastic/security-external-integrations (Team:Security-External Integrations)

@elasticmachine
Copy link
Collaborator

elasticmachine commented Dec 12, 2022 •
edited by jenkins-beats-ci bot
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2022-12-16T05:58:39.248+0000

  • Duration: 78 min 3 sec

Test stats 🧪

Test Results
Failed 0
Passed 2552
Skipped 167
Total 2719

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@mergify

This comment was marked as outdated.

Sign in to view
@mergify

This comment was marked as outdated.

Sign in to view
@efd6
x-pack/filebeat/input/{cel,httpjson}: make transport keep-alives conf…
ab2a2c0 
…igurable

The behaviour defaults to the old behaviour, but exposes the full set of
httpcommon.WithKeepaliveSettings configuration options.
@efd6 efd6 mentioned this pull request Dec 15, 2022
Closed
@efd6

This comment was marked as outdated.

Sign in to view
@bmorelli25
Copy link
Member

@elasticmachine, run elasticsearch-ci/docs

kcreddy
kcreddy approved these changes Dec 16, 2022
View reviewed changes
Copy link
Contributor

@kcreddy kcreddy left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Minor suggestion. Rest LGTM 👍🏼

@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 4 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@efd6 efd6 merged commit 3cd8d81 into elastic:main Dec 16, 2022
@efd6 efd6 added backport-v8.6.0 Automated backport with mergify and removed backport-skip Skip notification from the automated backport with mergify labels Jan 18, 2023
@mergify mergify bot mentioned this pull request Jan 18, 2023
Merged
mergify bot pushed a commit that referenced this pull request Jan 18, 2023
@efd6 @mergify
x-pack/filebeat/input/{cel,httpjson}: make transport keep-alives conf…
8c10802 
…igurable (#34014)

The behaviour defaults to the old behaviour, but exposes the full set of
httpcommon.WithKeepaliveSettings configuration options.

(cherry picked from commit 3cd8d81)

# Conflicts:
#	x-pack/filebeat/input/cel/input.go
#	x-pack/filebeat/input/httpjson/input.go
#	x-pack/filebeat/input/httpjson/request_chain_helper.go
efd6 added a commit that referenced this pull request Jan 19, 2023
@mergify @efd6
[8.6](backport #34014) x-pack/filebeat/input/{cel,httpjson}: make tra…
41d17fd 
…nsport keep-alives configurable (#34299)

* x-pack/filebeat/input/{cel,httpjson}: make transport keep-alives configurable (#34014)

The behaviour defaults to the old behaviour, but exposes the full set of
httpcommon.WithKeepaliveSettings configuration options.

(cherry picked from commit 3cd8d81)

# Conflicts:
#	x-pack/filebeat/input/cel/input.go
#	x-pack/filebeat/input/httpjson/input.go
#	x-pack/filebeat/input/httpjson/request_chain_helper.go

* resolve conflicts

Co-authored-by: Dan Kortschak <90160302+efd6@users.noreply.github.com>
Co-authored-by: Dan Kortschak <dan.kortschak@elastic.co>
@efd6 efd6 mentioned this pull request Mar 6, 2023
Merged
6 tasks
efd6 added a commit to efd6/beats that referenced this pull request Mar 6, 2023
@efd6
x-pack/filebeat/input/httpjson: backport configurable keep-alives
b6b90d1 
This is a manual backport of elastic#34014 tailored to 7.17.

Keep-alive options are provided for both v1 and v2 HTTPJSON, so to
simplify the change the keep-alive logic is put in v2 and exported for
use by v1.
efd6 added a commit that referenced this pull request Mar 8, 2023
@efd6
x-pack/filebeat/input/httpjson: backport configurable keep-alives (#3…
022d2b0 
…4743)

This is a manual backport of #34014 tailored to 7.17.

Keep-alive options are provided for both v1 and v2 HTTPJSON, so to
simplify the change the keep-alive logic is put in v2 and exported for
use by v1.
chrisberkhout pushed a commit that referenced this pull request Jun 1, 2023
@efd6 @chrisberkhout
x-pack/filebeat/input/{cel,httpjson}: make transport keep-alives conf…
2363991 
…igurable (#34014)

The behaviour defaults to the old behaviour, but exposes the full set of
httpcommon.WithKeepaliveSettings configuration options.
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

@efd6 efd6

Labels
8.7-candidate backport-v8.6.0 Automated backport with mergify enhancement Filebeat Filebeat
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

x-pack/filebeat/input/{cel,httpjson}: make DisableKeepAlives configurable
4 participants
@efd6 @elasticmachine @bmorelli25 @kcreddy