Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Aug 25, 2022

This is an automatic backport of pull request #2069 done by Mergify.
Cherry-pick of 953f781 has failed:

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

You are currently cherry-picking commit 953f781.
  (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/api/rules/rules-api-create.asciidoc
	modified:   docs/detections/api/rules/rules-api-find.asciidoc
	modified:   docs/detections/api/rules/rules-api-get.asciidoc
	modified:   docs/detections/api/rules/rules-api-update.asciidoc
	new file:   docs/detections/images/rule-details-prerequisites.png
	new file:   docs/detections/images/rules-table-related-integrations.png
	modified:   docs/detections/rules-ui-manage.asciidoc
	modified:   docs/getting-started/advanced-setting.asciidoc
	modified:   docs/release-notes/8.3.asciidoc

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/detections/api/rules/rules-api-bulk-actions.asciidoc
	both modified:   docs/detections/images/all-rules.png
	both modified:   docs/detections/images/monitor-table.png

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

…red Fields, and Setup (#2069)

* Add new section to Advanced Settings

* Update page's mini-TOC

* Re-adds RNs for 132409 and 131475

* Revise advanced setting description

* Create new section for related integrations etc.

Includes placeholder image syntax, commented out

* Add fields to API response examples

* Update release notes

* Add new section to What's New

Includes placeholder image syntax, commented out

* Additional revisions

* Complete main documentation

Add and update screenshots
Revise explanatory text

* Update release notes and What's New

* Revert changes to whats-new.asciidoc

What's new 8.3 will be updated in PR security-docs#2327

* Update per new nav UI

* Apply suggestions from Nastasha's review

Co-authored-by: nastasha-solomon <79124755+nastasha-solomon@users.noreply.github.com>

* Apply suggestions from Ben's review

* Update docs/release-notes/8.3.asciidoc

Co-authored-by: nastasha.solomon <nastasha.solomon@elastic.co>
Co-authored-by: nastasha-solomon <79124755+nastasha-solomon@users.noreply.github.com>
(cherry picked from commit 953f781)

# Conflicts:
#	docs/detections/api/rules/rules-api-bulk-actions.asciidoc
#	docs/detections/images/all-rules.png
#	docs/detections/images/monitor-table.png
Hopefully this resolves merge conflict
@joepeeples
Copy link
Contributor

@Mergifyio refresh

@mergify
Copy link
Contributor Author

mergify bot commented Aug 25, 2022

refresh

✅ Pull request refreshed

@joepeeples joepeeples merged commit b81d3de into 8.3 Aug 25, 2022
@mergify mergify bot deleted the mergify/bp/8.3/pr-2069 branch August 25, 2022 15:56
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.

2 participants