Skip to content

Commit c3644d5

Browse files
committed
Merge with main and resolve conflicts
2 parents 5620c67 + 1d27973 commit c3644d5

1,283 files changed

Lines changed: 88464 additions & 6901 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/scripts/steps/openapi_bundling/final_merge.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@ source .buildkite/scripts/common/util.sh
77
echo --- Merge Kibana OpenAPI specs
88

99
(cd oas_docs && make api-docs && make api-docs-lint)
10+
(cd oas_docs && make api-docs-staging && make api-docs-lint)
11+
12+
check_for_changed_files "make api-docs && make api-docs-staging" true

.github/CODEOWNERS

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,7 @@ x-pack/plugins/data_quality @elastic/obs-ux-logs-team
354354
test/plugin_functional/plugins/data_search @elastic/kibana-data-discovery
355355
packages/kbn-data-service @elastic/kibana-visualizations @elastic/kibana-data-discovery
356356
packages/kbn-data-stream-adapter @elastic/security-threat-hunting-explore
357+
x-pack/plugins/data_usage @elastic/obs-ai-assistant @elastic/security-solution
357358
src/plugins/data_view_editor @elastic/kibana-data-discovery
358359
examples/data_view_field_editor_example @elastic/kibana-data-discovery
359360
src/plugins/data_view_field_editor @elastic/kibana-data-discovery
@@ -1417,6 +1418,15 @@ x-pack/plugins/cloud_integrations/cloud_full_story/server/config.ts @elastic/kib
14171418
/x-pack/test_serverless/functional/test_suites/security/screenshot_creation/response_ops_docs @elastic/response-ops
14181419
/x-pack/test_serverless/functional/test_suites/observability/screenshot_creation/response_ops_docs @elastic/response-ops
14191420
/x-pack/test_serverless/api_integration/test_suites/common/alerting/ @elastic/response-ops
1421+
/x-pack/test/functional/es_archives/action_task_params @elastic/response-ops
1422+
/x-pack/test/functional/es_archives/actions @elastic/response-ops
1423+
/x-pack/test/functional/es_archives/alerting @elastic/response-ops
1424+
/x-pack/test/functional/es_archives/alerts @elastic/response-ops
1425+
/x-pack/test/functional/es_archives/alerts_legacy @elastic/response-ops
1426+
/x-pack/test/functional/es_archives/observability/alerts @elastic/response-ops
1427+
/x-pack/test/functional/es_archives/actions @elastic/response-ops
1428+
/x-pack/test/functional/es_archives/rules_scheduled_task_id @elastic/response-ops
1429+
/x-pack/test/functional/es_archives/alerting/8_2_0 @elastic/response-ops
14201430

14211431
# Enterprise Search
14221432
/x-pack/test/functional_enterprise_search/ @elastic/search-kibana

api_docs/actions.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/actions
88
title: "actions"
99
image: https://source.unsplash.com/400x175/?github
1010
description: API docs for the actions plugin
11-
date: 2024-09-20
11+
date: 2024-09-23
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'actions']
1313
---
1414
import actionsObj from './actions.devdocs.json';

api_docs/advanced_settings.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/advancedSettings
88
title: "advancedSettings"
99
image: https://source.unsplash.com/400x175/?github
1010
description: API docs for the advancedSettings plugin
11-
date: 2024-09-20
11+
date: 2024-09-23
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'advancedSettings']
1313
---
1414
import advancedSettingsObj from './advanced_settings.devdocs.json';

api_docs/ai_assistant_management_selection.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiAssistantManagementSelection
88
title: "aiAssistantManagementSelection"
99
image: https://source.unsplash.com/400x175/?github
1010
description: API docs for the aiAssistantManagementSelection plugin
11-
date: 2024-09-20
11+
date: 2024-09-23
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiAssistantManagementSelection']
1313
---
1414
import aiAssistantManagementSelectionObj from './ai_assistant_management_selection.devdocs.json';

api_docs/aiops.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiops
88
title: "aiops"
99
image: https://source.unsplash.com/400x175/?github
1010
description: API docs for the aiops plugin
11-
date: 2024-09-20
11+
date: 2024-09-23
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiops']
1313
---
1414
import aiopsObj from './aiops.devdocs.json';

api_docs/alerting.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/alerting
88
title: "alerting"
99
image: https://source.unsplash.com/400x175/?github
1010
description: API docs for the alerting plugin
11-
date: 2024-09-20
11+
date: 2024-09-23
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'alerting']
1313
---
1414
import alertingObj from './alerting.devdocs.json';

api_docs/apm.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/apm
88
title: "apm"
99
image: https://source.unsplash.com/400x175/?github
1010
description: API docs for the apm plugin
11-
date: 2024-09-20
11+
date: 2024-09-23
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'apm']
1313
---
1414
import apmObj from './apm.devdocs.json';

api_docs/apm_data_access.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/apmDataAccess
88
title: "apmDataAccess"
99
image: https://source.unsplash.com/400x175/?github
1010
description: API docs for the apmDataAccess plugin
11-
date: 2024-09-20
11+
date: 2024-09-23
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'apmDataAccess']
1313
---
1414
import apmDataAccessObj from './apm_data_access.devdocs.json';

api_docs/banners.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/banners
88
title: "banners"
99
image: https://source.unsplash.com/400x175/?github
1010
description: API docs for the banners plugin
11-
date: 2024-09-20
11+
date: 2024-09-23
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'banners']
1313
---
1414
import bannersObj from './banners.devdocs.json';

0 commit comments

Comments
 (0)