Skip to content

Commit 1253af7

Browse files
mariairiartefmariairiartef
authored
Merge branch 'main' into fix/234360
2 parents c0144c3 + 6886329 commit 1253af7

File tree

2,164 files changed

+43539
-11490
lines changed

Some content is hidden

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

2,164 files changed

+43539
-11490
lines changed

‎.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/esql_grammar_sync.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,11 @@ main () {
181181
# Bootstrap Kibana
182182
.buildkite/scripts/bootstrap.sh
183183

184-
# Build ANTLR stuff
184+
# Note: We run build commands directly instead of `yarn build:antlr4` to skip
185+
# the prebuild:antlr4 hook which uses `brew` (macOS only). CI has antlr installed.
185186
cd ./src/platform/packages/shared/kbn-esql-ast
186-
yarn build:antlr4
187+
yarn build:antlr4:esql
188+
yarn build:antlr4:promql
187189

188190
# Make a commit
189191
BRANCH_NAME="esql_grammar_sync_$(date +%s)"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ xml-formatter
1919
@storybook/addon-docs
2020
dompurify
2121
magic-bytes.js
22+
@axe-core/playwright
2223
@opentelemetry/exporter-trace-otlp-grpc

‎.buildkite/scripts/steps/test/scout_configs.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@ declare -A RUN_MODES
6464
RUN_MODES["platform"]="--stateful --serverless=es --serverless=oblt --serverless=security"
6565
RUN_MODES["observability"]="--stateful --serverless=oblt --serverless=oblt-logs-essentials"
6666
RUN_MODES["search"]="--stateful --serverless=es"
67-
RUN_MODES["security"]="--stateful --serverless=security"
67+
RUN_MODES["security"]="--stateful --serverless=security --serverless=security-essentials --serverless=security-ease"
6868

6969
# Define serverless-only run modes based on group
7070
declare -A RUN_MODES_SERVERLESS_ONLY
7171
RUN_MODES_SERVERLESS_ONLY["platform"]="--serverless=es --serverless=oblt --serverless=security"
7272
RUN_MODES_SERVERLESS_ONLY["observability"]="--serverless=oblt --serverless=oblt-logs-essentials"
7373
RUN_MODES_SERVERLESS_ONLY["search"]="--serverless=es"
74-
RUN_MODES_SERVERLESS_ONLY["security"]="--serverless=security"
74+
RUN_MODES_SERVERLESS_ONLY["security"]="--serverless=security --serverless=security-essentials --serverless=security-ease"
7575

7676
# Determine valid run modes for the group
7777
if [[ -n "${SERVERLESS_TESTS_ONLY:-}" ]]; then

‎.eslintrc.js‎

Lines changed: 5 additions & 0 deletions
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
],
@@ -2440,6 +2441,8 @@ module.exports = {
24402441
files: [
24412442
'src/platform/plugins/shared/workflows_management/public/**/*.{js,mjs,ts,tsx}',
24422443
'src/platform/plugins/shared/workflows_management/common/**/*.{js,mjs,ts,tsx}',
2444+
'src/platform/plugins/shared/workflows_extensions/public/**/*.{js,mjs,ts,tsx}',
2445+
'src/platform/plugins/shared/workflows_extensions/common/**/*.{js,mjs,ts,tsx}',
24432446
'src/platform/packages/shared/kbn-workflows/**/*.{js,mjs,ts,tsx}',
24442447
'src/platform/packages/shared/kbn-workflows-ui/**/*.{js,mjs,ts,tsx}',
24452448
],
@@ -2456,6 +2459,7 @@ module.exports = {
24562459
files: [
24572460
'src/platform/plugins/shared/workflows_management/**/*.{test,mock,test_helper}.{ts,tsx}',
24582461
'src/platform/plugins/shared/workflows_execution_engine/**/*.{test,mock,test_helper}.{ts,tsx}',
2462+
'src/platform/plugins/shared/workflows_extensions/**/*.{test,mock,test_helper}.{ts,tsx}',
24592463
'src/platform/packages/shared/kbn-workflows/**/*.{test,mock,test_helper}.{ts,tsx}',
24602464
'src/platform/packages/shared/kbn-workflows-ui/**/*.{test,mock,test_helper}.{ts,tsx}',
24612465
],
@@ -2692,6 +2696,7 @@ module.exports = {
26922696
],
26932697
rules: {
26942698
'@kbn/eslint/scout_no_describe_configure': 'error',
2699+
'@kbn/eslint/require_include_in_check_a11y': 'warn',
26952700
},
26962701
},
26972702
{

0 commit comments

Comments
 (0)