Skip to content

Commit 42145e7

Browse files
Merge branch 'main' into fix-kafka-dynamic-topic-output
2 parents bfccfdb + bdc4790 commit 42145e7

File tree

1,420 files changed

+16928
-17309
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,420 files changed

+16928
-17309
lines changed

.buildkite/pipelines/artifacts.yml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -70,19 +70,6 @@ steps:
7070
- exit_status: '*'
7171
limit: 1
7272

73-
- command: KIBANA_DOCKER_CONTEXT=ubi .buildkite/scripts/steps/artifacts/docker_context.sh
74-
label: 'Docker Context Verification'
75-
agents:
76-
image: family/kibana-ubuntu-2004
77-
imageProject: elastic-images-prod
78-
provider: gcp
79-
machineType: n2-standard-2
80-
timeout_in_minutes: 30
81-
retry:
82-
automatic:
83-
- exit_status: '*'
84-
limit: 1
85-
8673
- command: KIBANA_DOCKER_CONTEXT=wolfi .buildkite/scripts/steps/artifacts/docker_context.sh
8774
label: 'Docker Context Verification'
8875
agents:

.buildkite/scripts/build_kibana.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ if is_pr_with_label "ci:build-cloud-image"; then
3131
--docker-push \
3232
--skip-docker-ubi \
3333
--skip-docker-fips \
34-
--skip-docker-ubuntu \
3534
--skip-docker-wolfi \
3635
--skip-docker-serverless \
3736
--skip-docker-contexts

.buildkite/scripts/pipelines/security_solution_quality_gate/create_periodic_test_docker_image.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ node scripts/build \
3434
--docker-images \
3535
--docker-namespace="kibana-ci" \
3636
--docker-tag="$KIBANA_IMAGE_TAG" \
37-
--skip-docker-ubuntu \
3837
--skip-docker-wolfi \
3938
--skip-docker-ubi \
4039
--skip-docker-cloud \

.buildkite/scripts/steps/artifacts/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ set -euo pipefail
77
source .buildkite/scripts/steps/artifacts/env.sh
88

99
echo "--- Build Kibana artifacts"
10-
node scripts/build --all-platforms --debug --docker-cross-compile --skip-docker-fips "${BUILD_ARGS[@]}"
10+
node scripts/build --all-platforms --debug --docker-cross-compile --skip-docker-fips --skip-docker-serverless --skip-cdn-assets "${BUILD_ARGS[@]}"
1111

1212
echo "--- Extract default i18n messages"
1313
mkdir -p target/i18n

.buildkite/scripts/steps/artifacts/docker_context.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ case $KIBANA_DOCKER_CONTEXT in
2626
cloud)
2727
DOCKER_CONTEXT_FILE="kibana-cloud-$FULL_VERSION-docker-build-context.tar.gz"
2828
;;
29-
ubi)
30-
DOCKER_CONTEXT_FILE="kibana-ubi-$FULL_VERSION-docker-build-context.tar.gz"
31-
;;
3229
ironbank)
3330
DOCKER_CONTEXT_FILE="kibana-ironbank-$FULL_VERSION-docker-build-context.tar.gz"
3431
DOCKER_BUILD_ARGS='--build-arg BASE_REGISTRY=docker.elastic.co --build-arg BASE_IMAGE=ubi9/ubi --build-arg BASE_TAG=latest'

.buildkite/scripts/steps/artifacts/publish.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ download "kibana-$FULL_VERSION-docker-image.tar.gz"
2222
download "kibana-$FULL_VERSION-docker-image-aarch64.tar.gz"
2323
download "kibana-cloud-$FULL_VERSION-docker-image.tar.gz"
2424
download "kibana-cloud-$FULL_VERSION-docker-image-aarch64.tar.gz"
25-
download "kibana-ubi-$FULL_VERSION-docker-image.tar.gz"
26-
download "kibana-ubi-$FULL_VERSION-docker-image-aarch64.tar.gz"
2725
download "kibana-wolfi-$FULL_VERSION-docker-image.tar.gz"
2826
download "kibana-wolfi-$FULL_VERSION-docker-image-aarch64.tar.gz"
2927

@@ -35,7 +33,6 @@ download "kibana-$FULL_VERSION-aarch64.rpm"
3533
download "kibana-$FULL_VERSION-docker-build-context.tar.gz"
3634
download "kibana-cloud-$FULL_VERSION-docker-build-context.tar.gz"
3735
download "kibana-ironbank-$FULL_VERSION-docker-build-context.tar.gz"
38-
download "kibana-ubi-$FULL_VERSION-docker-build-context.tar.gz"
3936
download "kibana-wolfi-$FULL_VERSION-docker-build-context.tar.gz"
4037

4138
download "kibana-$FULL_VERSION-linux-aarch64.tar.gz"

.buildkite/scripts/steps/cloud/build_and_deploy.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ else
4242
--docker-push \
4343
--skip-docker-ubi \
4444
--skip-docker-fips \
45-
--skip-docker-ubuntu \
4645
--skip-docker-wolfi \
4746
--skip-docker-serverless \
4847
--skip-docker-contexts

.buildkite/scripts/steps/esql_grammar_sync.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@ set -euo pipefail
44
synchronize_lexer_grammar () {
55
license_header="$1"
66
source_file="$PARENT_DIR/elasticsearch/x-pack/plugin/esql/src/main/antlr/EsqlBaseLexer.g4"
7+
source_lib_dir="$PARENT_DIR/elasticsearch/x-pack/plugin/esql/src/main/antlr/lexer"
78
destination_file="./src/platform/packages/shared/kbn-esql-ast/src/antlr/esql_lexer.g4"
9+
destination_lib_dir="./src/platform/packages/shared/kbn-esql-ast/src/antlr/lexer"
810

911
# Copy the file
1012
cp "$source_file" "$destination_file"
13+
cp -r "$source_lib_dir" "$destination_lib_dir"
1114

1215
# Insert the license header
1316
temp_file=$(mktemp)
@@ -26,10 +29,13 @@ synchronize_lexer_grammar () {
2629
synchronize_parser_grammar () {
2730
license_header="$1"
2831
source_file="$PARENT_DIR/elasticsearch/x-pack/plugin/esql/src/main/antlr/EsqlBaseParser.g4"
32+
source_lib_dir="$PARENT_DIR/elasticsearch/x-pack/plugin/esql/src/main/antlr/parser"
2933
destination_file="./src/platform/packages/shared/kbn-esql-ast/src/antlr/esql_parser.g4"
34+
destination_lib_dir="./src/platform/packages/shared/kbn-esql-ast/src/antlr/parser"
3035

3136
# Copy the file
3237
cp "$source_file" "$destination_file"
38+
cp -r "$source_lib_dir" "$destination_lib_dir"
3339

3440
# Insert the license header
3541
temp_file=$(mktemp)

.buildkite/scripts/steps/fips/build.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ node scripts/build \
2222
--docker-tag-qualifier="$BUILDKITE_COMMIT" \
2323
--docker-push \
2424
--skip-docker-ubi \
25-
--skip-docker-ubuntu \
2625
--skip-docker-wolfi \
2726
--skip-docker-cloud \
2827
--skip-docker-serverless \

.github/CODEOWNERS

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -784,7 +784,6 @@ x-pack/platform/packages/private/ml/date_picker @elastic/ml-ui
784784
x-pack/platform/packages/private/ml/date_utils @elastic/ml-ui
785785
x-pack/platform/packages/private/ml/field_stats_flyout @elastic/ml-ui
786786
x-pack/platform/packages/private/ml/in_memory_table @elastic/ml-ui
787-
x-pack/platform/packages/private/ml/inference_integration_flyout @elastic/ml-ui
788787
x-pack/platform/packages/private/ml/is_defined @elastic/ml-ui
789788
x-pack/platform/packages/private/ml/is_populated_object @elastic/ml-ui
790789
x-pack/platform/packages/private/ml/json_schemas @elastic/ml-ui
@@ -1346,6 +1345,11 @@ packages/kbn-monaco/src/esql @elastic/kibana-esql
13461345
/x-pack/test/common/utils/synthtrace @elastic/obs-ux-infra_services-team @elastic/obs-ux-logs-team # Assigned per https://github.com/elastic/kibana/blob/main/src/platform/packages/shared/kbn-apm-synthtrace/kibana.jsonc#L5
13471346
/x-pack/test/common/utils/server_route_repository @elastic/obs-knowledge-team
13481347

1348+
## Streams parts owned by Logs UX
1349+
/x-pack/platform/plugins/shared/streams/server/routes/streams/processing @elastic/obs-ux-logs-team
1350+
/x-pack/platform/plugins/shared/streams/server/routes/streams/schema @elastic/obs-ux-logs-team
1351+
/x-pack/platform/plugins/shared/streams_app/public/components/data_management @elastic/obs-ux-logs-team
1352+
13491353
# Infra Monitoring tests
13501354
/x-pack/test/common/services/infra_synthtrace_kibana_client.ts @elastic/obs-ux-infra_services-team
13511355
/x-pack/test/common/services/infra_log_views.ts @elastic/obs-ux-infra_services-team # Assigned per https://github.com/elastic/kibana/pull/188204

0 commit comments

Comments
 (0)