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

[Filebeat] Deprecate Gsuite module and create Google Workspace one #22950

Merged
merged 3 commits into from
Dec 14, 2020

Conversation

marc-gr
Copy link
Contributor

@marc-gr marc-gr commented Dec 7, 2020

What does this PR do?

  • Creates new module Google Workspace (copy from Gsuite but renaming any gsuite to google_workspace)
  • Adds deprecation comment on Gsuite module
  • Changes Google Workspace config to work with the new HTTPJSON config

Why is it important?

To be aligned with new Google rebranding from GSuite to Google Workspace.

To prevent users custom rules to break on the module renaming, we decided to duplicate it for a release while they migrate to the new one, instead of directly doing a rename which would be a breaking change.

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.

Related issues

@marc-gr marc-gr added enhancement review Filebeat Filebeat needs_backport PR is waiting to be backported to other branches. Team:Security-External Integrations labels Dec 7, 2020
@marc-gr marc-gr requested a review from a team December 7, 2020 09:26
@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 Dec 7, 2020
@elasticmachine
Copy link
Collaborator

elasticmachine commented Dec 7, 2020

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

  • Start Time: 2020-12-14T15:14:13.890+0000

  • Duration: 50 min 19 sec

Test stats 🧪

Test Results
Failed 0
Passed 5119
Skipped 570
Total 5689

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 5119
Skipped 570
Total 5689

@marc-gr marc-gr force-pushed the gworkspace branch 4 times, most recently from 85859aa to 109f251 Compare December 10, 2020 16:07
@andrewstucki
Copy link

@marc-gr does this incorporate the changes from the configuration recategorization into the duplicated module?

@marc-gr
Copy link
Contributor Author

marc-gr commented Dec 12, 2020

@marc-gr does this incorporate the changes from the configuration recategorization into the duplicated module?

I updated it with the changes in Gsuite 👍

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.

It's looking good to me, just a couple nits about the docs. It'll be good to have someone else looking at it, though.

@@ -12,6 +12,8 @@ This file is generated! See scripts/docs_collector.py

beta[]

*Gsuite module is deprecated and will be removed in future releases. Please use Google Workspace module instead.*
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe here we can use a deprecated::[X.Y.Z] tag (see docs)


beta[]

This is a module for ingesting data from the different Google Workspace audit reports API's.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
This is a module for ingesting data from the different Google Workspace audit reports API's.
This is a module for ingesting data from the different Google Workspace audit reports APIs.

@marc-gr marc-gr merged commit 4540460 into elastic:master Dec 14, 2020
@marc-gr marc-gr deleted the gworkspace branch December 14, 2020 16:05
@marc-gr marc-gr removed the needs_backport PR is waiting to be backported to other branches. label Dec 14, 2020
marc-gr added a commit to marc-gr/beats that referenced this pull request Dec 14, 2020
…lastic#22950)

* Deprecate Gsuite module and create Google Workspace one

* Update with latest gsuite changes

* Use deprecation tag and fix doc typo

(cherry picked from commit 4540460)
marc-gr added a commit that referenced this pull request Dec 15, 2020
…22950) (#23108)

* Deprecate Gsuite module and create Google Workspace one

* Update with latest gsuite changes

* Use deprecation tag and fix doc typo

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

[GSuite] Rename module to Google Workspace
4 participants