Skip to content

Commit

Permalink
Merge branch 'main' into authz_info_for_some_kbn_mgmt_api_routes
Browse files Browse the repository at this point in the history
  • Loading branch information
@mattkime
mattkime authored Dec 26, 2024
2 parents 20c986c + c382c20 commit c938376
Show file tree
Hide file tree
Showing 14,611 changed files with 55,365 additions and 23,074 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 1 addition & 0 deletions .buildkite/pipeline-resource-definitions/kibana-es-forward-testing-9-dot-0.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/es_forward_9_dot_0.yml # Note: this file exists in 8.x only and should be moved into 8.18 once the branch is cut
skip_intermediate_builds: false
provider_settings:
prefix_pull_request_fork_branch_names: false
trigger_mode: none
Expand Down
1 change: 1 addition & 0 deletions .buildkite/pipeline-resource-definitions/kibana-es-forward-testing.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/es_forward.yml # Note: this file exists in 7.17 only
skip_intermediate_builds: false
provider_settings:
prefix_pull_request_fork_branch_names: false
trigger_mode: none
Expand Down
55 changes: 29 additions & 26 deletions .buildkite/scripts/pipelines/pull_request/pipeline.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,19 +58,19 @@ const getPipeline = (filename: string, removeSteps = true) => {
if (
(await doAnyChangesMatch([
/^src\/plugins\/data/,
/^x-pack\/plugins\/actions/,
/^x-pack\/plugins\/alerting/,
/^x-pack\/plugins\/event_log/,
/^x-pack\/plugins\/rule_registry/,
/^x-pack\/plugins\/task_manager/,
/^x-pack\/platform\/plugins\/shared\/actions/,
/^x-pack\/platform\/plugins\/shared\/alerting/,
/^x-pack\/platform\/plugins\/shared\/event_log/,
/^x-pack\/platform\/plugins\/shared\/rule_registry/,
/^x-pack\/platform\/plugins\/shared\/task_manager/,
])) ||
GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
) {
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/response_ops.yml'));
}

if (
(await doAnyChangesMatch([/^x-pack\/plugins\/cases/])) ||
(await doAnyChangesMatch([/^x-pack\/platform\/plugins\/shared\/cases/])) ||
GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
) {
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/response_ops_cases.yml'));
Expand Down Expand Up @@ -99,7 +99,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
if (
(await doAnyChangesMatch([
/^x-pack\/solutions\/observability\/plugins\/observability_onboarding/,
/^x-pack\/plugins\/fleet/,
/^x-pack\/platform\/plugins\/shared\/fleet/,
])) ||
GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
) {
Expand All @@ -116,7 +116,10 @@ const getPipeline = (filename: string, removeSteps = true) => {
}

if (
(await doAnyChangesMatch([/^x-pack\/plugins\/fleet/, /^x-pack\/test\/fleet_cypress/])) ||
(await doAnyChangesMatch([
/^x-pack\/platform\/plugins\/shared\/fleet/,
/^x-pack\/test\/fleet_cypress/,
])) ||
GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
) {
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/fleet_cypress.yml'));
Expand Down Expand Up @@ -166,9 +169,9 @@ const getPipeline = (filename: string, removeSteps = true) => {
/^x-pack\/platform\/packages\/shared\/ai-infra/,
/^x-pack\/platform\/plugins\/shared\/ai_infra/,
/^x-pack\/platform\/plugins\/shared\/inference/,
/^x-pack\/plugins\/stack_connectors\/server\/connector_types\/bedrock/,
/^x-pack\/plugins\/stack_connectors\/server\/connector_types\/gemini/,
/^x-pack\/plugins\/stack_connectors\/server\/connector_types\/openai/,
/^x-pack\/platform\/plugins\/shared\/stack_connectors\/server\/connector_types\/bedrock/,
/^x-pack\/platform\/plugins\/shared\/stack_connectors\/server\/connector_types\/gemini/,
/^x-pack\/platform\/plugins\/shared\/stack_connectors\/server\/connector_types\/openai/,
])) ||
GITHUB_PR_LABELS.includes('ci:all-gen-ai-suites')
) {
Expand Down Expand Up @@ -249,19 +252,19 @@ const getPipeline = (filename: string, removeSteps = true) => {
(await doAnyChangesMatch([
/^package.json/,
/^packages\/kbn-securitysolution-.*/,
/^x-pack\/plugins\/alerting/,
/^x-pack\/platform\/plugins\/shared\/alerting/,
/^x-pack\/plugins\/data_views\/common/,
/^x-pack\/solutions\/security\/plugins\/lists/,
/^x-pack\/plugins\/rule_registry\/common/,
/^x-pack\/platform\/plugins\/shared\/rule_registry\/common/,
/^x-pack\/solutions\/security\/plugins\/security_solution/,
/^x-pack\/solutions\/security\/plugins\/security_solution_ess/,
/^x-pack\/solutions\/security\/plugins\/security_solution_serverless/,
/^x-pack\/plugins\/task_manager/,
/^x-pack\/platform\/plugins\/shared\/task_manager/,
/^x-pack\/solutions\/security\/plugins\/timelines/,
/^x-pack\/plugins\/triggers_actions_ui\/public\/application\/sections\/action_connector_form/,
/^x-pack\/plugins\/triggers_actions_ui\/public\/application\/context\/actions_connectors_context\.tsx/,
/^x-pack\/plugins\/triggers_actions_ui\/server\/connector_types\/openai/,
/^x-pack\/plugins\/triggers_actions_ui\/server\/connector_types\/bedrock/,
/^x-pack\/platform\/plugins\/shared\/triggers_actions_ui\/public\/application\/sections\/action_connector_form/,
/^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\/solutions\/security\/plugins\/elastic_assistant/,
/^x-pack\/solutions\/security\/packages/,
Expand Down Expand Up @@ -299,7 +302,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
/^packages\/kbn-es-query/,
/^packages\/kbn-i18n/,
/^packages\/kbn-i18n-react/,
/^packages\/kbn-grouping/,
/^src\/platform\/packages\/shared\/kbn-grouping/,
/^packages\/kbn-resizable-layout/,
/^packages\/kbn-rison/,
/^src\/platform\/packages\/shared\/kbn-rule-data-utils/,
Expand All @@ -317,12 +320,12 @@ const getPipeline = (filename: string, removeSteps = true) => {
/^packages\/shared-ux/,
/^src\/core/,
/^src\/plugins\/charts/,
/^src\/plugins\/controls/,
/^src\/platform\/plugins\/shared\/controls/,
/^src\/plugins\/data/,
/^src\/plugins\/data_views/,
/^src\/plugins\/discover/,
/^src\/plugins\/field_formats/,
/^src\/plugins\/inspector/,
/^src\/platform\/plugins\/shared\/inspector/,
/^src\/plugins\/kibana_react/,
/^src\/plugins\/kibana_utils/,
/^src\/plugins\/saved_search/,
Expand All @@ -332,19 +335,19 @@ const getPipeline = (filename: string, removeSteps = true) => {
/^x-pack\/platform\/packages\/shared\/kbn-elastic-assistant/,
/^x-pack\/platform\/packages\/shared\/kbn-elastic-assistant-common/,
/^x-pack\/solutions\/security\/packages/,
/^x-pack\/plugins\/alerting/,
/^x-pack\/plugins\/cases/,
/^x-pack\/platform\/plugins\/shared\/alerting/,
/^x-pack\/platform\/plugins\/shared\/cases/,
/^x-pack\/plugins\/data_views\/common/,
/^x-pack\/solutions\/security\/plugins\/elastic_assistant/,
/^x-pack\/solutions\/security\/plugins\/lists/,
/^x-pack\/plugins\/rule_registry\/common/,
/^x-pack\/platform\/plugins\/shared\/rule_registry\/common/,
/^x-pack\/solutions\/security\/plugins\/security_solution/,
/^x-pack\/solutions\/security\/plugins\/security_solution_ess/,
/^x-pack\/solutions\/security\/plugins\/security_solution_serverless/,
/^x-pack\/plugins\/task_manager/,
/^x-pack\/platform\/plugins\/shared\/task_manager/,
/^x-pack\/solutions\/security\/plugins\/threat_intelligence/,
/^x-pack\/solutions\/security\/plugins\/timelines/,
/^x-pack\/plugins\/triggers_actions_ui/,
/^x-pack\/platform\/plugins\/shared\/triggers_actions_ui/,
/^x-pack\/plugins\/usage_collection\/public/,
/^x-pack\/test\/functional\/es_archives\/security_solution/,
/^x-pack\/test\/security_solution_cypress/,
Expand Down
4 changes: 2 additions & 2 deletions .buildkite/scripts/steps/checks/event_log.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ else
git clone --depth 1 -b $ECS_STABLE_VERSION https://github.com/elastic/ecs.git ../ecs
fi

node x-pack/plugins/event_log/scripts/create_schemas.js
node x-pack/platform/plugins/shared/event_log/scripts/create_schemas.js

check_for_changed_files 'node x-pack/plugins/event_log/scripts/create_schemas.js' false 'Follow the directions in x-pack/plugins/event_log/generated/README.md to make schema changes for the event log.'
check_for_changed_files 'node x-pack/platform/plugins/shared/event_log/scripts/create_schemas.js' false 'Follow the directions in x-pack/platform/plugins/shared/event_log/generated/README.md to make schema changes for the event log.'
2 changes: 1 addition & 1 deletion .buildkite/scripts/steps/es_serverless/promote_es_serverless_image.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ EOT

cat << EOF | buildkite-agent pipeline upload
steps:
- label: "Builds Kibana VM images for cache update"
- label: "Update cache for ES serverless image"
trigger: kibana-vm-images
async: true
build:
Expand Down
7 changes: 4 additions & 3 deletions .buildkite/scripts/steps/es_snapshots/promote.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@ ts-node "$(dirname "${0}")/promote_manifest.ts" "$ES_SNAPSHOT_MANIFEST"
if [[ "$BUILDKITE_BRANCH" == "main" ]]; then
echo "--- Trigger agent packer cache pipeline"
ts-node .buildkite/scripts/steps/trigger_pipeline.ts kibana-agent-packer-cache main
cat << EOF | buildkite-agent pipeline upload
fi

cat << EOF | buildkite-agent pipeline upload
steps:
- label: "Builds Kibana VM images for cache update"
- label: "Update cache for ES $BUILDKITE_BRANCH snapshot"
trigger: kibana-vm-images
async: true
build:
env:
IMAGES_CONFIG: "kibana/images.yml"
RETRY: "1"
EOF
fi
2 changes: 1 addition & 1 deletion .buildkite/scripts/steps/functional/fleet_cypress.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export KIBANA_INSTALL_DIR=${KIBANA_BUILD_LOCATION}

echo "--- Fleet Cypress tests (Chrome)"

cd x-pack/plugins/fleet
cd x-pack/platform/plugins/shared/fleet

set +e
yarn cypress:run:reporter; status=$?; yarn cypress_space_awareness:run:reporter; space_status=$?; yarn junit:merge || :; [ "$status" -ne 0 ] && exit $status || [ "$space_status" -ne 0 ] && exit $space_status || exit 0
50 changes: 2 additions & 48 deletions .buildkite/scripts/steps/storybooks/build_and_upload.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,55 +10,9 @@
import { execSync } from 'child_process';
import fs from 'fs';
import path from 'path';
import { storybookAliases } from '../../../../src/dev/storybook/aliases';
import { getKibanaDir } from '#pipeline-utils';

// TODO - how to generate this dynamically?
const STORYBOOKS = [
'ai_assistant',
'apm',
'canvas',
'cases',
'cell_actions',
'chart_icons',
'cloud_security_posture_packages',
'coloring',
'content_management_examples',
'custom_integrations',
'dashboard_enhanced',
'dashboard',
'data',
'esql_editor',
'expression_error',
'expression_image',
'expression_metric',
'expression_repeat_image',
'expression_reveal_image',
'expression_shape',
'expression_tagcloud',
'fleet',
'grouping',
'home',
'infra',
'kibana_react',
'language_documentation_popover',
'lists',
'logs_explorer',
'management',
'observability_ai_assistant',
'observability_inventory',
'observability_shared',
'observability',
'presentation',
'random_sampling',
'security_solution_packages',
'security_solution',
'serverless',
'shared_ux',
'triggers_actions_ui',
'ui_actions_enhanced',
'unified_search',
];

const GITHUB_CONTEXT = 'Build and Publish Storybooks';

const STORYBOOK_DIRECTORY =
Expand All @@ -84,7 +38,7 @@ const ghStatus = (state: string, description: string) =>
const build = () => {
console.log('--- Building Storybooks');

for (const storybook of STORYBOOKS) {
for (const storybook of Object.keys(storybookAliases)) {
exec(`STORYBOOK_BASE_URL=${STORYBOOK_BASE_URL}`, `yarn storybook --site ${storybook}`);
}
};
Expand Down
8 changes: 4 additions & 4 deletions .eslintignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ snapshots.js
# plugin overrides
/src/core/lib/kbn_internal_native_observable
/src/plugins/data/common/es_query/kuery/ast/_generated_/**
/x-pack/plugins/canvas/canvas_plugin
/x-pack/plugins/canvas/shareable_runtime/build
/x-pack/plugins/canvas/storybook/build
/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/**
Expand All @@ -37,7 +37,7 @@ snapshots.js
/packages/kbn-test/src/functional_test_runner/__tests__/fixtures/
/packages/kbn-test/src/functional_test_runner/lib/config/__tests__/fixtures/
/packages/kbn-ui-framework/dist
/packages/kbn-flot-charts/lib
/src/platform/packages/shared/kbn-flot-charts/lib
/packages/kbn-monaco/src/**/antlr
/src/platform/packages/shared/kbn-esql-ast/src/**/antlr

Expand Down
Loading

0 comments on commit c938376

Please sign in to comment.