Skip to content

Commit a61945c

Browse files
JordanShJordanSh
committed
Merge branch 'main' of https://github.com/elastic/kibana into siem-readiness-with-author
2 parents 8fe55a9 + 23873f0 commit a61945c

5,047 files changed

Lines changed: 220407 additions & 232667 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_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/pipeline-resource-definitions/kibana-fips-daily.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ spec:
2525
branch_configuration: main 9.1 8.19
2626
default_branch: main
2727
pipeline_file: .buildkite/pipelines/fips/fips_pipeline.sh
28+
skip_intermediate_builds: false
2829
provider_settings:
2930
trigger_mode: none
3031
schedules:

‎.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/scout_ci_config.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ plugins:
1313
- profiling
1414
- security_solution
1515
- slo
16+
- spaces
1617
- streams_app
1718
- workflows_extensions
1819
disabled:

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,23 @@ check_for_changed_files() {
4040
echo "'$1' caused changes to the following files:"
4141
echo "$GIT_CHANGES"
4242
echo ""
43-
echo "Auto-committing & pushing these changes now."
4443

4544
git config --global user.name kibanamachine
4645
git config --global user.email '42973632+kibanamachine@users.noreply.github.com'
4746
gh pr checkout "${BUILDKITE_PULL_REQUEST}"
4847
git add -A -- . ':!config/node.options' ':!config/kibana.yml'
49-
5048
git commit -m "$CUSTOM_FIX_MESSAGE"
51-
git push
5249

53-
# Wait to ensure all commits arrive before we terminate the build
54-
sleep 300
55-
# Still exit with error to fail the current build, a new build should be started after the push
50+
# If COLLECT_COMMITS_MARKER_FILE is set, we're in batch mode (e.g., called from quick checks runner)
51+
# Just record the commit for later batch push
52+
# Otherwise, commit and push immediately (standalone usage)
53+
if [[ -n "${COLLECT_COMMITS_MARKER_FILE:-}" ]]; then
54+
echo "Auto-committing these changes (will push after all checks complete)."
55+
echo "$CUSTOM_FIX_MESSAGE" >> "$COLLECT_COMMITS_MARKER_FILE"
56+
else
57+
echo "Auto-committing and pushing these changes."
58+
git push
59+
fi
5660
exit 1
5761
else
5862
echo -e "\n${RED}ERROR: '$1' caused changes to the following files:${C_RESET}\n"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ set -euo pipefail
55
source .buildkite/scripts/common/util.sh
66

77
echo --- Check for unregistered Scout Playwright configs
8-
node scripts/scout discover-playwright-configs --validate
8+
node scripts/scout discover-playwright-configs --validate

‎.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."

0 commit comments

Comments
 (0)