Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 12, 2024

Fixes #6003 with a fresh PR to manage merge conflicts. Content was already reviewed/approved in #6013.

Preview: Attack discovery (ESS) (Serverless).


This is an automatic backport of pull request #6114 done by Mergify.

* AD updates for 8.16

* Updates serverless docs

* Minor tweak for charles' feedback

* Fix icon image refs

* fixes outdated refs to AD page

* fixes timeline ref

* Apply suggestions from code review

Incorporates Nastasha's review

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

---------

Co-authored-by: Nastasha Solomon <79124755+nastasha-solomon@users.noreply.github.com>
(cherry picked from commit 88103ce)

# Conflicts:
#	docs/AI-for-security/attack-discovery.asciidoc
#	docs/serverless/AI-for-security/ai-assistant-alert-triage.asciidoc
#	docs/serverless/AI-for-security/ai-for-security-landing-pg.asciidoc
#	docs/serverless/AI-for-security/attack-discovery.asciidoc
#	docs/serverless/AI-for-security/connect-to-byo-llm.asciidoc
#	docs/serverless/AI-for-security/images/attck-disc-11-alerts-disc.png
#	docs/serverless/AI-for-security/llm-connector-guides.asciidoc
#	docs/serverless/AI-for-security/llm-performance-matrix.asciidoc
#	docs/serverless/AI-for-security/usecase-attack-disc-ai-assistant-incident-reporting.asciidoc
@mergify
Copy link
Contributor Author

mergify bot commented Nov 12, 2024

Cherry-pick of 88103ce has failed:

On branch mergify/bp/8.x/pr-6114
Your branch is up to date with 'origin/8.x'.

You are currently cherry-picking commit 88103ce2.
  (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/AI-for-security/images/add-discovery-to-assistant.gif
	modified:   docs/AI-for-security/images/attck-disc-11-alerts-disc.png
	new file:   docs/AI-for-security/images/attck-disc-alerts-number-menu.png
	new file:   docs/AI-for-security/images/attck-disc-example-disc.png
	new file:   docs/AI-for-security/images/attck-disc-rbac.png
	new file:   docs/AI-for-security/images/attck-disc-select-model-empty.png
	modified:   docs/AI-for-security/usecase-alert-triage.asciidoc
	new file:   docs/serverless/AI-for-security/images/add-discovery-to-assistant.gif
	new file:   docs/serverless/AI-for-security/images/attck-disc-example-disc.png
	new file:   docs/serverless/AI-for-security/images/attck-disc-rbac.png
	new file:   docs/serverless/AI-for-security/images/attck-disc-select-model-empty.png

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   docs/AI-for-security/attack-discovery.asciidoc
	deleted by us:   docs/serverless/AI-for-security/ai-assistant-alert-triage.asciidoc
	deleted by us:   docs/serverless/AI-for-security/ai-for-security-landing-pg.asciidoc
	deleted by us:   docs/serverless/AI-for-security/attack-discovery.asciidoc
	deleted by us:   docs/serverless/AI-for-security/connect-to-byo-llm.asciidoc
	deleted by us:   docs/serverless/AI-for-security/images/attck-disc-11-alerts-disc.png
	deleted by us:   docs/serverless/AI-for-security/llm-connector-guides.asciidoc
	deleted by us:   docs/serverless/AI-for-security/llm-performance-matrix.asciidoc
	deleted by us:   docs/serverless/AI-for-security/usecase-attack-disc-ai-assistant-incident-reporting.asciidoc

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

@github-actions
Copy link

A documentation preview will be available soon.

Request a new doc build by commenting
  • Rebuild this PR: run docs-build
  • Rebuild this PR and all Elastic docs: run docs-build rebuild

run docs-build is much faster than run docs-build rebuild. A rebuild should only be needed in rare situations.

If your PR continues to fail for an unknown reason, the doc build pipeline may be broken. Elastic employees can check the pipeline status here.

@mergify mergify bot requested a review from a team as a code owner November 12, 2024 04:36
@benironside
Copy link
Contributor

run docs-build

@benironside benironside enabled auto-merge (squash) November 12, 2024 07:58
@benironside benironside merged commit 8ab182a into 8.x Nov 12, 2024
4 checks passed
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