Skip to content

Commit effc35d

Browse files
elasticmachineelasticmachine
authored
Merge branch 'main' into feat/eui-v111.0.0
2 parents c59cd2e + 8fb6ed7 commit effc35d

4,336 files changed

Lines changed: 133374 additions & 228433 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/ftr_oblt_serverless_configs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ enabled:
4242
- x-pack/solutions/observability/test/serverless/functional/configs/config.telemetry.ts
4343
# serverless config files that run deployment-agnostic tests
4444
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/serverless/oblt.serverless.config.ts
45-
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/serverless/oblt.ai_assistant.serverless.config.ts
45+
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/feature_flag_configs/serverless/oblt.ai_assistant.serverless.config.ts
4646
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/serverless/oblt.apm.serverless.config.ts
4747
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/serverless/oblt.synthetics.serverless.config.ts
4848
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/feature_flag_configs/serverless/oblt.serverless.config.ts

‎.buildkite/ftr_oblt_stateful_configs.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ enabled:
4242
- x-pack/solutions/observability/test/observability_api_integration/basic/config.ts
4343
- x-pack/solutions/observability/test/observability_api_integration/trial/config.ts
4444
- x-pack/solutions/observability/test/observability_functional/with_rac_write.config.ts
45-
- x-pack/solutions/observability/test/observability_onboarding_api_integration/basic/config.ts
46-
- x-pack/solutions/observability/test/observability_onboarding_api_integration/cloud/config.ts
4745
- x-pack/solutions/observability/test/observability_ai_assistant_functional/enterprise/config.ts
4846
- x-pack/solutions/observability/test/api_integration/profiling/cloud/config.ts
4947
- x-pack/solutions/observability/test/functional/apps/apm/config.ts

‎.buildkite/ftr_platform_stateful_configs.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,8 @@ enabled:
338338
- x-pack/platform/test/spaces_api_integration/security_and_spaces/config_basic.ts
339339
- x-pack/platform/test/spaces_api_integration/security_and_spaces/config_trial.ts
340340
- x-pack/platform/test/spaces_api_integration/spaces_only/config.ts
341+
- x-pack/platform/test/spaces_api_integration/access_control_objects/config.ts
342+
- x-pack/platform/test/spaces_api_integration/access_control_objects/feature_disabled.config.ts
341343
- x-pack/platform/test/task_manager_claimer_update_by_query/config.ts
342344
- x-pack/platform/test/ui_capabilities/security_and_spaces/config.ts
343345
- x-pack/platform/test/ui_capabilities/spaces_only/config.ts

‎.buildkite/pipelines/on_merge_unsupported_ftrs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ steps:
3838
preemptible: true
3939
depends_on: build
4040
env:
41-
PING_SLACK_TEAM: "@obs-ux-management-team"
41+
PING_SLACK_TEAM: '@actionable-obs-team'
4242
timeout_in_minutes: 120
4343
artifact_paths:
4444
- 'x-pack/solutions/observability/plugins/synthetics/e2e/.journeys/**/*'

‎.buildkite/scripts/bootstrap.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ if ! (yarn kbn bootstrap "${BOOTSTRAP_PARAMS[@]}" || yarn kbn bootstrap "${BOOTS
4545
# So, we should just delete node_modules in between attempts
4646
rm -rf node_modules
4747

48-
export MOON_LOG=debug
4948
echo "--- yarn install and bootstrap, attempt 2"
5049
yarn kbn bootstrap --force-install || yarn kbn bootstrap
5150
fi

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ run_check() {
3434
}
3535

3636
retry 5 15 run_check
37+
# Bundle hand written specs
38+
.buildkite/scripts/steps/openapi_bundling/security_solution_openapi_bundling.sh
39+
.buildkite/scripts/steps/openapi_bundling/final_merge.sh
3740

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

40-
check_for_changed_files "$cmd" true
41-
42-
.buildkite/scripts/steps/openapi_bundling/security_solution_openapi_bundling.sh
43-
.buildkite/scripts/steps/openapi_bundling/final_merge.sh
43+
check_for_changed_files "capture_oas_snapshot.sh" true

‎.buildkite/scripts/steps/esql_grammar_sync.sh‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ synchronize_lexer_grammar () {
55
license_header="$1"
66
source_file="$PARENT_DIR/elasticsearch/x-pack/plugin/esql/src/main/antlr/EsqlBaseLexer.g4"
77
source_lib_dir="$PARENT_DIR/elasticsearch/x-pack/plugin/esql/src/main/antlr/lexer"
8-
destination_file="./src/platform/packages/shared/kbn-esql-ast/src/antlr/esql_lexer.g4"
9-
destination_lib_parent_dir="./src/platform/packages/shared/kbn-esql-ast/src/antlr"
8+
destination_file="./src/platform/packages/shared/kbn-esql-ast/src/parser/antlr/esql_lexer.g4"
9+
destination_lib_parent_dir="./src/platform/packages/shared/kbn-esql-ast/src/parser/antlr"
1010
destination_lib_dir="$destination_lib_parent_dir/lexer"
1111

1212

@@ -35,7 +35,7 @@ synchronize_lexer_grammar () {
3535
synchronize_promql_lexer_grammar () {
3636
license_header="$1"
3737
source_file="$PARENT_DIR/elasticsearch/x-pack/plugin/esql/src/main/antlr/PromqlBaseLexer.g4"
38-
destination_file="./src/platform/packages/shared/kbn-esql-ast/src/antlr/promql_lexer.g4"
38+
destination_file="./src/platform/packages/shared/kbn-esql-ast/src/parser/antlr/promql_lexer.g4"
3939

4040
# Copy the file
4141
echo "Copying PromQL base lexer file..."
@@ -59,8 +59,8 @@ synchronize_parser_grammar () {
5959
license_header="$1"
6060
source_file="$PARENT_DIR/elasticsearch/x-pack/plugin/esql/src/main/antlr/EsqlBaseParser.g4"
6161
source_lib_dir="$PARENT_DIR/elasticsearch/x-pack/plugin/esql/src/main/antlr/parser"
62-
destination_file="./src/platform/packages/shared/kbn-esql-ast/src/antlr/esql_parser.g4"
63-
destination_lib_parent_dir="./src/platform/packages/shared/kbn-esql-ast/src/antlr"
62+
destination_file="./src/platform/packages/shared/kbn-esql-ast/src/parser/antlr/esql_parser.g4"
63+
destination_lib_parent_dir="./src/platform/packages/shared/kbn-esql-ast/src/parser/antlr"
6464
destination_lib_dir="$destination_lib_parent_dir/parser"
6565

6666
# Copy the files
@@ -90,7 +90,7 @@ synchronize_parser_grammar () {
9090
synchronize_promql_parser_grammar () {
9191
license_header="$1"
9292
source_file="$PARENT_DIR/elasticsearch/x-pack/plugin/esql/src/main/antlr/PromqlBaseParser.g4"
93-
destination_file="./src/platform/packages/shared/kbn-esql-ast/src/antlr/promql_parser.g4"
93+
destination_file="./src/platform/packages/shared/kbn-esql-ast/src/parser/antlr/promql_parser.g4"
9494

9595
# Copy the file
9696
echo "Copying PromQL base parser file..."
@@ -142,7 +142,7 @@ main () {
142142
synchronize_promql_parser_grammar "$license_header"
143143

144144
# Check for differences in grammar files
145-
antlr_dir="./src/platform/packages/shared/kbn-esql-ast/src/antlr"
145+
antlr_dir="./src/platform/packages/shared/kbn-esql-ast/src/parser/antlr"
146146
set +e
147147
git diff --exit-code --quiet \
148148
"$antlr_dir/esql_lexer.g4" \
@@ -192,7 +192,7 @@ main () {
192192

193193
git checkout -b "$BRANCH_NAME"
194194

195-
git add src/antlr/*
195+
git add src/parser/antlr/*
196196
git commit -m "Update ES|QL grammars"
197197

198198
report_main_step "Changes committed. Creating pull request."

‎.buildkite/scripts/steps/typecheck/check_types.sh‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,8 @@ source .buildkite/scripts/common/util.sh
88

99
echo --- Check Types
1010

11-
node scripts/type_check
11+
if is_pr; then
12+
node scripts/type_check --with-archive
13+
else
14+
node scripts/type_check
15+
fi

‎.eslintignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ snapshots.js
3434
/src/platform/packages/shared/kbn-test/src/functional_test_runner/lib/config/__tests__/fixtures/
3535
/src/platform/packages/shared/kbn-flot-charts/lib
3636
/src/platform/packages/shared/kbn-monaco/src/**/antlr
37-
/src/platform/packages/shared/kbn-esql-ast/src/**/antlr
37+
/src/platform/packages/shared/kbn-esql-ast/src/parser/antlr
3838
/src/platform/packages/shared/kbn-workflows/spec/elasticsearch/generated/**
3939
/src/platform/packages/shared/kbn-workflows/spec/kibana/generated/**
4040
/x-pack/platform/plugins/shared/screenshotting/chromium

‎.eslintrc.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2701,6 +2701,7 @@ module.exports = {
27012701
],
27022702
rules: {
27032703
'@kbn/eslint/scout_no_describe_configure': 'error',
2704+
'@kbn/eslint/scout_max_one_describe': 'error',
27042705
'@kbn/eslint/scout_test_file_naming': 'error',
27052706
'@kbn/eslint/scout_require_api_client_in_api_test': 'error',
27062707
'@kbn/eslint/require_include_in_check_a11y': 'warn',

0 commit comments

Comments
 (0)