Skip to content

[7.14] [DOCS] Fix links to the Filebeat Google Workspace module (backport #1441) #1449

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

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 26, 2022

This is an automatic backport of pull request #1441 done by Mergify.
Cherry-pick of 325d401 has failed:

On branch mergify/bp/7.14/pr-1441
Your branch is up to date with 'origin/7.14'.

You are currently cherry-picking commit 325d401.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   docs/detections/prebuilt-rules/downloadable-packages/0-13-3/prebuilt-rule-0-13-3-google-workspace-mfa-enforcement-disabled.asciidoc
	modified:   docs/detections/prebuilt-rules/downloadable-packages/0-13-3/prebuilt-rule-0-13-3-google-workspace-password-policy-modified.asciidoc
	modified:   docs/detections/prebuilt-rules/downloadable-packages/0-13-3/prebuilt-rule-0-13-3-mfa-disabled-for-google-workspace-organization.asciidoc
	modified:   docs/detections/prebuilt-rules/downloadable-packages/0-14-1/prebuilt-rule-0-14-1-application-added-to-google-workspace-domain.asciidoc
	modified:   docs/detections/prebuilt-rules/downloadable-packages/0-14-1/prebuilt-rule-0-14-1-domain-added-to-google-workspace-trusted-domains.asciidoc
	modified:   docs/detections/prebuilt-rules/downloadable-packages/0-14-1/prebuilt-rule-0-14-1-google-workspace-admin-role-assigned-to-a-user.asciidoc
	modified:   docs/detections/prebuilt-rules/downloadable-packages/0-14-1/prebuilt-rule-0-14-1-google-workspace-admin-role-deletion.asciidoc
	modified:   docs/detections/prebuilt-rules/downloadable-packages/0-14-1/prebuilt-rule-0-14-1-google-workspace-api-access-granted-via-domain-wide-delegation-of-authority.asciidoc
	modified:   docs/detections/prebuilt-rules/downloadable-packages/0-14-1/prebuilt-rule-0-14-1-google-workspace-custom-admin-role-created.asciidoc
	modified:   docs/detections/prebuilt-rules/downloadable-packages/0-14-1/prebuilt-rule-0-14-1-google-workspace-mfa-enforcement-disabled.asciidoc
	modified:   docs/detections/prebuilt-rules/downloadable-packages/0-14-1/prebuilt-rule-0-14-1-google-workspace-password-policy-modified.asciidoc
	modified:   docs/detections/prebuilt-rules/downloadable-packages/0-14-1/prebuilt-rule-0-14-1-google-workspace-role-modified.asciidoc
	modified:   docs/detections/prebuilt-rules/downloadable-packages/0-14-1/prebuilt-rule-0-14-1-mfa-disabled-for-google-workspace-organization.asciidoc

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/detections/prebuilt-rules/rule-details/application-added-to-google-workspace-domain.asciidoc
	both modified:   docs/detections/prebuilt-rules/rule-details/domain-added-to-google-workspace-trusted-domains.asciidoc
	both modified:   docs/detections/prebuilt-rules/rule-details/google-workspace-admin-role-assigned-to-a-user.asciidoc
	both modified:   docs/detections/prebuilt-rules/rule-details/google-workspace-admin-role-deletion.asciidoc
	both modified:   docs/detections/prebuilt-rules/rule-details/google-workspace-api-access-granted-via-domain-wide-delegation-of-authority.asciidoc
	both modified:   docs/detections/prebuilt-rules/rule-details/google-workspace-custom-admin-role-created.asciidoc
	both modified:   docs/detections/prebuilt-rules/rule-details/google-workspace-mfa-enforcement-disabled.asciidoc
	both modified:   docs/detections/prebuilt-rules/rule-details/google-workspace-password-policy-modified.asciidoc
	both modified:   docs/detections/prebuilt-rules/rule-details/google-workspace-role-modified.asciidoc
	both modified:   docs/detections/prebuilt-rules/rule-details/mfa-disabled-for-google-workspace-organization.asciidoc

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Updates links to the [Filebeat Google Workspace module](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-module-gsuite.html) so they don't break when we change the current Stack version to 8.0.

Relates to elastic/docs#2312

(cherry picked from commit 325d401)

# Conflicts:
#	docs/detections/prebuilt-rules/rule-details/application-added-to-google-workspace-domain.asciidoc
#	docs/detections/prebuilt-rules/rule-details/domain-added-to-google-workspace-trusted-domains.asciidoc
#	docs/detections/prebuilt-rules/rule-details/google-workspace-admin-role-assigned-to-a-user.asciidoc
#	docs/detections/prebuilt-rules/rule-details/google-workspace-admin-role-deletion.asciidoc
#	docs/detections/prebuilt-rules/rule-details/google-workspace-api-access-granted-via-domain-wide-delegation-of-authority.asciidoc
#	docs/detections/prebuilt-rules/rule-details/google-workspace-custom-admin-role-created.asciidoc
#	docs/detections/prebuilt-rules/rule-details/google-workspace-mfa-enforcement-disabled.asciidoc
#	docs/detections/prebuilt-rules/rule-details/google-workspace-password-policy-modified.asciidoc
#	docs/detections/prebuilt-rules/rule-details/google-workspace-role-modified.asciidoc
#	docs/detections/prebuilt-rules/rule-details/mfa-disabled-for-google-workspace-organization.asciidoc
@jmikell821
Copy link
Contributor

This is being fixed in #1459. Closing.

@jmikell821 jmikell821 closed this Jan 27, 2022
@mergify mergify bot deleted the mergify/bp/7.14/pr-1441 branch January 27, 2022 18:28
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.

2 participants