Skip to content

Commit 57f2277

Browse files
authored
Merge branch 'main' into graph-popovers-impl
2 parents 8ba2a2a + e3d997e commit 57f2277

File tree

1,592 files changed

+21918
-5182
lines changed

Some content is hidden

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

1,592 files changed

+21918
-5182
lines changed

.buildkite/ftr_security_serverless_configs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ enabled:
4040
- x-pack/solutions/security/test/serverless/functional/configs/config.cloud_security_posture.essentials.ts
4141
- x-pack/solutions/security/test/serverless/functional/configs/config.cloud_security_posture.agentless.ts
4242
- x-pack/solutions/security/test/serverless/functional/configs/config.cloud_security_posture.complete.ts
43+
- x-pack/solutions/security/test/serverless/functional/configs/config.trial_companion.ts
4344
- x-pack/platform/test/serverless/functional/configs/security/config.saved_objects_management.ts
4445
- x-pack/solutions/security/test/serverless/functional/configs/config.context_awareness.ts
4546
- x-pack/platform/test/serverless/functional/configs/security/config.examples.context_awareness.ts

.buildkite/scripts/steps/checks/capture_oas_snapshot.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ source .buildkite/scripts/common/util.sh
88
.buildkite/scripts/setup_es_snapshot_cache.sh
99

1010
echo --- Capture OAS snapshot
11-
cmd="node scripts/capture_oas_snapshot \
11+
cmd="node scripts/capture_oas_snapshot\
1212
--include-path /api/status \
1313
--include-path /api/alerting/rule/ \
1414
--include-path /api/alerting/rules \
@@ -21,9 +21,6 @@ cmd="node scripts/capture_oas_snapshot \
2121
--include-path /api/saved_objects/_export \
2222
--include-path /api/maintenance_window \
2323
--include-path /api/agent_builder"
24-
if is_pr && ! is_auto_commit_disabled; then
25-
cmd="$cmd --update"
26-
fi
2724

2825
if [[ $BUILDKITE_PULL_REQUEST != "false" && "$BUILDKITE_PULL_REQUEST_BASE_BRANCH" != "main" ]] || [[ $BUILDKITE_PULL_REQUEST == "false" && "$BUILDKITE_BRANCH" != "main" ]]; then
2926
cmd="$cmd --no-serverless"
@@ -40,4 +37,8 @@ retry 5 15 run_check
4037

4138
node ./scripts/validate_oas_docs.js --assert-no-error-increase --skip-printing-issues --update-baseline
4239

43-
check_for_changed_files "capture_oas_snapshot.sh" true
40+
if is_pr && ! is_auto_commit_disabled; then
41+
check_for_changed_files "capture_oas_snapshot.sh" true
42+
else
43+
check_for_changed_files "capture_oas_snapshot.sh" false
44+
fi

.github/CODEOWNERS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2927,6 +2927,11 @@ x-pack/solutions/security/plugins/elastic_assistant/server/routes/defend_insight
29272927
## Security Solution sub teams - security-telemetry (Data Engineering)
29282928
x-pack/solutions/security/plugins/security_solution/server/usage/ @elastic/security-data-analytics
29292929
x-pack/solutions/security/plugins/security_solution/server/lib/telemetry/ @elastic/security-data-analytics
2930+
x-pack/solutions/security/plugins/security_solution/common/trial_companion/ @elastic/security-data-analytics
2931+
x-pack/solutions/security/plugins/security_solution/public/trial_companion/ @elastic/security-data-analytics
2932+
x-pack/solutions/security/plugins/security_solution/server/lib/trial_companion/ @elastic/security-data-analytics
2933+
x-pack/solutions/security/test/serverless/functional/test_suites/ftr/trial_companion/ @elastic/security-data-analytics
2934+
x-pack/solutions/security/test/serverless/functional/configs/config.trial_companion.ts @elastic/security-data-analytics
29302935

29312936
## Security Solution sub teams - Entity Analytics
29322937
x-pack/solutions/security/plugins/security_solution/common/api/entity_analytics @elastic/security-entity-analytics

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,10 @@ x-pack/platform/plugins/shared/fleet/cypress.config.d.ts
111111
x-pack/platform/plugins/shared/fleet/cypress.config.js
112112
x-pack/platform/plugins/shared/fleet/cypress.config.space_awareness.d.ts
113113
x-pack/platform/plugins/shared/fleet/cypress.config.space_awareness.js
114+
x-pack/platform/plugins/shared/fleet/cypress_ci.config.d.ts
115+
x-pack/platform/plugins/shared/fleet/cypress_ci.config.js
116+
x-pack/platform/plugins/shared/fleet/cypress_ci.config.space_awareness.d.ts
117+
x-pack/platform/plugins/shared/fleet/cypress_ci.config.space_awareness.js
114118
x-pack/platform/plugins/shared/osquery/cypress.config.d.ts
115119
x-pack/platform/plugins/shared/osquery/cypress.config.js
116120
x-pack/solutions/search/plugins/enterprise_search/cypress.config.d.ts

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: 2026-01-22
11+
date: 2026-01-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: 2026-01-22
11+
date: 2026-01-23
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'advancedSettings']
1313
---
1414
import advancedSettingsObj from './advanced_settings.devdocs.json';

api_docs/agent_builder.mdx

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

api_docs/agent_builder_platform.mdx

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

0 commit comments

Comments
 (0)