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

simplify regex for org & custom prefix in aws/cloudtrail #23204

Merged
merged 1 commit into from
Dec 17, 2020

Conversation

leehinman
Copy link
Contributor

What does this PR do?

changes regex to only match on /CloudTrail/, /CloudTrail-Digest/ and
/CloudTrail-Insight/. This removes the prefix which is variable based
on custom prefix and organization.

Why is it important?

cloudtrail will work if you have custom prefix or organization. And
you will still be able to skip Digest or Insight logs if necessary.

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

Need to test in AWS with custom prefix or organization. Did test
regex against known cloudtrail filename patterns.

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

Related issues

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Dec 17, 2020
@leehinman leehinman added bug Filebeat Filebeat needs_backport PR is waiting to be backported to other branches. Team:Security-External Integrations labels Dec 17, 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 17, 2020
- only match on /CloudTrail/, /CloudTrail-Digest/ and
  /CloudTrail-Insight/, ignore variable prefix

Closes elastic#23203
Copy link
Member

@andrewkroh andrewkroh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@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 #23204 updated

  • Start Time: 2020-12-17T21:44:04.388+0000

  • Duration: 50 min 58 sec

Test stats 🧪

Test Results
Failed 0
Passed 2445
Skipped 263
Total 2708

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 2445
Skipped 263
Total 2708

@leehinman leehinman merged commit 6935dc6 into elastic:master Dec 17, 2020
@leehinman leehinman deleted the 23203_cloudtrail_ou-id branch December 17, 2020 22:48
@leehinman leehinman added v7.12.0 and removed needs_backport PR is waiting to be backported to other branches. labels Dec 17, 2020
leehinman added a commit to leehinman/beats that referenced this pull request Dec 17, 2020
- only match on /CloudTrail/, /CloudTrail-Digest/ and
  /CloudTrail-Insight/, ignore variable prefix

Closes elastic#23203

(cherry picked from commit 6935dc6)
leehinman added a commit to leehinman/beats that referenced this pull request Dec 17, 2020
- only match on /CloudTrail/, /CloudTrail-Digest/ and
  /CloudTrail-Insight/, ignore variable prefix

Closes elastic#23203

(cherry picked from commit 6935dc6)
leehinman added a commit that referenced this pull request Dec 18, 2020
…3206)

- only match on /CloudTrail/, /CloudTrail-Digest/ and
  /CloudTrail-Insight/, ignore variable prefix

Closes #23203

(cherry picked from commit 6935dc6)
leehinman added a commit that referenced this pull request Dec 18, 2020
…3207)

- only match on /CloudTrail/, /CloudTrail-Digest/ and
  /CloudTrail-Insight/, ignore variable prefix

Closes #23203

(cherry picked from commit 6935dc6)
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.

CloudTrail in AWS Module does not work when CloudTrail is enabled at Organization Level
3 participants