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 organization and customer prefix for aws/cloudtrail #23126

Merged
merged 3 commits into from
Dec 15, 2020
Merged

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
62930c8
fix organization and customer prefix for aws/cloudtrail
leehinman Dec 14, 2020
256a79f
Add PR number to changele
andrewkroh Dec 15, 2020
473bc7a
simplify regex
leehinman Dec 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Convert the o365 module's `client.port` and `source.port` to numbers (from strings) in events. {pull}22939[22939]
- Fix Cisco ASA/FTD module's parsing of WebVPN log message 716002. {pull}22966[22966]
- Fix bad `network.direction` values in Fortinet/firewall fileset. {pull}23072[23072]
- Add support for organization and custom prefix in AWS/CloudTrail fileset. {issue}23109[23109] {pull}23126[23126]

*Heartbeat*

Expand Down Expand Up @@ -966,4 +967,3 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d




6 changes: 3 additions & 3 deletions x-pack/filebeat/module/aws/cloudtrail/config/s3.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ type: s3
queue_url: {{ .queue_url }}
file_selectors:
{{ if .process_cloudtrail_logs }}
- regex: '^AWSLogs/\d+/CloudTrail/'
leehinman marked this conversation as resolved.
Show resolved Hide resolved
- regex: '^.*AWSLogs/\d+/CloudTrail/'
expand_event_list_from_field: 'Records'
{{ end }}

{{ if .process_digest_logs }}
- regex: '^AWSLogs/\d+/CloudTrail-Digest/'
- regex: '^.*AWSLogs/\d+/CloudTrail-Digest/'
{{ end }}

{{ if .process_insight_logs }}
- regex: '^AWSLogs/\d+/CloudTrail-Insight/'
- regex: '^.*AWSLogs/\d+/CloudTrail-Insight/'
expand_event_list_from_field: 'Records'
{{ end }}

Expand Down