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

[Filebeat] fix organization and customer prefix for aws/cloudtrail #23126

Merged
merged 3 commits into from
Dec 15, 2020

Conversation

leehinman
Copy link
Contributor

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

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

Closes elastic#23109
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Dec 14, 2020
@leehinman leehinman added bug Filebeat Filebeat needs_backport PR is waiting to be backported to other branches. Team:Security-External Integrations labels Dec 14, 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 14, 2020
@elasticmachine
Copy link
Collaborator

elasticmachine commented Dec 14, 2020

💚 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 #23126 updated

  • Start Time: 2020-12-15T04:03:18.571+0000

  • Duration: 48 min 46 sec

Test stats 🧪

Test Results
Failed 0
Passed 2447
Skipped 261
Total 2708

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 2447
Skipped 261
Total 2708

CHANGELOG.next.asciidoc Outdated Show resolved Hide resolved
@leehinman leehinman merged commit b4aba8e into elastic:master Dec 15, 2020
leehinman added a commit to leehinman/beats that referenced this pull request Dec 15, 2020
…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)
@leehinman leehinman added v7.11.0 and removed needs_backport PR is waiting to be backported to other branches. labels Dec 15, 2020
@leehinman leehinman deleted the 23109_cloudtrail_custom_prefix branch December 15, 2020 05:02
leehinman added a commit that referenced this pull request Dec 15, 2020
…23126) (#23138)

* 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 #23109

Co-authored-by: Andrew Kroh <andrew.kroh@elastic.co>
(cherry picked from commit b4aba8e)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Filebeat skips ingesting CloudTrail logs that aren't in S3 bucket root
3 participants