Skip to content

Commit

Permalink
Merge branch 'main' into data-streams/bulk-edit-data-retention
Browse files Browse the repository at this point in the history
  • Loading branch information
@ElenaStoeva
ElenaStoeva authored Dec 18, 2024
2 parents 208bc58 + d5af2e0 commit 1c9ecd7
Show file tree
Hide file tree
Showing 15,066 changed files with 81,106 additions and 92,561 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .buildkite/ftr_oblt_stateful_configs.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ disabled:
- x-pack/solutions/observability/plugins/synthetics/e2e/synthetics/synthetics_run.ts
- x-pack/solutions/observability/plugins/exploratory_view/e2e/synthetics_run.ts
- x-pack/solutions/observability/plugins/ux/e2e/synthetics_run.ts
- x-pack/plugins/observability_solution/slo/e2e/synthetics_run.ts
- x-pack/solutions/observability/plugins/slo/e2e/synthetics_run.ts

defaultQueue: 'n2-4-spot'
enabled:
Expand Down
12 changes: 12 additions & 0 deletions .buildkite/pipelines/pull_request/renovate.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
steps:
- command: .buildkite/scripts/steps/renovate.sh
label: 'Renovate validation'
agents:
machineType: n2-highcpu-8
preemptible: true
key: renovate_validation
timeout_in_minutes: 60
retry:
automatic:
- exit_status: '-1'
limit: 3
2 changes: 1 addition & 1 deletion .buildkite/pipelines/pull_request/slo_plugin_e2e.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ steps:
- check_oas_snapshot
timeout_in_minutes: 30
artifact_paths:
- 'x-pack/plugins/observability_solution/slo/e2e/.journeys/**/*'
- 'x-pack/solutions/observability/plugins/slo/e2e/.journeys/**/*'
retry:
automatic:
- exit_status: '-1'
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/scripts/packer_cache.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ for version in $(cat versions.json | jq -r '.versions[].version'); do
done

for version in $(cat versions.json | jq -r '.versions[].version'); do
node x-pack/plugins/security_solution/scripts/endpoint/agent_downloader --version "$version"
node x-pack/solutions/security/plugins/security_solution/scripts/endpoint/agent_downloader --version "$version"
done
46 changes: 27 additions & 19 deletions .buildkite/scripts/pipelines/pull_request/pipeline.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,15 @@ const getPipeline = (filename: string, removeSteps = true) => {
}

pipeline.push(getAgentImageConfig({ returnYaml: true }));

const onlyRunQuickChecks = await areChangesSkippable([/^renovate\.json$/], REQUIRED_PATHS);
if (onlyRunQuickChecks) {
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/renovate.yml', false));

console.log([...new Set(pipeline)].join('\n'));
return;
}

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

if (await doAnyChangesMatch([/^packages\/kbn-handlebars/])) {
Expand Down Expand Up @@ -224,7 +233,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
if (
(await doAnyChangesMatch([
/^packages\/kbn-securitysolution-.*/,
/^x-pack\/plugins\/security_solution/,
/^x-pack\/solutions\/security\/plugins\/security_solution/,
/^x-pack\/test\/defend_workflows_cypress/,
/^x-pack\/test\/security_solution_cypress/,
/^fleet_packages\.json/,
Expand All @@ -242,11 +251,11 @@ const getPipeline = (filename: string, removeSteps = true) => {
/^packages\/kbn-securitysolution-.*/,
/^x-pack\/plugins\/alerting/,
/^x-pack\/plugins\/data_views\/common/,
/^x-pack\/plugins\/lists/,
/^x-pack\/solutions\/security\/plugins\/lists/,
/^x-pack\/plugins\/rule_registry\/common/,
/^x-pack\/plugins\/security_solution/,
/^x-pack\/plugins\/security_solution_ess/,
/^x-pack\/plugins\/security_solution_serverless/,
/^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\/solutions\/security\/plugins\/timelines/,
/^x-pack\/plugins\/triggers_actions_ui\/public\/application\/sections\/action_connector_form/,
Expand All @@ -255,7 +264,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
/^x-pack\/plugins\/triggers_actions_ui\/server\/connector_types\/bedrock/,
/^x-pack\/plugins\/usage_collection\/public/,
/^x-pack\/solutions\/security\/plugins\/elastic_assistant/,
/^x-pack\/packages\/security-solution/,
/^x-pack\/solutions\/security\/packages/,
/^x-pack\/platform\/packages\/shared\/kbn-elastic-assistant/,
/^x-pack\/platform\/packages\/shared\/kbn-elastic-assistant-common/,
/^x-pack\/test\/functional\/es_archives\/security_solution/,
Expand Down Expand Up @@ -290,7 +299,6 @@ const getPipeline = (filename: string, removeSteps = true) => {
/^packages\/kbn-es-query/,
/^packages\/kbn-i18n/,
/^packages\/kbn-i18n-react/,
/^x-pack\/solutions\/security\/packages\/expandable-flyout/,
/^packages\/kbn-grouping/,
/^packages\/kbn-resizable-layout/,
/^packages\/kbn-rison/,
Expand All @@ -299,10 +307,10 @@ const getPipeline = (filename: string, removeSteps = true) => {
/^packages\/kbn-search-types/,
/^packages\/kbn-securitysolution-.*/,
/^src\/platform\/packages\/shared\/kbn-securitysolution-ecs/,
/^packages\/kbn-securitysolution-io-ts-alerting-types/,
/^packages\/kbn-securitysolution-io-ts-list-types/,
/^packages\/kbn-securitysolution-list-hooks/,
/^packages\/kbn-securitysolution-t-grid/,
/^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/,
/^packages\/kbn-ui-theme/,
/^packages\/kbn-utility-types/,
/^packages\/react/,
Expand All @@ -323,16 +331,16 @@ const getPipeline = (filename: string, removeSteps = true) => {
/^src\/plugins\/unified_search/,
/^x-pack\/platform\/packages\/shared\/kbn-elastic-assistant/,
/^x-pack\/platform\/packages\/shared\/kbn-elastic-assistant-common/,
/^x-pack\/packages\/security-solution/,
/^x-pack\/solutions\/security\/packages/,
/^x-pack\/plugins\/alerting/,
/^x-pack\/plugins\/cases/,
/^x-pack\/plugins\/data_views\/common/,
/^x-pack\/solutions\/security\/plugins\/elastic_assistant/,
/^x-pack\/plugins\/lists/,
/^x-pack\/solutions\/security\/plugins\/lists/,
/^x-pack\/plugins\/rule_registry\/common/,
/^x-pack\/plugins\/security_solution/,
/^x-pack\/plugins\/security_solution_ess/,
/^x-pack\/plugins\/security_solution_serverless/,
/^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\/solutions\/security\/plugins\/threat_intelligence/,
/^x-pack\/solutions\/security\/plugins\/timelines/,
Expand All @@ -352,7 +360,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
((await doAnyChangesMatch([
/^x-pack\/platform\/plugins\/shared\/osquery/,
/^x-pack\/test\/osquery_cypress/,
/^x-pack\/plugins\/security_solution/,
/^x-pack\/solutions\/security\/plugins\/security_solution/,
])) ||
GITHUB_PR_LABELS.includes('ci:all-cypress-suites')) &&
!GITHUB_PR_LABELS.includes('ci:skip-cypress-osquery')
Expand All @@ -365,8 +373,8 @@ const getPipeline = (filename: string, removeSteps = true) => {
if (
(await doAnyChangesMatch([
/^x-pack\/packages\/kbn-cloud-security-posture/,
/^x-pack\/plugins\/cloud_security_posture/,
/^x-pack\/plugins\/security_solution/,
/^x-pack\/solutions\/security\/plugins\/cloud_security_posture/,
/^x-pack\/solutions\/security\/plugins\/security_solution/,
/^x-pack\/test\/security_solution_cypress/,
])) ||
GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
Expand Down
2 changes: 1 addition & 1 deletion ...es/security_solution_quality_gate/edr_workflows/mki_security_solution_defend_workflows.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ buildkite-agent meta-data set "${BUILDKITE_JOB_ID}_is_test_execution_step" "true

source .buildkite/scripts/pipelines/security_solution_quality_gate/prepare_vault_entries.sh

cd x-pack/plugins/security_solution
cd x-pack/solutions/security/plugins/security_solution
set +e

export BK_ANALYTICS_API_KEY=$(vault_get security-solution-quality-gate serverless-cypress-defend-workflows)
Expand Down
8 changes: 4 additions & 4 deletions .buildkite/scripts/steps/code_generation/security_solution_codegen.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ echo -e "\n[Security Solution OpenAPI Code Generation] OpenAPI Common Package\n"
(cd packages/kbn-openapi-common && yarn openapi:generate)

echo -e "\n[Security Solution OpenAPI Code Generation] Lists Common Package\n"
(cd packages/kbn-securitysolution-lists-common && yarn openapi:generate)
(cd x-pack/solutions/security/packages/kbn-securitysolution-lists-common && yarn openapi:generate)

echo -e "\n[Security Solution OpenAPI Code Generation] Exceptions Common Package\n"
(cd packages/kbn-securitysolution-exceptions-common && yarn openapi:generate)
(cd x-pack/solutions/security/packages/kbn-securitysolution-exceptions-common && yarn openapi:generate)

echo -e "\n[Security Solution OpenAPI Code Generation] Endpoint Exceptions Common Package\n"
(cd packages/kbn-securitysolution-endpoint-exceptions-common && yarn openapi:generate)
(cd x-pack/solutions/security/packages/kbn-securitysolution-endpoint-exceptions-common && yarn openapi:generate)

echo -e "\n[Security Solution OpenAPI Code Generation] Security Solution Plugin\n"
(cd x-pack/plugins/security_solution && yarn openapi:generate)
(cd x-pack/solutions/security/plugins/security_solution && yarn openapi:generate)

check_for_changed_files "yarn openapi:generate" true
2 changes: 1 addition & 1 deletion .buildkite/scripts/steps/functional/defend_workflows.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 "--- Defend Workflows Cypress tests"

cd x-pack/plugins/security_solution
cd x-pack/solutions/security/plugins/security_solution

set +e
BK_ANALYTICS_API_KEY=$(vault_get security-solution-ci defend-workflows-bk-api-key)
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/scripts/steps/functional/defend_workflows_burn.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ buildkite-agent meta-data set "${BUILDKITE_JOB_ID}_is_test_execution_step" 'fals

echo "--- Defend Workflows Cypress tests, burning changed specs (Chrome)"

yarn --cwd x-pack/plugins/security_solution cypress:changed-specs-only
yarn --cwd x-pack/solutions/security/plugins/security_solution cypress:changed-specs-only
2 changes: 1 addition & 1 deletion .buildkite/scripts/steps/functional/defend_workflows_serverless.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 "--- Defend Workflows Cypress tests on Serverless"

cd x-pack/plugins/security_solution
cd x-pack/solutions/security/plugins/security_solution

set +e
BK_ANALYTICS_API_KEY=$(vault_get security-solution-ci defend-workflows-bk-api-key)
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/scripts/steps/functional/defend_workflows_serverless_burn.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ buildkite-agent meta-data set "${BUILDKITE_JOB_ID}_is_test_execution_step" 'fals

echo "--- Defend Workflows Cypress tests, burning changed specs (Chrome)"

yarn --cwd x-pack/plugins/security_solution cypress:dw:serverless:changed-specs-only
yarn --cwd x-pack/solutions/security/plugins/security_solution cypress:dw:serverless:changed-specs-only
2 changes: 1 addition & 1 deletion .buildkite/scripts/steps/functional/slo_plugin_e2e.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ echo "--- SLO @elastic/synthetics Tests"

cd "$XPACK_DIR"

node plugins/observability_solution/slo/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}
node solutions/observability/plugins/slo/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}
14 changes: 7 additions & 7 deletions .buildkite/scripts/steps/openapi_bundling/security_solution_openapi_bundling.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,25 @@ source .buildkite/scripts/common/util.sh
echo --- Security Solution OpenAPI Bundling

echo -e "\n[Security Solution OpenAPI Bundling] Detections API\n"
(cd x-pack/plugins/security_solution && yarn openapi:bundle:detections)
(cd x-pack/solutions/security/plugins/security_solution && yarn openapi:bundle:detections)

echo -e "\n[Security Solution OpenAPI Bundling] Timeline API\n"
(cd x-pack/plugins/security_solution && yarn openapi:bundle:timeline)
(cd x-pack/solutions/security/plugins/security_solution && yarn openapi:bundle:timeline)

echo -e "\n[Security Solution OpenAPI Bundling] Entity Analytics API\n"
(cd x-pack/plugins/security_solution && yarn openapi:bundle:entity-analytics)
(cd x-pack/solutions/security/plugins/security_solution && yarn openapi:bundle:entity-analytics)

echo -e "\n[Security Solution OpenAPI Bundling] Lists API\n"
(cd packages/kbn-securitysolution-lists-common && yarn openapi:bundle)
(cd x-pack/solutions/security/packages/kbn-securitysolution-lists-common && yarn openapi:bundle)

echo -e "\n[Security Solution OpenAPI Bundling] Exceptions API\n"
(cd packages/kbn-securitysolution-exceptions-common && yarn openapi:bundle)
(cd x-pack/solutions/security/packages/kbn-securitysolution-exceptions-common && yarn openapi:bundle)

echo -e "\n[Security Solution OpenAPI Bundling] Endpoint Exceptions API\n"
(cd packages/kbn-securitysolution-endpoint-exceptions-common && yarn openapi:bundle)
(cd x-pack/solutions/security/packages/kbn-securitysolution-endpoint-exceptions-common && yarn openapi:bundle)

echo -e "\n[Security Solution OpenAPI Bundling] Endpoint Management API\n"
(cd x-pack/plugins/security_solution && yarn openapi:bundle:endpoint-management)
(cd x-pack/solutions/security/plugins/security_solution && yarn openapi:bundle:endpoint-management)

echo -e "\n[Security Solution OpenAPI Bundling] Elastic Assistant API\n"
(cd x-pack/platform/packages/shared/kbn-elastic-assistant-common && yarn openapi:bundle)
Expand Down
6 changes: 6 additions & 0 deletions .buildkite/scripts/steps/renovate.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env bash

set -euo pipefail

echo '--- Renovate: validation'
.buildkite/scripts/steps/checks/renovate.sh
Loading

0 comments on commit 1c9ecd7

Please sign in to comment.