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 #23204 to 7.x: simplify regex for org & custom prefix in aws/cloudtrail #23206

Merged
merged 1 commit into from
Dec 18, 2020

Conversation

leehinman
Copy link
Contributor

@leehinman leehinman commented Dec 17, 2020

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

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

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

Closes elastic#23203

(cherry picked from commit 6935dc6)
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label 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
@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 #23206 opened

  • Start Time: 2020-12-17T22:51:20.368+0000

  • Duration: 48 min 10 sec

Test stats 🧪

Test Results
Failed 0
Passed 2436
Skipped 263
Total 2699

Steps errors 1

Expand to view the steps failures

x-pack/filebeat-build - Install Go/Mage/Python/Docker/Terraform 1.14.12
  • Took 1 min 32 sec . View more details on here
  • Description: .ci/scripts/install-tools.sh

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 2436
Skipped 263
Total 2699

@leehinman leehinman merged commit 86bc1a0 into elastic:7.x Dec 18, 2020
@leehinman leehinman deleted the backport_23204_7.x branch December 18, 2020 20:28
@zube zube bot removed the [zube]: Done label Mar 19, 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