Skip to content

Commit

Permalink
Merge branch 'main' into move-monitor-status-rule-to-faad
Browse files Browse the repository at this point in the history
  • Loading branch information
doakalexi authored Jun 13, 2024
2 parents 3957100 + ad71568 commit a12af89
Show file tree
Hide file tree
Showing 280 changed files with 16,475 additions and 2,916 deletions.
1 change: 1 addition & 0 deletions .buildkite/ftr_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,7 @@ enabled:
- x-pack/test/spaces_api_integration/security_and_spaces/config_trial.ts
- x-pack/test/spaces_api_integration/security_and_spaces/copy_to_space_config_trial.ts
- x-pack/test/spaces_api_integration/spaces_only/config.ts
- x-pack/test/task_manager_claimer_mget/config.ts
- x-pack/test/ui_capabilities/security_and_spaces/config.ts
- x-pack/test/ui_capabilities/spaces_only/config.ts
- x-pack/test/upgrade_assistant_integration/config.js
Expand Down
3 changes: 3 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,7 @@ x-pack/plugins/runtime_fields @elastic/kibana-management
packages/kbn-safer-lodash-set @elastic/kibana-security
x-pack/test/security_api_integration/plugins/saml_provider @elastic/kibana-security
x-pack/test/plugin_api_integration/plugins/sample_task_plugin @elastic/response-ops
x-pack/test/task_manager_claimer_mget/plugins/sample_task_plugin_mget @elastic/response-ops
test/plugin_functional/plugins/saved_object_export_transforms @elastic/kibana-core
test/plugin_functional/plugins/saved_object_import_warnings @elastic/kibana-core
x-pack/test/saved_object_api_integration/common/plugins/saved_object_test_plugin @elastic/kibana-security
Expand All @@ -717,6 +718,7 @@ x-pack/plugins/search_connectors @elastic/search-kibana
packages/kbn-search-errors @elastic/kibana-data-discovery
examples/search_examples @elastic/kibana-data-discovery
packages/kbn-search-index-documents @elastic/search-kibana
x-pack/plugins/search_inference_endpoints @elastic/search-kibana
x-pack/plugins/search_notebooks @elastic/search-kibana
x-pack/plugins/search_playground @elastic/search-kibana
packages/kbn-search-response-warnings @elastic/kibana-data-discovery
Expand Down Expand Up @@ -1325,6 +1327,7 @@ x-pack/plugins/cloud_integrations/cloud_full_story/server/config.ts @elastic/kib
/x-pack/test/alerting_api_integration/observability @elastic/obs-ux-management-team
/x-pack/test/plugin_api_integration/test_suites/task_manager/ @elastic/response-ops
/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/ @elastic/response-ops
/x-pack/test/task_manager_claimer_mget/ @elastic/response-ops
/docs/user/alerting/ @elastic/response-ops
/docs/management/connectors/ @elastic/response-ops
/x-pack/test/cases_api_integration/ @elastic/response-ops
Expand Down
3 changes: 3 additions & 0 deletions config/serverless.es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,8 @@ data_visualizer.resultLinks.fileBeat.enabled: false
# Search Playground
xpack.searchPlayground.ui.enabled: true

# Search InferenceEndpoints
xpack.searchInferenceEndpoints.ui.enabled: false

# Search Notebooks
xpack.search.notebooks.catalog.url: https://elastic-enterprise-search.s3.us-east-2.amazonaws.com/serverless/catalog.json
4 changes: 4 additions & 0 deletions docs/developer/plugin-list.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -785,6 +785,10 @@ It uses Chromium and Puppeteer underneath to run the browser in headless mode.
|This plugin contains common assets and endpoints for the use of connectors in Kibana. Primarily used by the enterprise_search and serverless_search plugins.
|{kib-repo}blob/{branch}/x-pack/plugins/search_inference_endpoints/README.md[searchInferenceEndpoints]
|The Inference Endpoints is a tool used to manage inference endpoints
|{kib-repo}blob/{branch}/x-pack/plugins/search_notebooks/README.mdx[searchNotebooks]
|This plugin contains endpoints and components for rendering search python notebooks in the persistent dev console.
Expand Down
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -706,6 +706,7 @@
"@kbn/safer-lodash-set": "link:packages/kbn-safer-lodash-set",
"@kbn/saml-provider-plugin": "link:x-pack/test/security_api_integration/plugins/saml_provider",
"@kbn/sample-task-plugin": "link:x-pack/test/plugin_api_integration/plugins/sample_task_plugin",
"@kbn/sample-task-plugin-mget": "link:x-pack/test/task_manager_claimer_mget/plugins/sample_task_plugin_mget",
"@kbn/saved-object-export-transforms-plugin": "link:test/plugin_functional/plugins/saved_object_export_transforms",
"@kbn/saved-object-import-warnings-plugin": "link:test/plugin_functional/plugins/saved_object_import_warnings",
"@kbn/saved-object-test-plugin": "link:x-pack/test/saved_object_api_integration/common/plugins/saved_object_test_plugin",
Expand All @@ -728,6 +729,7 @@
"@kbn/search-errors": "link:packages/kbn-search-errors",
"@kbn/search-examples-plugin": "link:examples/search_examples",
"@kbn/search-index-documents": "link:packages/kbn-search-index-documents",
"@kbn/search-inference-endpoints": "link:x-pack/plugins/search_inference_endpoints",
"@kbn/search-notebooks": "link:x-pack/plugins/search_notebooks",
"@kbn/search-playground": "link:x-pack/plugins/search_playground",
"@kbn/search-response-warnings": "link:packages/kbn-search-response-warnings",
Expand Down
24 changes: 14 additions & 10 deletions packages/core/saved-objects/docs/openapi/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,23 @@ To validate and bundle the docs, you can use [Redocly](https://redocly.com/docs/

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

```bash
npx swagger-cli validate entrypoint.yaml
```
```bash
npx swagger-cli validate entrypoint.yaml
npx swagger-cli validate entrypoint-serverless.yaml
```

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

```bash
npx @redocly/cli bundle entrypoint.yaml --output bundled.yaml --ext yaml
npx @redocly/cli bundle entrypoint.yaml --output bundled.json --ext json
```
```bash
npx @redocly/cli bundle entrypoint.yaml --output bundled.yaml --ext yaml
npx @redocly/cli bundle entrypoint.yaml --output bundled.json --ext json
npx @redocly/cli bundle entrypoint_serverless.yaml --output bundled_serverless.yaml --ext yaml
npx @redocly/cli bundle entrypoint_serverless.yaml --output bundled_serverless.json --ext json
```

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

```bash
npx @redocly/cli lint bundled.json
```
```bash
npx @redocly/cli lint bundled.json
npx @redocly/cli lint bundled_serverless.json
```
52 changes: 29 additions & 23 deletions packages/core/saved-objects/docs/openapi/bundled.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"openapi": "3.1.0",
"openapi": "3.0.3",
"info": {
"title": "Saved objects",
"description": "OpenAPI schema for saved object endpoints",
Expand Down Expand Up @@ -34,7 +34,7 @@
"paths": {
"/api/encrypted_saved_objects/_rotate_key": {
"post": {
"summary": "Rotate the encryption key for encrypted saved objects.",
"summary": "Rotate a key for encrypted saved objects",
"operationId": "rotateEncryptionKey",
"description": "Superuser role required.\n\nIf a saved object cannot be decrypted using the primary encryption key, then Kibana will attempt to decrypt it using the specified decryption-only keys. In most of the cases this overhead is negligible, but if you're dealing with a large number of saved objects and experiencing performance issues, you may want to rotate the encryption key.\n\nThis functionality is in technical preview and may be changed or removed in a future release. Elastic will work to fix any issues, but features in technical preview are not subject to the support SLA of official GA features.\n",
"tags": [
Expand Down Expand Up @@ -116,7 +116,7 @@
},
"/api/saved_objects/_bulk_create": {
"post": {
"summary": "Create multiple Kibana saved objects.",
"summary": "Create saved objects",
"operationId": "bulkCreateSavedObjects",
"deprecated": true,
"tags": [
Expand Down Expand Up @@ -174,7 +174,7 @@
},
"/api/saved_objects/_bulk_delete": {
"post": {
"summary": "Remove multiple Kibana saved objects.",
"summary": "Delete saved objects",
"operationId": "bulkDeleteSavedObjects",
"description": "WARNING: When you delete a saved object, it cannot be recovered.\n",
"deprecated": true,
Expand Down Expand Up @@ -233,7 +233,7 @@
},
"/api/saved_objects/_bulk_get": {
"post": {
"summary": "Retrieve multiple Kibana saved objects by identifier.",
"summary": "Get saved objects",
"operationId": "bulkGetSavedObjects",
"deprecated": true,
"tags": [
Expand Down Expand Up @@ -283,10 +283,10 @@
},
"/api/saved_objects/_bulk_resolve": {
"post": {
"summary": "Retrieve multiple Kibana saved objects by identifier using any legacy URL aliases if they exist.",
"summary": "Resolve saved objects",
"operationId": "bulkResolveSavedObjects",
"deprecated": true,
"description": "Under certain circumstances when Kibana is upgraded, saved object migrations may necessitate regenerating some object IDs to enable new features. When an object's ID is regenerated, a legacy URL alias is created for that object, preserving its old ID. In such a scenario, that object can be retrieved by the bulk resolve API using either its new ID or its old ID.\n",
"description": "Retrieve multiple Kibana saved objects by identifier using any legacy URL aliases if they exist. Under certain circumstances when Kibana is upgraded, saved object migrations may necessitate regenerating some object IDs to enable new features. When an object's ID is regenerated, a legacy URL alias is created for that object, preserving its old ID. In such a scenario, that object can be retrieved by the bulk resolve API using either its new ID or its old ID.\n",
"tags": [
"saved objects"
],
Expand Down Expand Up @@ -334,8 +334,9 @@
},
"/api/saved_objects/_bulk_update": {
"post": {
"summary": "Update the attributes for multiple Kibana saved objects.",
"summary": "Update saved objects",
"operationId": "bulkUpdateSavedObjects",
"description": "Update the attributes for multiple Kibana saved objects.",
"deprecated": true,
"tags": [
"saved objects"
Expand Down Expand Up @@ -384,9 +385,9 @@
},
"/api/saved_objects/_export": {
"post": {
"summary": "Retrieve sets of saved objects that you want to import into Kibana.",
"operationId": "exportSavedObjects",
"description": "\nYou must include `type` or `objects` in the request body.\n\nNOTE: The `savedObjects.maxImportExportSize` configuration setting limits the number of saved objects which may be exported.\n\nThis functionality is in technical preview and may be changed or removed in a future release. Elastic will work to fix any issues, but features in technical preview are not subject to the support SLA of official GA features.\n",
"summary": "Export saved objects in the default space",
"operationId": "exportSavedObjectsDefault",
"description": "Retrieve sets of saved objects that you want to import into Kibana.\nYou must include `type` or `objects` in the request body.\n\nNOTE: The `savedObjects.maxImportExportSize` configuration setting limits the number of saved objects which may be exported.\n\nThis functionality is in technical preview and may be changed or removed in a future release. Elastic will work to fix any issues, but features in technical preview are not subject to the support SLA of official GA features.\n",
"tags": [
"saved objects"
],
Expand Down Expand Up @@ -474,8 +475,9 @@
},
"/api/saved_objects/_find": {
"get": {
"summary": "Retrieve a paginated set of Kibana saved objects.",
"summary": "Search for saved objects",
"operationId": "findSavedObjects",
"description": "Retrieve a paginated set of Kibana saved objects.",
"deprecated": true,
"tags": [
"saved objects"
Expand Down Expand Up @@ -642,9 +644,9 @@
},
"/api/saved_objects/_import": {
"post": {
"summary": "Create sets of Kibana saved objects from a file created by the export API.",
"operationId": "importSavedObjects",
"description": "Saved objects can be imported only into the same version, a newer minor on the same major, or the next major. Exported saved objects are not backwards compatible and cannot be imported into an older version of Kibana.\n\nThis functionality is in technical preview and may be changed or removed in a future release. Elastic will work to fix any issues, but features in technical preview are not subject to the support SLA of official GA features.\n",
"summary": "Import saved objects in the default space",
"operationId": "importSavedObjectsDefault",
"description": "Create sets of Kibana saved objects from a file created by the export API.\nSaved objects can be imported only into the same version, a newer minor on the same major, or the next major. Exported saved objects are not backwards compatible and cannot be imported into an older version of Kibana.\n\nThis functionality is in technical preview and may be changed or removed in a future release. Elastic will work to fix any issues, but features in technical preview are not subject to the support SLA of official GA features.\n",
"tags": [
"saved objects"
],
Expand Down Expand Up @@ -755,9 +757,9 @@
},
"/api/saved_objects/_resolve_import_errors": {
"post": {
"summary": "Resolve errors from the Import objects API.",
"summary": "Resolve import errors",
"operationId": "resolveImportErrors",
"description": "To resolve errors, you can:\n\n* Retry certain saved objects\n* Overwrite specific saved objects\n* Change references to different saved objects\n\nThis functionality is in technical preview and may be changed or removed in a future release. Elastic will work to fix any issues, but features in technical preview are not subject to the support SLA of official GA features.\n",
"description": "To resolve errors from the Import objects API, you can:\n\n* Retry certain saved objects\n* Overwrite specific saved objects\n* Change references to different saved objects\n\nThis functionality is in technical preview and may be changed or removed in a future release. Elastic will work to fix any issues, but features in technical preview are not subject to the support SLA of official GA features.\n",
"tags": [
"saved objects"
],
Expand Down Expand Up @@ -915,8 +917,9 @@
},
"/api/saved_objects/{type}": {
"post": {
"summary": "Create Kibana saved objects with randomly generated identifiers.",
"summary": "Create a saved object",
"operationId": "createSavedObject",
"description": "Create a Kibana saved object with a randomly generated identifier.",
"deprecated": true,
"tags": [
"saved objects"
Expand Down Expand Up @@ -987,8 +990,9 @@
},
"/api/saved_objects/{type}/{id}": {
"get": {
"summary": "Retrieve a single Kibana saved object by identifier.",
"summary": "Get a saved object",
"operationId": "getSavedObject",
"description": "Retrieve a single Kibana saved object by identifier.",
"deprecated": true,
"tags": [
"saved objects"
Expand Down Expand Up @@ -1025,8 +1029,9 @@
}
},
"post": {
"summary": "Create Kibana saved objects.",
"summary": "Create a saved object",
"operationId": "createSavedObjectId",
"description": "Create a Kibana saved object and specify its identifier instead of using a randomly generated ID.",
"deprecated": true,
"tags": [
"saved objects"
Expand Down Expand Up @@ -1098,8 +1103,9 @@
}
},
"put": {
"summary": "Update the attributes for Kibana saved objects.",
"summary": "Update a saved object",
"operationId": "updateSavedObject",
"description": "Update the attributes for Kibana saved objects.",
"deprecated": true,
"tags": [
"saved objects"
Expand Down Expand Up @@ -1161,9 +1167,9 @@
},
"/api/saved_objects/resolve/{type}/{id}": {
"get": {
"summary": "Retrieve a single Kibana saved object by identifier using any legacy URL alias if it exists.",
"summary": "Resolve a saved object",
"operationId": "resolveSavedObject",
"description": "Under certain circumstances, when Kibana is upgraded, saved object migrations may necessitate regenerating some object IDs to enable new features. When an object's ID is regenerated, a legacy URL alias is created for that object, preserving its old ID. In such a scenario, that object can be retrieved using either its new ID or its old ID.\n",
"description": "Retrieve a single Kibana saved object by identifier using any legacy URL alias if it exists. Under certain circumstances, when Kibana is upgraded, saved object migrations may necessitate regenerating some object IDs to enable new features. When an object's ID is regenerated, a legacy URL alias is created for that object, preserving its old ID. In such a scenario, that object can be retrieved using either its new ID or its old ID.\n",
"deprecated": true,
"tags": [
"saved objects"
Expand Down
Loading

0 comments on commit a12af89

Please sign in to comment.