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

[ECS][Filebeat] Gsuite/Google Workspace ECS 1.8 #23709

Merged
merged 2 commits into from
Feb 4, 2021
Merged

[ECS][Filebeat] Gsuite/Google Workspace ECS 1.8 #23709

merged 2 commits into from
Feb 4, 2021

Conversation

marc-gr
Copy link
Contributor

@marc-gr marc-gr commented Jan 27, 2021

What does this PR do?

Add multiuser and new categories to gsuite and google_workspace modules

Why is it important?

Keep the modules up to date with ECS 1.8 changes

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.

@marc-gr marc-gr requested a review from a team January 27, 2021 11:42
@elasticmachine
Copy link
Collaborator

Pinging @elastic/security-external-integrations (Team:Security-External Integrations)

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Jan 27, 2021
@marc-gr marc-gr requested a review from adriansr January 27, 2021 11:42
@marc-gr marc-gr mentioned this pull request Jan 27, 2021
Closed
89 tasks
@marc-gr marc-gr requested review from a team as code owners January 27, 2021 12:34
andrewkroh
andrewkroh reviewed Feb 2, 2021
View reviewed changes
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.

Does this include changes from other open PRs that it's dependent upon?

@andrewkroh
Copy link
Member

The changes in 1f3e733c8ad8975e7f4443809fdcbaa683621683 LGTM.

@elasticmachine
Copy link
Collaborator

elasticmachine commented Feb 3, 2021 •
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 #23709 updated

    • Start Time: 2021-02-04T08:18:37.604+0000

  • Duration: 48 min 38 sec

  • Commit: 8df299a

Test stats 🧪

Test Results
Failed 0
Passed 6786
Skipped 1049
Total 7835

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 6786
Skipped 1049
Total 7835

@marc-gr
Copy link
Contributor Author

marc-gr commented Feb 3, 2021

Does this include changes from other open PRs that it's dependent upon?

had to rebase the feature branch

adriansr
adriansr approved these changes Feb 3, 2021
View reviewed changes
Copy link
Contributor

@adriansr adriansr left a comment

Choose a reason for hiding this comment

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

LGTM.

We can ignore the PR numbers in CHANGELOG for now and adjust them before merging the ecs 1.8 branch.

CHANGELOG.next.asciidoc Outdated Show resolved Hide resolved
@marc-gr @adriansr
Update CHANGELOG.next.asciidoc
8df299a 
Co-authored-by: Adrian Serrano <adrisr83@gmail.com>
@marc-gr marc-gr merged commit 0d45c3f into elastic:feature-ecs-1.8 Feb 4, 2021
@marc-gr marc-gr deleted the gsuite-ecs-1.8 branch February 4, 2021 09:06
@adriansr adriansr mentioned this pull request Feb 12, 2021
Merged
28 tasks
adriansr added a commit that referenced this pull request Feb 16, 2021
@adriansr @marc-gr
Update Beats to ECS 1.8.0 (#23465)
048c3cc 
Incorporates ECS 1.8 changes from the following PRs:

Support host.type field in add_host_metadata processor and Auditbeat's system/host #23513

Winlogbeat #23563

Auditbeat auditd #23594

Journalbeat #23737

Packetbeat #23783

Filebeat:
    auditd #23723
    cisco #23819
    cef #23832
    crowdstrike falcon #23875
    fortinet firewall #23902
    microsoft #23897
    elasticsearch/audit #24000
    Gsuite/Workspace #23709
    o365 #23896
    zoom #23904
    okta #23929
    aws/cloudtrail #23911
    aws/s3access #23920
    azure #23927
    juniper/srx #23936
    panw #23931
    sophos/xg #23967
    system/auth #23961
    mysqlenterprise #23978
    zeek #23847

Make all Beats and modules report ECS 1.8.0 #23992

Closes #23118

Co-authored-by: Marc Guasch <marc-gr@users.noreply.github.com>
@adriansr adriansr mentioned this pull request Feb 16, 2021
Merged
28 tasks
adriansr added a commit to adriansr/beats that referenced this pull request Feb 17, 2021
@adriansr
Update Beats to ECS 1.8.0 (elastic#23465)
5ca7510 
Incorporates ECS 1.8 changes from the following PRs:

Support host.type field in add_host_metadata processor and Auditbeat's system/host elastic#23513

Winlogbeat elastic#23563

Auditbeat auditd elastic#23594

Journalbeat elastic#23737

Packetbeat elastic#23783

Filebeat:
    auditd elastic#23723
    cisco elastic#23819
    cef elastic#23832
    crowdstrike falcon elastic#23875
    fortinet firewall elastic#23902
    microsoft elastic#23897
    elasticsearch/audit elastic#24000
    Gsuite/Workspace elastic#23709
    o365 elastic#23896
    zoom elastic#23904
    okta elastic#23929
    aws/cloudtrail elastic#23911
    aws/s3access elastic#23920
    azure elastic#23927
    juniper/srx elastic#23936
    panw elastic#23931
    sophos/xg elastic#23967
    system/auth elastic#23961
    mysqlenterprise elastic#23978
    zeek elastic#23847

Make all Beats and modules report ECS 1.8.0 elastic#23992

Closes elastic#23118

Co-authored-by: Marc Guasch <marc-gr@users.noreply.github.com>
(cherry picked from commit 048c3cc)
adriansr added a commit that referenced this pull request Feb 17, 2021
@adriansr
Cherry-pick #23465 to 7.x: Update Beats to ECS 1.8.0 (#24072)
9d1db61 
Incorporates ECS 1.8 changes from the following PRs:

Support host.type field in add_host_metadata processor and Auditbeat's system/host #23513

Winlogbeat #23563

Auditbeat auditd #23594

Journalbeat #23737

Packetbeat #23783

Filebeat:
    auditd #23723
    cisco #23819
    cef #23832
    crowdstrike falcon #23875
    fortinet firewall #23902
    microsoft #23897
    elasticsearch/audit #24000
    Gsuite/Workspace #23709
    o365 #23896
    zoom #23904
    okta #23929
    aws/cloudtrail #23911
    aws/s3access #23920
    azure #23927
    juniper/srx #23936
    panw #23931
    sophos/xg #23967
    system/auth #23961
    mysqlenterprise #23978
    zeek #23847

Make all Beats and modules report ECS 1.8.0 #23992

Closes #23118

Co-authored-by: Marc Guasch <marc-gr@users.noreply.github.com>

(cherry picked from commit 048c3cc)
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
@marc-gr @adriansr
[ECS][Filebeat] Gsuite/Google Workspace ECS 1.8 (elastic#23709)
5dcbfa6 
* Add new ECS user and categories features to google_workspace/gsuite

* Update CHANGELOG.next.asciidoc

Co-authored-by: Adrian Serrano <adrisr83@gmail.com>

Co-authored-by: Adrian Serrano <adrisr83@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adriansr adriansr adriansr approved these changes

@andrewkroh andrewkroh Awaiting requested review from andrewkroh

Assignees
No one assigned
Labels
ecs enhancement Filebeat Filebeat
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@marc-gr @elasticmachine @andrewkroh @adriansr