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

[8.6] Alert suppression clarification (backport #3879) #3951

Merged
merged 2 commits into from
Sep 14, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 14, 2023

This is an automatic backport of pull request #3879 done by Mergify.
Cherry-pick of 16b6c65 has failed:

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

You are currently cherry-picking commit 16b6c65f.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/detections/alert-suppression.asciidoc
	both modified:   docs/detections/rules-ui-create.asciidoc

no changes added to commit (use "git add" and/or "git commit -a")

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

* Alert suppression clarification

* Review updates

* Updates note phrasing

(cherry picked from commit 16b6c65)

# Conflicts:
#	docs/detections/alert-suppression.asciidoc
#	docs/detections/rules-ui-create.asciidoc
@github-actions
Copy link

Documentation previews:

@natasha-moore-elastic natasha-moore-elastic merged commit fd8b919 into 8.6 Sep 14, 2023
@mergify mergify bot deleted the mergify/bp/8.6/pr-3879 branch September 14, 2023 10:59
acorretti pushed a commit that referenced this pull request Nov 19, 2024
* Alert suppression clarification (#3879)

* Alert suppression clarification

* Review updates

* Updates note phrasing

(cherry picked from commit 5baa89b)

# Conflicts:
#	docs/detections/alert-suppression.asciidoc
#	docs/detections/rules-ui-create.asciidoc

* Resolves conflicts

---------

Co-authored-by: natasha-moore-elastic <137783811+natasha-moore-elastic@users.noreply.github.com>
Co-authored-by: natasha-moore-elastic <natasha.moore@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant