Skip to content

Commit

Permalink
Merge branch 'main' into 2025_02_21-fix_vega_tooltip_color
Browse files Browse the repository at this point in the history
  • Loading branch information
@markov00
markov00 authored Mar 4, 2025
2 parents 75bf906 + aae11b0 commit 2d04b0e
Show file tree
Hide file tree
Showing 6,338 changed files with 122,931 additions and 90,475 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 3 additions & 0 deletions .buildkite/ftr_security_serverless_configs.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ enabled:
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/eql/trial_license_complete_tier/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/esql/trial_license_complete_tier/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/trial_license_complete_tier/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/indicator_match/trial_license_complete_tier/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/machine_learning/trial_license_complete_tier/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/new_terms/trial_license_complete_tier/configs/serverless.config.ts
Expand All @@ -78,6 +79,8 @@ enabled:
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/management/trial_license_complete_tier/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/update_prebuilt_rules_package/trial_license_complete_tier/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/prebuilt_rule_customization/customization_enabled/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/prebuilt_rule_customization/customization_enabled/diffable_rule_fields/common_fields/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/prebuilt_rule_customization/customization_enabled/diffable_rule_fields/type_specific_fields/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/prebuilt_rule_customization/customization_disabled/configs/serverless_complete_tier.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/prebuilt_rule_customization/customization_disabled/configs/serverless_essentials_tier.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_bulk_actions/trial_license_complete_tier/configs/serverless.config.ts
Expand Down
3 changes: 3 additions & 0 deletions .buildkite/ftr_security_stateful_configs.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ enabled:
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/eql/trial_license_complete_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/esql/trial_license_complete_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/trial_license_complete_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/basic_license_essentials_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/indicator_match/trial_license_complete_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/machine_learning/trial_license_complete_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/new_terms/trial_license_complete_tier/configs/ess.config.ts
Expand All @@ -59,6 +60,8 @@ enabled:
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/management/trial_license_complete_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/update_prebuilt_rules_package/trial_license_complete_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/prebuilt_rule_customization/customization_enabled/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/prebuilt_rule_customization/customization_enabled/diffable_rule_fields/common_fields/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/prebuilt_rule_customization/customization_enabled/diffable_rule_fields/type_specific_fields/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/prebuilt_rule_customization/customization_disabled/configs/ess_basic_license.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/prebuilt_rule_customization/customization_disabled/configs/ess_trial_license.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_bulk_actions/trial_license_complete_tier/configs/ess.config.ts
Expand Down
13 changes: 0 additions & 13 deletions .buildkite/pipelines/artifacts.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,19 +70,6 @@ steps:
- exit_status: '*'
limit: 1

- command: KIBANA_DOCKER_CONTEXT=ubi .buildkite/scripts/steps/artifacts/docker_context.sh
label: 'Docker Context Verification'
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-2
timeout_in_minutes: 30
retry:
automatic:
- exit_status: '*'
limit: 1

- command: KIBANA_DOCKER_CONTEXT=wolfi .buildkite/scripts/steps/artifacts/docker_context.sh
label: 'Docker Context Verification'
agents:
Expand Down
14 changes: 14 additions & 0 deletions ...e/pipelines/security_solution_quality_gate/mki_periodic/mki_periodic_detection_engine.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,20 @@ steps:
automatic:
- exit_status: '1'
limit: 2

- label: Running rule_execution_logic:general_logic:essentials:qa:serverless
command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh rule_execution_logic:general_logic:essentials:qa:serverless
key: rule_execution_logic:general_logic:essentials:qa:serverless
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
timeout_in_minutes: 120
retry:
automatic:
- exit_status: '1'
limit: 2

- label: Running rule_execution_logic:indicator_match:qa:serverless
command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh rule_execution_logic:indicator_match:qa:serverless
Expand Down
14 changes: 14 additions & 0 deletions ...nes/security_solution_quality_gate/mki_quality_gate/mki_quality_gate_detection_engine.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,20 @@ steps:
- exit_status: "1"
limit: 2

- label: Running rule_execution_logic:general_logic:essentials:qa:serverless:release
command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh rule_execution_logic:general_logic:essentials:qa:serverless:release
key: rule_execution_logic:general_logic:essentials:qa:serverless:release
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
timeout_in_minutes: 120
retry:
automatic:
- exit_status: '1'
limit: 2

- label: Running rule_execution_logic:indicator_match:qa:serverless:release
command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh rule_execution_logic:indicator_match:qa:serverless:release
key: rule_execution_logic:indicator_match:qa:serverless:release
Expand Down
1 change: 0 additions & 1 deletion .buildkite/scripts/build_kibana.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ if is_pr_with_label "ci:build-cloud-image"; then
--docker-push \
--skip-docker-ubi \
--skip-docker-fips \
--skip-docker-ubuntu \
--skip-docker-wolfi \
--skip-docker-serverless \
--skip-docker-contexts
Expand Down
28 changes: 15 additions & 13 deletions .buildkite/scripts/pipelines/pull_request/pipeline.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
if (
(await doAnyChangesMatch([
/^x-pack\/solutions\/observability\/plugins\/apm/,
/^packages\/kbn-apm-synthtrace/,
/^src\/platform\/packages\/shared\/kbn-apm-synthtrace/,
])) ||
GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
) {
Expand All @@ -102,7 +102,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
if (
(await doAnyChangesMatch([
/^x-pack\/solutions\/observability\/plugins\/inventory/,
/^packages\/kbn-apm-synthtrace/,
/^src\/platform\/packages\/shared\/kbn-apm-synthtrace/,
])) ||
GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
) {
Expand Down Expand Up @@ -236,7 +236,8 @@ const getPipeline = (filename: string, removeSteps = true) => {

if (
(await doAnyChangesMatch([
/^packages\/kbn-securitysolution-.*/,
/^src\/platform\/packages\/shared\/kbn-securitysolution-.*/,
/^x-pack\/solutions\/security\/packages\/kbn-securitysolution-.*/,
/^x-pack\/solutions\/security\/plugins\/security_solution/,
/^x-pack\/test\/defend_workflows_cypress/,
/^x-pack\/test\/security_solution_cypress/,
Expand All @@ -252,7 +253,8 @@ const getPipeline = (filename: string, removeSteps = true) => {
if (
(await doAnyChangesMatch([
/^package.json/,
/^packages\/kbn-securitysolution-.*/,
/^src\/platform\/packages\/shared\/kbn-securitysolution-.*/,
/^x-pack\/solutions\/security\/packages\/kbn-securitysolution-.*/,
/^x-pack\/platform\/plugins\/shared\/alerting/,
/^x-pack\/platform\/plugins\/shared\/data_views\/common/,
/^x-pack\/solutions\/security\/plugins\/lists/,
Expand Down Expand Up @@ -297,7 +299,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
(await doAnyChangesMatch([
/^package.json/,
/^src\/platform\/packages\/shared\/kbn-discover-utils/,
/^packages\/kbn-doc-links/,
/^src\/platform\/packages\/shared\/kbn-doc-links/,
/^src\/platform\/packages\/shared\/kbn-dom-drag-drop/,
/^src\/platform\/packages\/shared\/kbn-es-query/,
/^src\/platform\/packages\/shared\/kbn-i18n/,
Expand All @@ -308,16 +310,17 @@ const getPipeline = (filename: string, removeSteps = true) => {
/^src\/platform\/packages\/shared\/kbn-rule-data-utils/,
/^src\/platform\/packages\/shared\/kbn-safer-lodash-set/,
/^src\/platform\/packages\/shared\/kbn-search-types/,
/^packages\/kbn-securitysolution-.*/,
/^src\/platform\/packages\/shared\/kbn-securitysolution-.*/,
/^x-pack\/solutions\/security\/packages\/kbn-securitysolution-.*/,
/^src\/platform\/packages\/shared\/kbn-securitysolution-ecs/,
/^x-pack\/solutions\/security\/packages\/kbn-securitysolution-io-ts-alerting-types/,
/^x-pack\/solutions\/security\/packages\/kbn-securitysolution-io-ts-list-types/,
/^x-pack\/solutions\/security\/packages\/kbn-securitysolution-list-hooks/,
/^x-pack\/solutions\/security\/packages\/kbn-securitysolution-t-grid/,
/^src\/platform\/packages\/shared\/kbn-ui-theme/,
/^src\/platform\/packages\/shared\/kbn-utility-types/,
/^packages\/react/,
/^packages\/shared-ux/,
/^src\/platform\/packages\/shared\/react/,
/^src\/platform\/packages\/shared\/shared-ux/,
/^src\/core/,
/^src\/platform\/plugins\/shared\/charts/,
/^src\/platform\/plugins\/shared\/controls/,
Expand Down Expand Up @@ -362,7 +365,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
(await doAnyChangesMatch([
/^package.json/,
/^src\/platform\/packages\/shared\/kbn-discover-utils/,
/^packages\/kbn-doc-links/,
/^src\/platform\/packages\/shared\/kbn-doc-links/,
/^src\/platform\/packages\/shared\/kbn-dom-drag-drop/,
/^src\/platform\/packages\/shared\/kbn-es-query/,
/^src\/platform\/packages\/shared\/kbn-i18n/,
Expand All @@ -373,16 +376,15 @@ const getPipeline = (filename: string, removeSteps = true) => {
/^src\/platform\/packages\/shared\/kbn-rule-data-utils/,
/^src\/platform\/packages\/shared\/kbn-safer-lodash-set/,
/^src\/platform\/packages\/shared\/kbn-search-types/,
/^packages\/kbn-securitysolution-.*/,
/^src\/platform\/packages\/shared\/kbn-securitysolution-ecs/,
/^x-pack\/solutions\/security\/packages\/kbn-securitysolution-io-ts-alerting-types/,
/^x-pack\/solutions\/security\/packages\/kbn-securitysolution-io-ts-list-types/,
/^x-pack\/solutions\/security\/packages\/kbn-securitysolution-list-hooks/,
/^x-pack\/solutions\/security\/packages\/kbn-securitysolution-t-grid/,
/^src\/platform\/packages\/shared\/kbn-ui-theme/,
/^src\/platform\/packages\/shared\/kbn-utility-types/,
/^packages\/react/,
/^packages\/shared-ux/,
/^src\/platform\/packages\/shared\/react/,
/^src\/platform\/packages\/shared\/shared-ux/,
/^src\/core/,
/^src\/platform\/plugins\/shared\/charts/,
/^src\/platform\/plugins\/shared\/controls/,
Expand Down Expand Up @@ -458,7 +460,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
(await doAnyChangesMatch([
/^x-pack\/platform\/plugins\/private\/discover_enhanced\/ui_tests/,
/^x-pack\/solutions\/observability\/plugins\/observability_onboarding/,
/^packages\/kbn-scout/,
/^src\/platform\/packages\/shared\/kbn-scout/,
])) ||
GITHUB_PR_LABELS.includes('ci:scout-ui-tests')
) {
Expand Down
1 change: 0 additions & 1 deletion ...ite/scripts/pipelines/security_solution_quality_gate/create_periodic_test_docker_image.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ node scripts/build \
--docker-images \
--docker-namespace="kibana-ci" \
--docker-tag="$KIBANA_IMAGE_TAG" \
--skip-docker-ubuntu \
--skip-docker-wolfi \
--skip-docker-ubi \
--skip-docker-cloud \
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/scripts/steps/artifacts/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set -euo pipefail
source .buildkite/scripts/steps/artifacts/env.sh

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

echo "--- Extract default i18n messages"
mkdir -p target/i18n
Expand Down
3 changes: 0 additions & 3 deletions .buildkite/scripts/steps/artifacts/docker_context.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ case $KIBANA_DOCKER_CONTEXT in
cloud)
DOCKER_CONTEXT_FILE="kibana-cloud-$FULL_VERSION-docker-build-context.tar.gz"
;;
ubi)
DOCKER_CONTEXT_FILE="kibana-ubi-$FULL_VERSION-docker-build-context.tar.gz"
;;
ironbank)
DOCKER_CONTEXT_FILE="kibana-ironbank-$FULL_VERSION-docker-build-context.tar.gz"
DOCKER_BUILD_ARGS='--build-arg BASE_REGISTRY=docker.elastic.co --build-arg BASE_IMAGE=ubi9/ubi --build-arg BASE_TAG=latest'
Expand Down
2 changes: 0 additions & 2 deletions .buildkite/scripts/steps/artifacts/publish.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ download "kibana-$FULL_VERSION-docker-image.tar.gz"
download "kibana-$FULL_VERSION-docker-image-aarch64.tar.gz"
download "kibana-cloud-$FULL_VERSION-docker-image.tar.gz"
download "kibana-cloud-$FULL_VERSION-docker-image-aarch64.tar.gz"
download "kibana-ubi-$FULL_VERSION-docker-image.tar.gz"
download "kibana-wolfi-$FULL_VERSION-docker-image.tar.gz"
download "kibana-wolfi-$FULL_VERSION-docker-image-aarch64.tar.gz"

Expand All @@ -34,7 +33,6 @@ download "kibana-$FULL_VERSION-aarch64.rpm"
download "kibana-$FULL_VERSION-docker-build-context.tar.gz"
download "kibana-cloud-$FULL_VERSION-docker-build-context.tar.gz"
download "kibana-ironbank-$FULL_VERSION-docker-build-context.tar.gz"
download "kibana-ubi-$FULL_VERSION-docker-build-context.tar.gz"
download "kibana-wolfi-$FULL_VERSION-docker-build-context.tar.gz"

download "kibana-$FULL_VERSION-linux-aarch64.tar.gz"
Expand Down
1 change: 0 additions & 1 deletion .buildkite/scripts/steps/cloud/build_and_deploy.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ else
--docker-push \
--skip-docker-ubi \
--skip-docker-fips \
--skip-docker-ubuntu \
--skip-docker-wolfi \
--skip-docker-serverless \
--skip-docker-contexts
Expand Down
6 changes: 6 additions & 0 deletions .buildkite/scripts/steps/esql_grammar_sync.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,13 @@ set -euo pipefail
synchronize_lexer_grammar () {
license_header="$1"
source_file="$PARENT_DIR/elasticsearch/x-pack/plugin/esql/src/main/antlr/EsqlBaseLexer.g4"
source_lib_dir="$PARENT_DIR/elasticsearch/x-pack/plugin/esql/src/main/antlr/lexer"
destination_file="./src/platform/packages/shared/kbn-esql-ast/src/antlr/esql_lexer.g4"
destination_lib_dir="./src/platform/packages/shared/kbn-esql-ast/src/antlr/lexer"

# Copy the file
cp "$source_file" "$destination_file"
cp -r "$source_lib_dir" "$destination_lib_dir"

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

# Copy the file
cp "$source_file" "$destination_file"
cp -r "$source_lib_dir" "$destination_lib_dir"

# Insert the license header
temp_file=$(mktemp)
Expand Down
1 change: 0 additions & 1 deletion .buildkite/scripts/steps/fips/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ node scripts/build \
--docker-tag-qualifier="$BUILDKITE_COMMIT" \
--docker-push \
--skip-docker-ubi \
--skip-docker-ubuntu \
--skip-docker-wolfi \
--skip-docker-cloud \
--skip-docker-serverless \
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/scripts/steps/test/jest_parallel.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ echo "+++ ⚠️ WARNING ⚠️"
echo "
console.log(), console.warn(), and console.error() output in jest tests causes a massive amount
of noise on CI without any percevable benefit, so they have been disabled. If you want to log
output in your test temporarily, you can modify 'packages/kbn-test/src/jest/setup/disable_console_logs.js'
output in your test temporarily, you can modify 'src/platform/packages/shared/kbn-test/src/jest/setup/disable_console_logs.js'
"

while read -r config; do
Expand Down
4 changes: 2 additions & 2 deletions .eslintignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ snapshots.js
/packages/kbn-eslint-config
/packages/kbn-plugin-generator/template
/packages/kbn-generate/templates
/packages/kbn-test/src/functional_test_runner/__tests__/fixtures/
/packages/kbn-test/src/functional_test_runner/lib/config/__tests__/fixtures/
/src/platform/packages/shared/kbn-test/src/functional_test_runner/__tests__/fixtures/
/src/platform/packages/shared/kbn-test/src/functional_test_runner/lib/config/__tests__/fixtures/
/src/platform/packages/shared/kbn-flot-charts/lib
/src/platform/packages/shared/kbn-monaco/src/**/antlr
/src/platform/packages/shared/kbn-esql-ast/src/**/antlr
Expand Down
Loading

0 comments on commit 2d04b0e

Please sign in to comment.