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] AWS CloudTrail preserve eventCategory #22805

Merged
merged 3 commits into from
Dec 10, 2020
Merged

[Filebeat] AWS CloudTrail preserve eventCategory #22805

merged 3 commits into from
Dec 10, 2020

Conversation

leehinman
Copy link
Contributor

What does this PR do?

Preserves AWS CloudTrail eventCategory and maps it to
aws.cloudtrail.event_category

Why is it important?

prevents data loss

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

TESTING_FILEBET_MODULES=aws TESTING_FILEBEAT_FILESETS=cloudtrail mage -v pythonIntegTest

Related issues

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Nov 30, 2020
@leehinman leehinman added enhancement Filebeat Filebeat needs_backport PR is waiting to be backported to other branches. Team:Security-External Integrations labels Nov 30, 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 Nov 30, 2020
@leehinman leehinman force-pushed the 22776_cloudtrail_eventCategory branch from d1f2f89 to 5dd1df0 Compare November 30, 2020 19:56
@leehinman leehinman mentioned this pull request Nov 30, 2020
Closed
@elasticmachine
Copy link
Collaborator

elasticmachine commented Nov 30, 2020 •
edited by jenkins-beats-ci bot
Loading

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

  • Start Time: 2020-12-10T02:34:49.877+0000

  • Duration: 47 min 19 sec

Test stats 🧪

Test Results
Failed 0
Passed 5096
Skipped 570
Total 5666

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 5096
Skipped 570
Total 5666

kaiyan-sheng
kaiyan-sheng approved these changes Dec 8, 2020
View reviewed changes
Copy link
Contributor

@kaiyan-sheng kaiyan-sheng left a comment

Choose a reason for hiding this comment

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

Seems like a make update is needed:

[2020-12-07T21:32:53.595Z] Error: some files are not up-to-date. Run 'make update' then review and commit the changes. Modified: [filebeat/docs/fields.asciidoc]

otherwise it looks good to me.

@leehinman leehinman force-pushed the 22776_cloudtrail_eventCategory branch from 218214d to 8fad973 Compare December 9, 2020 03:02
@leehinman leehinman force-pushed the 22776_cloudtrail_eventCategory branch from bfe7477 to 6437351 Compare December 10, 2020 02:34
@leehinman leehinman merged commit 971b95b into elastic:master Dec 10, 2020
leehinman added a commit to leehinman/beats that referenced this pull request Dec 10, 2020
@leehinman
[Filebeat] AWS CloudTrail preserve eventCategory (elastic#22805)
b5a0918 
* AWS CloudTrail preserve eventCategory

- map to aws.cloudtrail.event_category

Closes elastic#22776

(cherry picked from commit 971b95b)
@leehinman leehinman mentioned this pull request Dec 10, 2020
Merged
4 tasks
@leehinman leehinman added v7.11.0 and removed needs_backport PR is waiting to be backported to other branches. labels Dec 10, 2020
@leehinman leehinman deleted the 22776_cloudtrail_eventCategory branch December 10, 2020 03:32
leehinman added a commit that referenced this pull request Dec 10, 2020
@leehinman
[Filebeat] AWS CloudTrail preserve eventCategory (#22805) (#23051)
758e830 
* AWS CloudTrail preserve eventCategory

- map to aws.cloudtrail.event_category

Closes #22776

(cherry picked from commit 971b95b)
@leehinman leehinman mentioned this pull request Jan 7, 2021
Closed
4 tasks
leehinman added a commit to leehinman/beats that referenced this pull request Jan 7, 2021
@leehinman
[Filebeat] AWS CloudTrail preserve eventCategory (elastic#22805)
496feb0 
* AWS CloudTrail preserve eventCategory

- map to aws.cloudtrail.event_category

Closes elastic#22776

(cherry picked from commit 971b95b)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kaiyan-sheng kaiyan-sheng kaiyan-sheng approved these changes

Assignees
No one assigned
Labels
enhancement Filebeat Filebeat v7.10.2 v7.11.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Filebeat AWS CloudTrail eventName overwritten by eventCategory during ingest
3 participants
@leehinman @elasticmachine @kaiyan-sheng