github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-06-27 18:51:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

[9.0] [Search] Fix notebooks config path (#210538) (#210571)

Browse source 
# Backport

This will backport the following commits from `main` to `9.0`:
- [[Search] Fix notebooks config path
(#210538)](https://github.com/elastic/kibana/pull/210538)

<!--- 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":"2025-02-11T13:14:19Z","message":"[Search]
Fix notebooks config path (#210538)\n\n## Summary\r\n\r\nThis updates
the Search notebooks config path to fix a config conflict,\r\nnow that
the main search plugin owns `xpack.search`. This config should\r\nonly
have been used in Serverless and was never pushed to other users,\r\nbut
I've added a rename and deprecation warning just in case anyone
used\r\nit..","sha":"633fad00f945ca8ac719b1b459b25732f04e12aa","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","Team:Search","backport:version","v9.1.0"],"title":"[Search]
Fix notebooks config
path","number":210538,"url":"https://github.com/elastic/kibana/pull/210538","mergeCommit":{"message":"[Search]
Fix notebooks config path (#210538)\n\n## Summary\r\n\r\nThis updates
the Search notebooks config path to fix a config conflict,\r\nnow that
the main search plugin owns `xpack.search`. This config should\r\nonly
have been used in Serverless and was never pushed to other users,\r\nbut
I've added a rename and deprecation warning just in case anyone
used\r\nit..","sha":"633fad00f945ca8ac719b1b459b25732f04e12aa"}},"sourceBranch":"main","suggestedTargetBranches":["9.0"],"targetPullRequestStates":[{"branch":"9.0","label":"v9.0.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/210538","number":210538,"mergeCommit":{"message":"[Search]
Fix notebooks config path (#210538)\n\n## Summary\r\n\r\nThis updates
the Search notebooks config path to fix a config conflict,\r\nnow that
the main search plugin owns `xpack.search`. This config should\r\nonly
have been used in Serverless and was never pushed to other users,\r\nbut
I've added a rename and deprecation warning just in case anyone
used\r\nit..","sha":"633fad00f945ca8ac719b1b459b25732f04e12aa"}}]}]
BACKPORT-->

Co-authored-by: Sander Philipse <94373878+sphilipse@users.noreply.github.com>
This commit is contained in:
Kibana Machine 2025-02-12 02:17:04 +11:00 • committed by GitHub
parent d5e4698257
commit 9793454c47
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/serverless.es.yml
View file

@ -113,7 +113,7 @@ xpack.ml.compatibleModuleType: 'search'
data_visualizer.resultLinks.fileBeat.enabled: false
# Search Notebooks
xpack.search.notebooks.catalog.url: https://elastic-enterprise-search.s3.us-east-2.amazonaws.com/serverless/catalog.json
xpack.searchNotebooks.catalog.url: https://elastic-enterprise-search.s3.us-east-2.amazonaws.com/serverless/catalog.json
# Semantic text UI

2
config/serverless.oblt.yml
View file

@ -6,7 +6,7 @@ xpack.cloudSecurityPosture.enabled: false
xpack.infra.enabled: true
xpack.uptime.enabled: true
xpack.securitySolution.enabled: false
xpack.search.notebooks.enabled: false
xpack.searchNotebooks.enabled: false
xpack.searchPlayground.enabled: false
xpack.searchInferenceEndpoints.enabled: false
xpack.searchIndices.enabled: false

2
config/serverless.security.yml
View file

@ -7,7 +7,7 @@ xpack.infra.enabled: false
xpack.observabilityLogsExplorer.enabled: false
xpack.observability.enabled: false
xpack.observabilityAIAssistant.enabled: false
xpack.search.notebooks.enabled: false
xpack.searchNotebooks.enabled: false
xpack.searchPlayground.enabled: false
xpack.searchInferenceEndpoints.enabled: false
xpack.inventory.enabled: false

3
x-pack/solutions/search/plugins/search_notebooks/kibana.jsonc
View file

@ -11,8 +11,7 @@
"browser": true,
"configPath": [
"xpack",
"search",
"notebooks"
"searchNotebooks"
],
"requiredPlugins": [
"console"

3
x-pack/solutions/search/plugins/search_notebooks/server/config.ts
View file

@ -24,6 +24,9 @@ const configSchema = schema.object({
type SearchNotebooksSchema = TypeOf<typeof configSchema>;
export const config: PluginConfigDescriptor<SearchNotebooksSchema> = {
deprecations: ({ renameFromRoot }) => [
renameFromRoot('xpack.search.notebooks', 'xpack.searchNotebooks', { level: 'critical' }),
],
schema: configSchema,
};