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

[7.16](backport #28513) enhancement httpjson rate-limit early-limit #28864

Merged
merged 2 commits into from
Nov 8, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 8, 2021

This is an automatic backport of pull request #28513 done by Mergify.
Cherry-pick of c77bf19 has failed:

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

You are currently cherry-picking commit c77bf19b66.
  (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:   filebeat/docs/modules/okta.asciidoc
	modified:   x-pack/filebeat/docs/inputs/input-httpjson.asciidoc
	modified:   x-pack/filebeat/input/httpjson/internal/v2/config_request.go
	modified:   x-pack/filebeat/input/httpjson/rate_limiter_test.go
	modified:   x-pack/filebeat/module/okta/_meta/docs.asciidoc
	modified:   x-pack/filebeat/module/okta/system/config/input.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x-pack/filebeat/input/httpjson/rate_limiter.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

* #28475 enhancement filebeat httpjson rate-limit early

* #28475 okta should default to early limit to avoid violations

* adding changelog entry

* lint fix

* additional comments and tests on behavior with missing headers

* changing default okta-rate limit to 89%. adding docs in Okta module

* Re-generate okta docs

* removing unused lines from test

Co-authored-by: Marc Guasch <[email protected]>
(cherry picked from commit c77bf19)

# Conflicts:
#	x-pack/filebeat/input/httpjson/rate_limiter.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Nov 8, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Nov 8, 2021
@botelastic
Copy link

botelastic bot commented Nov 8, 2021

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

@elasticmachine
Copy link
Collaborator

elasticmachine commented Nov 8, 2021

💚 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: 2021-11-08T11:31:34.811+0000

  • Duration: 115 min 1 sec

  • Commit: fa63c58

Test stats 🧪

Test Results
Failed 0
Passed 15790
Skipped 2346
Total 18136

💚 Flaky test report

Tests succeeded.

🤖 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.

@marc-gr marc-gr merged commit 67e4340 into 7.16 Nov 8, 2021
@marc-gr marc-gr deleted the mergify/bp/7.16/pr-28513 branch November 8, 2021 13:49
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.

3 participants