Skip to content

Commit

Permalink
Merge branch 'main' into fix-search-src-alert
Browse files Browse the repository at this point in the history
  • Loading branch information
elasticmachine authored Jan 7, 2025
2 parents dc1f0f3 + 212b192 commit a03aba4
Show file tree
Hide file tree
Showing 10,708 changed files with 68,894 additions and 98,534 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 0 additions & 1 deletion .buildkite/ftr_oblt_stateful_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ enabled:
- x-pack/test/apm_api_integration/rules/config.ts
- x-pack/test/apm_api_integration/trial/config.ts
- x-pack/test/dataset_quality_api_integration/basic/config.ts
- x-pack/test/functional/apps/observability_logs_explorer/config.ts
- x-pack/test/functional/apps/dataset_quality/config.ts
- x-pack/test/functional/apps/slo/embeddables/config.ts
- x-pack/test/functional/apps/uptime/config.ts
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ spec:
env:
SLACK_NOTIFICATIONS_CHANNEL: "#kibana-operations-alerts"
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: "true"
REPORT_FAILED_TESTS_TO_GITHUB: 'true'
REPORT_FAILED_TESTS_TO_GITHUB: "true"
FLEET_PACKAGE_REGISTRY_DOCKER_IMAGE: "docker.elastic.co/package-registry/distribution:lite"
repository: elastic/kibana
branch_configuration: main
default_branch: main
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/pipeline-resource-definitions/kibana-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
spec:
env:
ELASTIC_PR_COMMENTS_ENABLED: 'true'
GITHUB_BUILD_COMMIT_STATUS_ENABLED: 'true'
ELASTIC_GITHUB_BUILD_COMMIT_STATUS_ENABLED: 'true'
GITHUB_BUILD_COMMIT_STATUS_CONTEXT: kibana-ci
allow_rebuilds: true
branch_configuration: ''
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/pipelines/artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ steps:
imageProject: elastic-images-prod
provider: gcp
machineType: c2-standard-16
diskSizeGb: 125
diskSizeGb: 150
timeout_in_minutes: 120
retry:
automatic:
Expand Down
12 changes: 6 additions & 6 deletions .buildkite/pipelines/chrome_forward_testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ steps:
depends_on:
- build
timeout_in_minutes: 60
parallelism: 8
parallelism: 10
retry:
automatic:
- exit_status: '-1'
Expand Down Expand Up @@ -153,7 +153,7 @@ steps:
depends_on:
- build
timeout_in_minutes: 60
parallelism: 6
parallelism: 2
retry:
automatic:
- exit_status: '-1'
Expand Down Expand Up @@ -181,7 +181,7 @@ steps:
depends_on:
- build
timeout_in_minutes: 60
parallelism: 6
parallelism: 4
retry:
automatic:
- exit_status: '-1'
Expand Down Expand Up @@ -209,7 +209,7 @@ steps:
depends_on:
- build
timeout_in_minutes: 60
parallelism: 6
parallelism: 3
retry:
automatic:
- exit_status: '-1'
Expand Down Expand Up @@ -265,7 +265,7 @@ steps:
depends_on:
- build
timeout_in_minutes: 60
parallelism: 2
parallelism: 3
retry:
automatic:
- exit_status: '-1'
Expand All @@ -279,7 +279,7 @@ steps:
depends_on:
- build
timeout_in_minutes: 60
parallelism: 6
parallelism: 8
retry:
automatic:
- exit_status: '-1'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ steps:
preemptible: true
depends_on: build
timeout_in_minutes: 60
parallelism: 8
parallelism: 10
retry:
automatic:
- exit_status: "-1"
Expand Down Expand Up @@ -175,7 +175,7 @@ steps:
preemptible: true
depends_on: build
timeout_in_minutes: 60
parallelism: 2
parallelism: 4
retry:
automatic:
- exit_status: "-1"
Expand Down
12 changes: 6 additions & 6 deletions .buildkite/pipelines/on_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ steps:
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 60
parallelism: 8
parallelism: 10
retry:
automatic:
- exit_status: '-1'
Expand Down Expand Up @@ -278,7 +278,7 @@ steps:
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 60
parallelism: 6
parallelism: 2
retry:
automatic:
- exit_status: '-1'
Expand Down Expand Up @@ -308,7 +308,7 @@ steps:
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 60
parallelism: 6
parallelism: 4
retry:
automatic:
- exit_status: '-1'
Expand Down Expand Up @@ -338,7 +338,7 @@ steps:
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 60
parallelism: 6
parallelism: 3
retry:
automatic:
- exit_status: '-1'
Expand Down Expand Up @@ -398,7 +398,7 @@ steps:
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 60
parallelism: 2
parallelism: 3
retry:
automatic:
- exit_status: '-1'
Expand All @@ -413,7 +413,7 @@ steps:
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 60
parallelism: 6
parallelism: 8
retry:
automatic:
- exit_status: '-1'
Expand Down
12 changes: 6 additions & 6 deletions .buildkite/pipelines/pointer_compression.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ steps:
depends_on:
- build
timeout_in_minutes: 60
parallelism: 8
parallelism: 10
retry:
automatic:
- exit_status: '-1'
Expand Down Expand Up @@ -162,7 +162,7 @@ steps:
depends_on:
- build
timeout_in_minutes: 60
parallelism: 6
parallelism: 2
retry:
automatic:
- exit_status: '-1'
Expand Down Expand Up @@ -196,7 +196,7 @@ steps:
depends_on:
- build
timeout_in_minutes: 60
parallelism: 6
parallelism: 4
retry:
automatic:
- exit_status: '-1'
Expand Down Expand Up @@ -230,7 +230,7 @@ steps:
depends_on:
- build
timeout_in_minutes: 60
parallelism: 6
parallelism: 3
retry:
automatic:
- exit_status: '-1'
Expand Down Expand Up @@ -298,7 +298,7 @@ steps:
depends_on:
- build
timeout_in_minutes: 60
parallelism: 2
parallelism: 3
retry:
automatic:
- exit_status: '-1'
Expand All @@ -315,7 +315,7 @@ steps:
depends_on:
- build
timeout_in_minutes: 60
parallelism: 6
parallelism: 8
retry:
automatic:
- exit_status: '-1'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ steps:
- check_types
- check_oas_snapshot
timeout_in_minutes: 60
parallelism: 2
parallelism: 4
retry:
automatic:
- exit_status: '-1'
Expand Down Expand Up @@ -73,7 +73,7 @@ steps:
- check_types
- check_oas_snapshot
timeout_in_minutes: 60
parallelism: 2
parallelism: 3
retry:
automatic:
- exit_status: '-1'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ steps:
- check_types
- check_oas_snapshot
timeout_in_minutes: 60
parallelism: 2
parallelism: 3
retry:
automatic:
- exit_status: '-1'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ steps:
- check_types
- check_oas_snapshot
timeout_in_minutes: 60
parallelism: 7
parallelism: 8
retry:
automatic:
- exit_status: '-1'
Expand All @@ -33,7 +33,7 @@ steps:
- check_types
- check_oas_snapshot
timeout_in_minutes: 60
parallelism: 8
parallelism: 10
retry:
automatic:
- exit_status: '-1'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
env:
ELASTIC_PR_COMMENTS_ENABLED: 'true'
GITHUB_BUILD_COMMIT_STATUS_ENABLED: 'true'
ELASTIC_GITHUB_BUILD_COMMIT_STATUS_ENABLED: 'true'
GITHUB_BUILD_COMMIT_STATUS_CONTEXT: kibana-deploy-project-from-pr

steps:
Expand Down
20 changes: 10 additions & 10 deletions .buildkite/scripts/pipelines/pull_request/pipeline.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const getPipeline = (filename: string, removeSteps = true) => {

pipeline.push(getPipeline('.buildkite/pipelines/pull_request/base.yml', false));

if (await doAnyChangesMatch([/^packages\/kbn-handlebars/])) {
if (await doAnyChangesMatch([/^src\/platform\/packages\/private\/kbn-handlebars/])) {
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/kbn_handlebars.yml'));
}

Expand Down Expand Up @@ -265,7 +265,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
/^x-pack\/platform\/plugins\/shared\/triggers_actions_ui\/public\/application\/context\/actions_connectors_context\.tsx/,
/^x-pack\/platform\/plugins\/shared\/triggers_actions_ui\/server\/connector_types\/openai/,
/^x-pack\/platform\/plugins\/shared\/triggers_actions_ui\/server\/connector_types\/bedrock/,
/^x-pack\/plugins\/usage_collection\/public/,
/^x-pack\/platform\/plugins\/shared\/usage_collection\/public/,
/^x-pack\/solutions\/security\/plugins\/elastic_assistant/,
/^x-pack\/solutions\/security\/packages/,
/^x-pack\/platform\/packages\/shared\/kbn-elastic-assistant/,
Expand Down Expand Up @@ -300,13 +300,13 @@ const getPipeline = (filename: string, removeSteps = true) => {
/^packages\/kbn-doc-links/,
/^packages\/kbn-dom-drag-drop/,
/^src\/platform\/packages\/shared\/kbn-es-query/,
/^packages\/kbn-i18n/,
/^packages\/kbn-i18n-react/,
/^src\/platform\/packages\/shared\/kbn-i18n/,
/^src\/platform\/packages\/shared\/kbn-i18n-react/,
/^src\/platform\/packages\/shared\/kbn-grouping/,
/^src\/platform\/packages\/shared\/kbn-resizable-layout/,
/^src\/platform\/packages\/shared\/kbn-rison/,
/^src\/platform\/packages\/shared\/kbn-rule-data-utils/,
/^packages\/kbn-safer-lodash-set/,
/^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/,
Expand All @@ -315,7 +315,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
/^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/,
/^packages\/kbn-utility-types/,
/^src\/platform\/packages\/shared\/kbn-utility-types/,
/^packages\/react/,
/^packages\/shared-ux/,
/^src\/core/,
Expand All @@ -326,10 +326,10 @@ const getPipeline = (filename: string, removeSteps = true) => {
/^src\/platform\/plugins\/shared\/discover/,
/^src\/platform\/plugins\/shared\/field_formats/,
/^src\/platform\/plugins\/shared\/inspector/,
/^src\/plugins\/kibana_react/,
/^src\/plugins\/kibana_utils/,
/^src\/platform\/plugins\/shared\/kibana_react/,
/^src\/platform\/plugins\/shared\/kibana_utils/,
/^src\/platform\/plugins\/shared\/saved_search/,
/^src\/plugins\/ui_actions/,
/^src\/platform\/plugins\/shared\/ui_actions/,
/^src\/platform\/plugins\/shared\/unified_histogram/,
/^src\/plugins\/unified_search/,
/^x-pack\/platform\/packages\/shared\/kbn-elastic-assistant/,
Expand All @@ -348,7 +348,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
/^x-pack\/solutions\/security\/plugins\/threat_intelligence/,
/^x-pack\/solutions\/security\/plugins\/timelines/,
/^x-pack\/platform\/plugins\/shared\/triggers_actions_ui/,
/^x-pack\/plugins\/usage_collection\/public/,
/^x-pack\/platform\/plugins\/shared\/usage_collection\/public/,
/^x-pack\/test\/functional\/es_archives\/security_solution/,
/^x-pack\/test\/security_solution_cypress/,
])) ||
Expand Down
1 change: 1 addition & 0 deletions .buildkite/scripts/steps/checks/quick_checks.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@
.buildkite/scripts/steps/checks/renovate.sh
.buildkite/scripts/steps/checks/native_modules.sh
.buildkite/scripts/steps/checks/test_files_missing_owner.sh
.buildkite/scripts/steps/checks/styled_components_mapping.sh
11 changes: 11 additions & 0 deletions .buildkite/scripts/steps/checks/styled_components_mapping.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/usr/bin/env bash

set -euo pipefail

source .buildkite/scripts/common/util.sh

echo --- Check styled-components mapping
cmd="node scripts/styled_components_mapping"

eval "$cmd"
check_for_changed_files "$cmd" true
2 changes: 1 addition & 1 deletion .buildkite/scripts/steps/test/kbn_handlebars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ set -euo pipefail
source .buildkite/scripts/common/util.sh

echo '--- Checking for @kbn/handlebars upstream updates'
packages/kbn-handlebars/scripts/check_for_upstream_updates.sh
src/platform/packages/private/kbn-handlebars/scripts/check_for_upstream_updates.sh
6 changes: 3 additions & 3 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ snapshots.js
/x-pack/platform/plugins/private/canvas/canvas_plugin
/x-pack/platform/plugins/private/canvas/shareable_runtime/build
/x-pack/platform/plugins/private/canvas/storybook/build
/x-pack/plugins/reporting/server/export_types/printable_pdf/server/lib/pdf/assets/**
/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/server/lib/pdf/assets/**
/x-pack/plugins/cloud_integrations/cloud_full_story/server/assets/**
/x-pack/platform/plugins/private/reporting/server/export_types/printable_pdf/server/lib/pdf/assets/**
/x-pack/platform/plugins/private/reporting/server/export_types/printable_pdf_v2/server/lib/pdf/assets/**
/x-pack/platform/plugins/private/cloud_integrations/cloud_full_story/server/assets/**

# package overrides
/packages/kbn-eslint-config
Expand Down
Loading

0 comments on commit a03aba4

Please sign in to comment.