Skip to content

Commit 5b2d9fb

Browse files
authored
Merge branch 'main' into discover-tabs-recently-closed-tabs-improvements
2 parents e90343d + 3e6cb6b commit 5b2d9fb

File tree

3,097 files changed

+206748
-55955
lines changed

Some content is hidden

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

3,097 files changed

+206748
-55955
lines changed

.buildkite/ftr_platform_stateful_configs.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,6 @@ disabled:
5050
- x-pack/platform/test/functional_gen_ai/inference/config.ts
5151
- x-pack/platform/test/onechat/smoke_tests/config.stateful.ts
5252

53-
# Temporary skip while investigating failures
54-
- x-pack/performance/journeys_e2e/aiops_log_rate_analysis.ts
55-
5653
defaultQueue: 'n2-4-spot'
5754
enabled:
5855
- src/platform/test/accessibility/config.ts
@@ -346,6 +343,7 @@ enabled:
346343
- x-pack/platform/test/upgrade_assistant_integration/config.ts
347344
- x-pack/platform/test/reindex_service/config.ts
348345
- x-pack/platform/test/usage_collection/config.ts
346+
- x-pack/performance/journeys_e2e/aiops_log_rate_analysis.ts
349347
- x-pack/performance/journeys_e2e/ecommerce_dashboard.ts
350348
- x-pack/performance/journeys_e2e/ecommerce_dashboard_http2.ts
351349
- x-pack/performance/journeys_e2e/ecommerce_dashboard_map_only.ts

.buildkite/ftr_security_serverless_configs.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,11 @@ enabled:
111111
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/nlp_cleanup_task/trial_license_complete_tier/configs/serverless.config.ts
112112
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/nlp_cleanup_task/basic_license_essentials_tier/configs/serverless.config.ts
113113
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/startup/trial_license_complete_tier/configs/serverless.config.ts
114-
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/knowledge_base/entries/trial_license_complete_tier/configs/ess.config.ts
115114
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/knowledge_base/entries/trial_license_complete_tier/configs/serverless.config.ts
116-
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/attack_discovery/schedules/trial_license_complete_tier/configs/ess.config.ts
115+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/attack_discovery/privileges/trial_license_complete_tier/configs/serverless.config.ts
116+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/attack_discovery/privileges/basic_license_essentials_tier/configs/serverless.config.ts
117117
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/attack_discovery/schedules/trial_license_complete_tier/configs/serverless.config.ts
118-
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/attack_discovery/schedules/basic_license_essentials_tier/configs/ess.config.ts
119118
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/attack_discovery/schedules/basic_license_essentials_tier/configs/serverless.config.ts
120-
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/conversations/trial_license_complete_tier/configs/ess.config.ts
121119
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/conversations/trial_license_complete_tier/configs/serverless.config.ts
122120
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/configs/serverless.config.ts
123121
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/basic_license_essentials_tier/configs/serverless.config.ts

.buildkite/ftr_security_stateful_configs.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,12 @@ enabled:
9595
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/configs/ess.config.ts
9696
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/telemetry/configs/ess.config.ts
9797
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/user_roles/trial_license_complete_tier/configs/ess.config.ts
98+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/knowledge_base/entries/trial_license_complete_tier/configs/ess.config.ts
99+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/attack_discovery/privileges/trial_license_complete_tier/configs/ess.config.ts
100+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/attack_discovery/privileges/basic_license_essentials_tier/configs/ess.config.ts
101+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/attack_discovery/schedules/trial_license_complete_tier/configs/ess.config.ts
102+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/attack_discovery/schedules/basic_license_essentials_tier/configs/ess.config.ts
103+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/conversations/trial_license_complete_tier/configs/ess.config.ts
98104
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/configs/ess.config.ts
99105
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/basic_license_essentials_tier/configs/ess.config.ts
100106
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/entity_analytics/entity_store/trial_license_complete_tier/configs/ess.config.ts

.buildkite/scout_ci_config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ plugins:
44
- apm
55
- console
66
- discover_enhanced
7+
- index_management
78
- maps
89
- observability
910
- observability_onboarding
@@ -12,6 +13,7 @@ plugins:
1213
- security_solution
1314
- streams_app
1415
- slo
16+
- workflows_extensions
1517
disabled:
1618

1719
packages:

.buildkite/scripts/steps/artifacts/docker_image.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export KIBANA_WORKPLACE_AI_IMAGE="$KIBANA_WORKPLACE_AI_BASE_IMAGE:$KIBANA_IMAGE_
2323
KIBANA_OBSERVABILITY_BASE_IMAGE="docker.elastic.co/kibana-ci/kibana-serverless-observability"
2424
export KIBANA_OBSERVABILITY_IMAGE="$KIBANA_OBSERVABILITY_BASE_IMAGE:$KIBANA_IMAGE_TAG"
2525

26-
KIBANA_SEARCH_BASE_IMAGE="docker.elastic.co/kibana-ci/kibana-serverless-search"
26+
KIBANA_SEARCH_BASE_IMAGE="docker.elastic.co/kibana-ci/kibana-serverless-elasticsearch"
2727
export KIBANA_SEARCH_IMAGE="$KIBANA_SEARCH_BASE_IMAGE:$KIBANA_IMAGE_TAG"
2828

2929
KIBANA_SECURITY_BASE_IMAGE="docker.elastic.co/kibana-ci/kibana-serverless-security"
@@ -79,7 +79,7 @@ if [[ "$SKIP_BUILD" == "false" ]]; then
7979
retag_image_with_architecture "$KIBANA_IMAGE" "kibana-serverless-$BASE_VERSION-docker-image"
8080
retag_image_with_architecture "$KIBANA_WORKPLACE_AI_IMAGE" "kibana-serverless-workplaceai-$BASE_VERSION-docker-image"
8181
retag_image_with_architecture "$KIBANA_OBSERVABILITY_IMAGE" "kibana-serverless-observability-$BASE_VERSION-docker-image"
82-
retag_image_with_architecture "$KIBANA_SEARCH_IMAGE" "kibana-serverless-search-$BASE_VERSION-docker-image"
82+
retag_image_with_architecture "$KIBANA_SEARCH_IMAGE" "kibana-serverless-elasticsearch-$BASE_VERSION-docker-image"
8383
retag_image_with_architecture "$KIBANA_SECURITY_IMAGE" "kibana-serverless-security-$BASE_VERSION-docker-image"
8484

8585
echo "--- Push images"
@@ -175,6 +175,7 @@ steps:
175175
SERVICE: kibana
176176
REMOTE_SERVICE_CONFIG: https://raw.githubusercontent.com/elastic/serverless-gitops/main/gen/gpctl/kibana/dev.yaml
177177
GPCTL_PROMOTE_DRY_RUN: ${DRY_RUN:-false}
178+
CHANGE_WINDOW_OVERRIDE: true
178179
EOF
179180

180181
else

.buildkite/scripts/steps/security/third_party_packages.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,6 @@ dompurify
2121
magic-bytes.js
2222
@axe-core/playwright
2323
@opentelemetry/exporter-trace-otlp-grpc
24+
@hey-api/openapi-ts
25+
vscode-languageserver-textdocument
26+
yaml-language-server

.eslintignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,6 @@ snapshots.js
3535
/src/platform/packages/shared/kbn-flot-charts/lib
3636
/src/platform/packages/shared/kbn-monaco/src/**/antlr
3737
/src/platform/packages/shared/kbn-esql-ast/src/**/antlr
38-
/src/platform/packages/shared/kbn-workflows/common/generated
38+
/src/platform/packages/shared/kbn-workflows/spec/elasticsearch/generated/**
39+
/src/platform/packages/shared/kbn-workflows/spec/kibana/generated/**
3940
/x-pack/platform/plugins/shared/screenshotting/chromium

.eslintrc.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2291,6 +2291,7 @@ module.exports = {
22912291
files: [
22922292
'src/platform/plugins/shared/workflows_management/**/*.{js,mjs,ts,tsx}',
22932293
'src/platform/plugins/shared/workflows_execution_engine/**/*.{js,mjs,ts,tsx}',
2294+
'src/platform/plugins/shared/workflows_extensions/**/*.{js,mjs,ts,tsx}',
22942295
'src/platform/packages/shared/kbn-workflows/**/*.{js,mjs,ts,tsx}',
22952296
'src/platform/packages/shared/kbn-workflows-ui/**/*.{js,mjs,ts,tsx}',
22962297
],
@@ -2391,7 +2392,12 @@ module.exports = {
23912392
// prevents code from importing files that contain the name "legacy" within their name. This is a mechanism
23922393
// to help deprecation and prevent accidental re-use/continued use of code we plan on removing. If you are
23932394
// finding yourself turning this off a lot for "new code" consider renaming the file and functions if it is has valid uses.
2394-
patterns: ['*legacy*'],
2395+
patterns: [
2396+
'*legacy*',
2397+
// Kibana has endpoint /api/spaces/_disable_legacy_url_aliases, resulting in generated file kibana.post_spaces_disable_legacy_url_aliases.gen.ts,
2398+
// this pattern allows to import this generated file
2399+
'!*.gen',
2400+
],
23952401
paths: RESTRICTED_IMPORTS,
23962402
},
23972403
],
@@ -2440,6 +2446,8 @@ module.exports = {
24402446
files: [
24412447
'src/platform/plugins/shared/workflows_management/public/**/*.{js,mjs,ts,tsx}',
24422448
'src/platform/plugins/shared/workflows_management/common/**/*.{js,mjs,ts,tsx}',
2449+
'src/platform/plugins/shared/workflows_extensions/public/**/*.{js,mjs,ts,tsx}',
2450+
'src/platform/plugins/shared/workflows_extensions/common/**/*.{js,mjs,ts,tsx}',
24432451
'src/platform/packages/shared/kbn-workflows/**/*.{js,mjs,ts,tsx}',
24442452
'src/platform/packages/shared/kbn-workflows-ui/**/*.{js,mjs,ts,tsx}',
24452453
],
@@ -2456,6 +2464,7 @@ module.exports = {
24562464
files: [
24572465
'src/platform/plugins/shared/workflows_management/**/*.{test,mock,test_helper}.{ts,tsx}',
24582466
'src/platform/plugins/shared/workflows_execution_engine/**/*.{test,mock,test_helper}.{ts,tsx}',
2467+
'src/platform/plugins/shared/workflows_extensions/**/*.{test,mock,test_helper}.{ts,tsx}',
24592468
'src/platform/packages/shared/kbn-workflows/**/*.{test,mock,test_helper}.{ts,tsx}',
24602469
'src/platform/packages/shared/kbn-workflows-ui/**/*.{test,mock,test_helper}.{ts,tsx}',
24612470
],

0 commit comments

Comments
 (0)