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.6](backport #34014) x-pack/filebeat/input/{cel,httpjson}: make transport keep-alives configurable #34299

Merged
merged 2 commits into from
Jan 19, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 18, 2023

This is an automatic backport of pull request #34014 done by Mergify.
Cherry-pick of 3cd8d81 has failed:

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

You are currently cherry-picking commit 3cd8d811d6.
  (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
	modified:   x-pack/filebeat/docs/inputs/input-cel.asciidoc
	modified:   x-pack/filebeat/docs/inputs/input-httpjson.asciidoc
	modified:   x-pack/filebeat/input/cel/config.go
	modified:   x-pack/filebeat/input/cel/config_test.go
	modified:   x-pack/filebeat/input/httpjson/config_request.go
	modified:   x-pack/filebeat/input/httpjson/config_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x-pack/filebeat/input/cel/input.go
	both modified:   x-pack/filebeat/input/httpjson/input.go
	both modified:   x-pack/filebeat/input/httpjson/request_chain_helper.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…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
@mergify mergify bot requested review from a team as code owners January 18, 2023 04:21
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jan 18, 2023
@mergify mergify bot requested review from faec and leehinman and removed request for a team January 18, 2023 04:21
@mergify mergify bot assigned efd6 Jan 18, 2023
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jan 18, 2023
@botelastic
Copy link

botelastic bot commented Jan 18, 2023

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

@elasticmachine
Copy link
Collaborator

elasticmachine commented Jan 18, 2023

💚 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: 2023-01-18T23:16:05.396+0000

  • Duration: 75 min 6 sec

Test stats 🧪

Test Results
Failed 0
Passed 2552
Skipped 168
Total 2720

💚 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!)

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.

2 participants