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] Fix Cisco AMP rate limit and pagination. #32030

Merged
merged 7 commits into from
Jul 11, 2022
Merged

[filebeat] Fix Cisco AMP rate limit and pagination. #32030

merged 7 commits into from
Jul 11, 2022

Conversation

marc-gr
Copy link
Contributor

@marc-gr marc-gr commented Jun 22, 2022

What does this PR do?

Fixes cisco amp rate limit reset time and pagination.

Why is it important?

The module was not able to honor the rate limit reset times and ended up failing on last pages in a loop.

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.

@marc-gr marc-gr added bug Team:Security-External Integrations backport-v8.3.0 Automated backport with mergify backport-7.17 Automated backport to the 7.17 branch with mergify labels Jun 22, 2022
@marc-gr marc-gr requested a review from a team as a code owner June 22, 2022 08:45
@elasticmachine
Copy link
Collaborator

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

@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 Jun 22, 2022
@elasticmachine
Copy link
Collaborator

elasticmachine commented Jun 22, 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-07-11T11:28:15.469+0000

  • Duration: 75 min 7 sec

Test stats 🧪

Test Results
Failed 0
Passed 2142
Skipped 166
Total 2308

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

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

@marc-gr
Copy link
Contributor Author

marc-gr commented Jun 22, 2022

/test

@andrewkroh andrewkroh mentioned this pull request Jun 23, 2022
Merged
4 tasks
@mergify
Copy link
Contributor

mergify bot commented Jun 23, 2022

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 fix-cisco-amp upstream/fix-cisco-amp
git merge upstream/main
git push upstream fix-cisco-amp

@marc-gr marc-gr requested a review from andrewkroh June 23, 2022 13:06
@mergify
Copy link
Contributor

mergify bot commented Jun 27, 2022

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 fix-cisco-amp upstream/fix-cisco-amp
git merge upstream/main
git push upstream fix-cisco-amp

@marc-gr marc-gr merged commit ad685e7 into elastic:main Jul 11, 2022
@marc-gr marc-gr deleted the fix-cisco-amp branch July 11, 2022 12:46
mergify bot pushed a commit that referenced this pull request Jul 11, 2022
@marc-gr @mergify
[filebeat] Fix Cisco AMP rate limit and pagination. (#32030)
4a6732d 
* Fix Cisco AMP rate limit and pagination.

* Add pr number

* Fix RateLimit header names

* Update CHANGELOG.next.asciidoc

(cherry picked from commit ad685e7)
@mergify mergify bot mentioned this pull request Jul 11, 2022
Merged
mergify bot pushed a commit that referenced this pull request Jul 11, 2022
@marc-gr @mergify
[filebeat] Fix Cisco AMP rate limit and pagination. (#32030)
8904b52 
* Fix Cisco AMP rate limit and pagination.

* Add pr number

* Fix RateLimit header names

* Update CHANGELOG.next.asciidoc

(cherry picked from commit ad685e7)
@mergify mergify bot mentioned this pull request Jul 11, 2022
Merged
marc-gr added a commit that referenced this pull request Jul 11, 2022
@mergify @marc-gr
[filebeat] Fix Cisco AMP rate limit and pagination. (#32030) (#32302)
23f2983 
* Fix Cisco AMP rate limit and pagination.

* Add pr number

* Fix RateLimit header names

* Update CHANGELOG.next.asciidoc

(cherry picked from commit ad685e7)

Co-authored-by: Marc Guasch <marc-gr@users.noreply.github.com>
marc-gr added a commit that referenced this pull request Jul 12, 2022
@mergify @marc-gr
[7.17](backport #32030) [filebeat] Fix Cisco AMP rate limit and pagin…
c28e5cc 
…ation. (#32301)

* [filebeat] Fix Cisco AMP rate limit and pagination. (#32030)

* Fix Cisco AMP rate limit and pagination.

* Add pr number

* Fix RateLimit header names

* Update CHANGELOG.next.asciidoc

(cherry picked from commit ad685e7)

* Update CHANGELOG.next.asciidoc

Co-authored-by: Marc Guasch <marc-gr@users.noreply.github.com>
Co-authored-by: Marc Guasch <marc.guasch@elastic.co>
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
@mergify @marc-gr
[filebeat] Fix Cisco AMP rate limit and pagination. (elastic#32030) (e…
9602c45 
…lastic#32302)

* Fix Cisco AMP rate limit and pagination.

* Add pr number

* Fix RateLimit header names

* Update CHANGELOG.next.asciidoc

(cherry picked from commit e7eeb69)

Co-authored-by: Marc Guasch <marc-gr@users.noreply.github.com>
chrisberkhout pushed a commit that referenced this pull request Jun 1, 2023
@marc-gr @chrisberkhout
[filebeat] Fix Cisco AMP rate limit and pagination. (#32030)
c2909b0 
* Fix Cisco AMP rate limit and pagination.

* Add pr number

* Fix RateLimit header names

* Update CHANGELOG.next.asciidoc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andrewkroh andrewkroh andrewkroh approved these changes

Assignees

@marc-gr marc-gr

Labels
backport-7.17 Automated backport to the 7.17 branch with mergify backport-v8.3.0 Automated backport with mergify bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@marc-gr @elasticmachine @andrewkroh