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

Cherry-pick #23126 to 7.x: [Filebeat] fix organization and customer prefix for aws/cloudtrail #23138

Merged
merged 1 commit into from
Dec 15, 2020

Conversation

leehinman
Copy link
Contributor

@leehinman leehinman commented Dec 15, 2020

Cherry-pick of PR #23126 to 7.x branch. Original message:

What does this PR do?

Changes regex used to detect CloudTrail logs from "^AWSLogs" to "^.*AWSLogs".

Why is it important?

AWS CloudTrail allows you define a custom prefix and uses a standard
prefix for organizations. This change matches those conditions
automatically.

  • custom-prefix/AWSLogs/1234567890/CloudTrail/
  • o-xxxxxxx/AWSLogs/1234567890/CloudTrail/
  • AWSLogs/1234567890/CloudTrail/

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.

How to test this PR locally

Setup CloudTrail with a custom prefix

Related issues

…lastic#23126)

* fix organization and customer prefix for aws/cloudtrail

- use ^.*AWSLogs as beginning of prefix, matches:
  + custom-prefix/AWSLogs/1234567890/CloudTrail/
  + o-xxxxxxx/AWSLogs/1234567890/CloudTrail/
  + AWSLogs/1234567890/CloudTrail/

Closes elastic#23109

Co-authored-by: Andrew Kroh <andrew.kroh@elastic.co>
(cherry picked from commit b4aba8e)
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Dec 15, 2020
@elasticmachine
Copy link
Collaborator

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

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Dec 15, 2020
@elasticmachine
Copy link
Collaborator

💚 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

Expand to view the summary

Build stats

  • Build Cause: Pull request #23138 opened

  • Start Time: 2020-12-15T05:01:44.077+0000

  • Duration: 62 min 9 sec

Test stats 🧪

Test Results
Failed 0
Passed 2417
Skipped 261
Total 2678

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 2417
Skipped 261
Total 2678

@leehinman leehinman merged commit 97d9aad into elastic:7.x Dec 15, 2020
@leehinman leehinman deleted the backport_23126_7.x branch December 15, 2020 14:13
@zube zube bot removed the [zube]: Done label Mar 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants