Skip to content

Commit 3d2c140

Browse files
spongspong
committed
Merge branch 'main' of github.com:elastic/kibana into kb-tools
2 parents d38107d + 9ed2865 commit 3d2c140

487 files changed

Lines changed: 29575 additions & 3469 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.buildkite/ftr_configs.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,7 @@ enabled:
405405
- x-pack/test/spaces_api_integration/security_and_spaces/config_trial.ts
406406
- x-pack/test/spaces_api_integration/security_and_spaces/copy_to_space_config_trial.ts
407407
- x-pack/test/spaces_api_integration/spaces_only/config.ts
408+
- x-pack/test/task_manager_claimer_mget/config.ts
408409
- x-pack/test/ui_capabilities/security_and_spaces/config.ts
409410
- x-pack/test/ui_capabilities/spaces_only/config.ts
410411
- x-pack/test/upgrade_assistant_integration/config.js

‎.eslintrc.js‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,6 +1004,29 @@ module.exports = {
10041004
},
10051005
},
10061006

1007+
/**
1008+
* Integration assistant overrides
1009+
*/
1010+
{
1011+
// front end and common typescript and javascript files only
1012+
files: [
1013+
'x-pack/plugins/integration_assistant/public/**/*.{js,mjs,ts,tsx}',
1014+
'x-pack/plugins/integration_assistant/common/**/*.{js,mjs,ts,tsx}',
1015+
],
1016+
rules: {
1017+
'import/no-nodejs-modules': 'error',
1018+
'no-duplicate-imports': 'off',
1019+
'@typescript-eslint/no-duplicate-imports': 'error',
1020+
'no-restricted-imports': [
1021+
'error',
1022+
{
1023+
// prevents UI code from importing server side code and then webpack including it when doing builds
1024+
patterns: ['**/server/*'],
1025+
},
1026+
],
1027+
},
1028+
},
1029+
10071030
/**
10081031
* ML overrides
10091032
*/
@@ -1068,6 +1091,7 @@ module.exports = {
10681091
files: [
10691092
'x-pack/plugins/ecs_data_quality_dashboard/**/*.{ts,tsx}',
10701093
'x-pack/plugins/elastic_assistant/**/*.{ts,tsx}',
1094+
'x-pack/plugins/integration_assistant/**/*.{ts,tsx}',
10711095
'x-pack/packages/kbn-elastic-assistant/**/*.{ts,tsx}',
10721096
'x-pack/packages/kbn-elastic-assistant-common/**/*.{ts,tsx}',
10731097
'x-pack/packages/kbn-langchain/**/*.{ts,tsx}',
@@ -1082,6 +1106,7 @@ module.exports = {
10821106
excludedFiles: [
10831107
'x-pack/plugins/ecs_data_quality_dashboard/**/*.{test,mock,test_helper}.{ts,tsx}',
10841108
'x-pack/plugins/elastic_assistant/**/*.{test,mock,test_helper}.{ts,tsx}',
1109+
'x-pack/plugins/integration_assistant/**/*.{test,mock,test_helper}.{ts,tsx}',
10851110
'x-pack/packages/kbn-elastic-assistant/**/*.{test,mock,test_helper}.{ts,tsx}',
10861111
'x-pack/packages/kbn-elastic-assistant-common/**/*.{test,mock,test_helper}.{ts,tsx}',
10871112
'x-pack/packages/kbn-langchain/**/*.{test,mock,test_helper}.{ts,tsx}',
@@ -1102,6 +1127,7 @@ module.exports = {
11021127
files: [
11031128
'x-pack/plugins/ecs_data_quality_dashboard/**/*.{ts,tsx}',
11041129
'x-pack/plugins/elastic_assistant/**/*.{ts,tsx}',
1130+
'x-pack/plugins/integration_assistant/**/*.{ts,tsx}',
11051131
'x-pack/packages/kbn-elastic-assistant/**/*.{ts,tsx}',
11061132
'x-pack/packages/kbn-elastic-assistant-common/**/*.{ts,tsx}',
11071133
'x-pack/packages/kbn-langchain/**/*.{ts,tsx}',
@@ -1141,6 +1167,7 @@ module.exports = {
11411167
files: [
11421168
'x-pack/plugins/ecs_data_quality_dashboard/**/*.{js,mjs,ts,tsx}',
11431169
'x-pack/plugins/elastic_assistant/**/*.{js,mjs,ts,tsx}',
1170+
'x-pack/plugins/integration_assistant/**/*.{js,mjs,ts,tsx}',
11441171
'x-pack/packages/kbn-elastic-assistant/**/*.{js,mjs,ts,tsx}',
11451172
'x-pack/packages/kbn-elastic-assistant-common/**/*.{js,mjs,ts,tsx}',
11461173
'x-pack/packages/kbn-langchain/**/*.{js,mjs,ts,tsx}',

‎.github/CODEOWNERS‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -503,6 +503,7 @@ x-pack/plugins/observability_solution/infra @elastic/obs-ux-logs-team @elastic/o
503503
x-pack/plugins/ingest_pipelines @elastic/kibana-management
504504
src/plugins/input_control_vis @elastic/kibana-presentation
505505
src/plugins/inspector @elastic/kibana-presentation
506+
x-pack/plugins/integration_assistant @elastic/security-solution
506507
src/plugins/interactive_setup @elastic/kibana-security
507508
test/interactive_setup_api_integration/plugins/test_endpoints @elastic/kibana-security
508509
packages/kbn-interpreter @elastic/kibana-visualizations
@@ -695,6 +696,7 @@ x-pack/plugins/runtime_fields @elastic/kibana-management
695696
packages/kbn-safer-lodash-set @elastic/kibana-security
696697
x-pack/test/security_api_integration/plugins/saml_provider @elastic/kibana-security
697698
x-pack/test/plugin_api_integration/plugins/sample_task_plugin @elastic/response-ops
699+
x-pack/test/task_manager_claimer_mget/plugins/sample_task_plugin_mget @elastic/response-ops
698700
test/plugin_functional/plugins/saved_object_export_transforms @elastic/kibana-core
699701
test/plugin_functional/plugins/saved_object_import_warnings @elastic/kibana-core
700702
x-pack/test/saved_object_api_integration/common/plugins/saved_object_test_plugin @elastic/kibana-security
@@ -717,6 +719,7 @@ x-pack/plugins/search_connectors @elastic/search-kibana
717719
packages/kbn-search-errors @elastic/kibana-data-discovery
718720
examples/search_examples @elastic/kibana-data-discovery
719721
packages/kbn-search-index-documents @elastic/search-kibana
722+
x-pack/plugins/search_inference_endpoints @elastic/search-kibana
720723
x-pack/plugins/search_notebooks @elastic/search-kibana
721724
x-pack/plugins/search_playground @elastic/search-kibana
722725
packages/kbn-search-response-warnings @elastic/kibana-data-discovery
@@ -1325,6 +1328,7 @@ x-pack/plugins/cloud_integrations/cloud_full_story/server/config.ts @elastic/kib
13251328
/x-pack/test/alerting_api_integration/observability @elastic/obs-ux-management-team
13261329
/x-pack/test/plugin_api_integration/test_suites/task_manager/ @elastic/response-ops
13271330
/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/ @elastic/response-ops
1331+
/x-pack/test/task_manager_claimer_mget/ @elastic/response-ops
13281332
/docs/user/alerting/ @elastic/response-ops
13291333
/docs/management/connectors/ @elastic/response-ops
13301334
/x-pack/test/cases_api_integration/ @elastic/response-ops

‎config/serverless.es.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,8 @@ data_visualizer.resultLinks.fileBeat.enabled: false
6464
# Search Playground
6565
xpack.searchPlayground.ui.enabled: true
6666

67+
# Search InferenceEndpoints
68+
xpack.searchInferenceEndpoints.ui.enabled: false
69+
6770
# Search Notebooks
6871
xpack.search.notebooks.catalog.url: https://elastic-enterprise-search.s3.us-east-2.amazonaws.com/serverless/catalog.json

‎docs/developer/plugin-list.asciidoc‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -638,6 +638,10 @@ the infrastructure monitoring use-case within Kibana.
638638
|The ingest_pipelines plugin provides Kibana support for Elasticsearch's ingest pipelines.
639639
640640
641+
|{kib-repo}blob/{branch}/x-pack/plugins/integration_assistant/README.md[integrationAssistant]
642+
|Team owner: Security Integrations Scalability
643+
644+
641645
|{kib-repo}blob/{branch}/x-pack/plugins/observability_solution/investigate/README.md[investigate]
642646
|undefined
643647
@@ -785,6 +789,10 @@ It uses Chromium and Puppeteer underneath to run the browser in headless mode.
785789
|This plugin contains common assets and endpoints for the use of connectors in Kibana. Primarily used by the enterprise_search and serverless_search plugins.
786790
787791
792+
|{kib-repo}blob/{branch}/x-pack/plugins/search_inference_endpoints/README.md[searchInferenceEndpoints]
793+
|The Inference Endpoints is a tool used to manage inference endpoints
794+
795+
788796
|{kib-repo}blob/{branch}/x-pack/plugins/search_notebooks/README.mdx[searchNotebooks]
789797
|This plugin contains endpoints and components for rendering search python notebooks in the persistent dev console.
790798

‎package.json‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -540,6 +540,7 @@
540540
"@kbn/ingest-pipelines-plugin": "link:x-pack/plugins/ingest_pipelines",
541541
"@kbn/input-control-vis-plugin": "link:src/plugins/input_control_vis",
542542
"@kbn/inspector-plugin": "link:src/plugins/inspector",
543+
"@kbn/integration-assistant-plugin": "link:x-pack/plugins/integration_assistant",
543544
"@kbn/interactive-setup-plugin": "link:src/plugins/interactive_setup",
544545
"@kbn/interactive-setup-test-endpoints-plugin": "link:test/interactive_setup_api_integration/plugins/test_endpoints",
545546
"@kbn/interpreter": "link:packages/kbn-interpreter",
@@ -706,6 +707,7 @@
706707
"@kbn/safer-lodash-set": "link:packages/kbn-safer-lodash-set",
707708
"@kbn/saml-provider-plugin": "link:x-pack/test/security_api_integration/plugins/saml_provider",
708709
"@kbn/sample-task-plugin": "link:x-pack/test/plugin_api_integration/plugins/sample_task_plugin",
710+
"@kbn/sample-task-plugin-mget": "link:x-pack/test/task_manager_claimer_mget/plugins/sample_task_plugin_mget",
709711
"@kbn/saved-object-export-transforms-plugin": "link:test/plugin_functional/plugins/saved_object_export_transforms",
710712
"@kbn/saved-object-import-warnings-plugin": "link:test/plugin_functional/plugins/saved_object_import_warnings",
711713
"@kbn/saved-object-test-plugin": "link:x-pack/test/saved_object_api_integration/common/plugins/saved_object_test_plugin",
@@ -728,6 +730,7 @@
728730
"@kbn/search-errors": "link:packages/kbn-search-errors",
729731
"@kbn/search-examples-plugin": "link:examples/search_examples",
730732
"@kbn/search-index-documents": "link:packages/kbn-search-index-documents",
733+
"@kbn/search-inference-endpoints": "link:x-pack/plugins/search_inference_endpoints",
731734
"@kbn/search-notebooks": "link:x-pack/plugins/search_notebooks",
732735
"@kbn/search-playground": "link:x-pack/plugins/search_playground",
733736
"@kbn/search-response-warnings": "link:packages/kbn-search-response-warnings",
@@ -951,10 +954,10 @@
951954
"@paralleldrive/cuid2": "^2.2.2",
952955
"@reduxjs/toolkit": "1.9.7",
953956
"@slack/webhook": "^7.0.1",
954-
"@smithy/eventstream-codec": "^2.0.12",
955-
"@smithy/eventstream-serde-node": "^2.1.1",
956-
"@smithy/types": "^2.9.1",
957-
"@smithy/util-utf8": "^2.0.0",
957+
"@smithy/eventstream-codec": "^3.0.0",
958+
"@smithy/eventstream-serde-node": "^3.0.0",
959+
"@smithy/types": "^3.0.0",
960+
"@smithy/util-utf8": "^3.0.0",
958961
"@tanstack/react-query": "^4.29.12",
959962
"@tanstack/react-query-devtools": "^4.29.12",
960963
"@turf/along": "6.0.1",
@@ -1067,8 +1070,9 @@
10671070
"jsts": "^1.6.2",
10681071
"kea": "^2.6.0",
10691072
"langchain": "0.2.3",
1070-
"langsmith": "^0.1.31",
1073+
"langsmith": "^0.1.30",
10711074
"launchdarkly-js-client-sdk": "^3.3.0",
1075+
"launchdarkly-node-server-sdk": "^7.0.3",
10721076
"load-json-file": "^6.2.0",
10731077
"lodash": "^4.17.21",
10741078
"lru-cache": "^4.1.5",
@@ -1091,6 +1095,7 @@
10911095
"node-forge": "^1.3.1",
10921096
"nodemailer": "^6.9.9",
10931097
"normalize-path": "^3.0.0",
1098+
"nunjucks": "^3.2.4",
10941099
"object-hash": "^1.3.1",
10951100
"object-path-immutable": "^3.1.1",
10961101
"openai": "^4.24.1",
@@ -1503,6 +1508,7 @@
15031508
"@types/node-forge": "^1.3.10",
15041509
"@types/nodemailer": "^6.4.0",
15051510
"@types/normalize-path": "^3.0.0",
1511+
"@types/nunjucks": "^3.2.6",
15061512
"@types/object-hash": "^1.3.0",
15071513
"@types/opn": "^5.1.0",
15081514
"@types/ora": "^1.3.5",

‎packages/core/saved-objects/docs/openapi/README.md‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,23 @@ To validate and bundle the docs, you can use [Redocly](https://redocly.com/docs/
1616

1717
For example, run the following commands from the `packages/core/saved-objects/docs/openapi/` folder:
1818

19-
```bash
20-
npx swagger-cli validate entrypoint.yaml
21-
```
19+
```bash
20+
npx swagger-cli validate entrypoint.yaml
21+
npx swagger-cli validate entrypoint-serverless.yaml
22+
```
2223

2324
Then you can generate the `bundled` files by running the following commands:
2425

25-
```bash
26-
npx @redocly/cli bundle entrypoint.yaml --output bundled.yaml --ext yaml
27-
npx @redocly/cli bundle entrypoint.yaml --output bundled.json --ext json
28-
```
26+
```bash
27+
npx @redocly/cli bundle entrypoint.yaml --output bundled.yaml --ext yaml
28+
npx @redocly/cli bundle entrypoint.yaml --output bundled.json --ext json
29+
npx @redocly/cli bundle entrypoint_serverless.yaml --output bundled_serverless.yaml --ext yaml
30+
npx @redocly/cli bundle entrypoint_serverless.yaml --output bundled_serverless.json --ext json
31+
```
2932

3033
After generating the json bundle ensure that it is also valid by running the following command:
3134

32-
```bash
33-
npx @redocly/cli lint bundled.json
34-
```
35+
```bash
36+
npx @redocly/cli lint bundled.json
37+
npx @redocly/cli lint bundled_serverless.json
38+
```

0 commit comments

Comments
 (0)