From 321b7ab595228723c62192b07884d9f8431b8ba8 Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Fri, 13 Dec 2024 03:24:38 +1100
Subject: [PATCH] [8.17] [Search] Add ML as required plugin to Search Assistant
 (#204009) (#204036)

# Backport

This will backport the following commits from `main` to `8.17`:
- [[Search] Add ML as required plugin to Search Assistant
(#204009)](https://github.com/elastic/kibana/pull/204009)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Sander
Philipse","email":"94373878+sphilipse@users.noreply.github.com"},"sourceCommit":{"committedDate":"2024-12-12T14:20:09Z","message":"[Search]
Add ML as required plugin to Search Assistant (#204009)\n\n##
Summary\r\n\r\nThis adds the `ml` plugin as required to the Search
Assistant so that we\r\ndon't need users to navigate to an ml-based
plugin to initiate the\r\nknowledge
base.","sha":"16d45f503a886b13b9fbc04a8cd20bb7e0f14ece","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","v9.0.0","Team:Search","backport:prev-major"],"title":"[Search]
Add ML as required plugin to Search
Assistant","number":204009,"url":"https://github.com/elastic/kibana/pull/204009","mergeCommit":{"message":"[Search]
Add ML as required plugin to Search Assistant (#204009)\n\n##
Summary\r\n\r\nThis adds the `ml` plugin as required to the Search
Assistant so that we\r\ndon't need users to navigate to an ml-based
plugin to initiate the\r\nknowledge
base.","sha":"16d45f503a886b13b9fbc04a8cd20bb7e0f14ece"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/204009","number":204009,"mergeCommit":{"message":"[Search]
Add ML as required plugin to Search Assistant (#204009)\n\n##
Summary\r\n\r\nThis adds the `ml` plugin as required to the Search
Assistant so that we\r\ndon't need users to navigate to an ml-based
plugin to initiate the\r\nknowledge
base.","sha":"16d45f503a886b13b9fbc04a8cd20bb7e0f14ece"}}]}] BACKPORT-->

Co-authored-by: Sander Philipse <94373878+sphilipse@users.noreply.github.com>
---
 x-pack/plugins/search_assistant/kibana.jsonc  | 1 +
 x-pack/plugins/serverless_search/kibana.jsonc | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/search_assistant/kibana.jsonc b/x-pack/plugins/search_assistant/kibana.jsonc
index d84d928b7a8b7..3c20e59ccc9a6 100644
--- a/x-pack/plugins/search_assistant/kibana.jsonc
+++ b/x-pack/plugins/search_assistant/kibana.jsonc
@@ -16,6 +16,7 @@
     "requiredPlugins": [
       "actions",
       "licensing",
+      "ml", // necessary for assistant's use of knowledge base in assistant package
       "observabilityAIAssistant",
       "triggersActionsUi",
       "share"
diff --git a/x-pack/plugins/serverless_search/kibana.jsonc b/x-pack/plugins/serverless_search/kibana.jsonc
index f7b404edb37b1..521d69a78d9dc 100644
--- a/x-pack/plugins/serverless_search/kibana.jsonc
+++ b/x-pack/plugins/serverless_search/kibana.jsonc
@@ -37,6 +37,8 @@
       "searchInferenceEndpoints",
       "usageCollection"
     ],
-    "requiredBundles": ["kibanaReact"]
+    "requiredBundles": [
+      "kibanaReact"
+    ]
   }
 }