Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[8.x] Sustainable Kibana Architecture: Move modules owned by @elastic/security-solution (#202851) #204518

Closed
wants to merge 11 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
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/scripts/packer_cache.sh
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
25 changes: 12 additions & 13 deletions .buildkite/scripts/pipelines/pull_request/pipeline.ts
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,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 @@ -244,9 +244,9 @@ const getPipeline = (filename: string, removeSteps = true) => {
/^x-pack\/plugins\/data_views\/common/,
/^x-pack\/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 +255,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 +290,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 Down Expand Up @@ -323,16 +322,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\/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 +351,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 +364,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
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
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ echo -e "\n[Security Solution OpenAPI Code Generation] Endpoint Exceptions Commo
(cd 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
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
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
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ 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)
Expand All @@ -25,7 +25,7 @@ echo -e "\n[Security Solution OpenAPI Bundling] Endpoint Exceptions API\n"
(cd 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
42 changes: 21 additions & 21 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -1103,12 +1103,12 @@ module.exports = {
'x-pack/platform/packages/shared/kbn-elastic-assistant/**/*.{js,mjs,ts,tsx}',
'x-pack/platform/packages/shared/kbn-elastic-assistant-common/**/*.{js,mjs,ts,tsx}',
'x-pack/solutions/security/packages/**/*.{js,mjs,ts,tsx}',
'x-pack/plugins/security_solution/public/**/*.{js,mjs,ts,tsx}',
'x-pack/plugins/security_solution_ess/public/**/*.{js,mjs,ts,tsx}',
'x-pack/plugins/security_solution_serverless/public/**/*.{js,mjs,ts,tsx}',
'x-pack/plugins/security_solution/common/**/*.{js,mjs,ts,tsx}',
'x-pack/plugins/security_solution_ess/common/**/*.{js,mjs,ts,tsx}',
'x-pack/plugins/security_solution_serverless/common/**/*.{js,mjs,ts,tsx}',
'x-pack/solutions/security/plugins/security_solution/public/**/*.{js,mjs,ts,tsx}',
'x-pack/solutions/security/plugins/security_solution_ess/public/**/*.{js,mjs,ts,tsx}',
'x-pack/solutions/security/plugins/security_solution_serverless/public/**/*.{js,mjs,ts,tsx}',
'x-pack/solutions/security/plugins/security_solution/common/**/*.{js,mjs,ts,tsx}',
'x-pack/solutions/security/plugins/security_solution_ess/common/**/*.{js,mjs,ts,tsx}',
'x-pack/solutions/security/plugins/security_solution_serverless/common/**/*.{js,mjs,ts,tsx}',
'x-pack/solutions/security/plugins/timelines/public/**/*.{js,mjs,ts,tsx}',
'x-pack/solutions/security/plugins/timelines/common/**/*.{js,mjs,ts,tsx}',
'x-pack/plugins/cases/public/**/*.{js,mjs,ts,tsx}',
Expand Down Expand Up @@ -1141,9 +1141,9 @@ module.exports = {
'x-pack/platform/packages/shared/kbn-elastic-assistant-common/**/*.{ts,tsx}',
'x-pack/platform/packages/shared/kbn-langchain/**/*.{ts,tsx}',
'x-pack/solutions/security/packages/**/*.{ts,tsx}',
'x-pack/plugins/security_solution/**/*.{ts,tsx}',
'x-pack/plugins/security_solution_ess/**/*.{ts,tsx}',
'x-pack/plugins/security_solution_serverless/**/*.{ts,tsx}',
'x-pack/solutions/security/plugins/security_solution/**/*.{ts,tsx}',
'x-pack/solutions/security/plugins/security_solution_ess/**/*.{ts,tsx}',
'x-pack/solutions/security/plugins/security_solution_serverless/**/*.{ts,tsx}',
'x-pack/solutions/security/plugins/timelines/**/*.{ts,tsx}',
'x-pack/plugins/cases/**/*.{ts,tsx}',
'src/platform/packages/shared/kbn-cell-actions/**/*.{js,mjs,ts,tsx}',
Expand All @@ -1156,9 +1156,9 @@ module.exports = {
'x-pack/platform/packages/shared/kbn-elastic-assistant-common/**/*.{test,mock,test_helper}.{ts,tsx}',
'x-pack/platform/packages/shared/kbn-langchain/**/*.{test,mock,test_helper}.{ts,tsx}',
'x-pack/solutions/security/packages/**/*.{test,mock,test_helper}.{ts,tsx}',
'x-pack/plugins/security_solution/**/*.{test,mock,test_helper}.{ts,tsx}',
'x-pack/plugins/security_solution_ess/**/*.{test,mock,test_helper}.{ts,tsx}',
'x-pack/plugins/security_solution_serverless/**/*.{test,mock,test_helper}.{ts,tsx}',
'x-pack/solutions/security/plugins/security_solution/**/*.{test,mock,test_helper}.{ts,tsx}',
'x-pack/solutions/security/plugins/security_solution_ess/**/*.{test,mock,test_helper}.{ts,tsx}',
'x-pack/solutions/security/plugins/security_solution_serverless/**/*.{test,mock,test_helper}.{ts,tsx}',
'x-pack/solutions/security/plugins/timelines/**/*.{test,mock,test_helper}.{ts,tsx}',
'x-pack/plugins/cases/**/*.{test,mock,test_helper}.{ts,tsx}',
'src/platform/packages/shared/kbn-cell-actions/**/*.{test,mock,test_helper}.{ts,tsx}',
Expand All @@ -1177,9 +1177,9 @@ module.exports = {
'x-pack/platform/packages/shared/kbn-elastic-assistant-common/**/*.{ts,tsx}',
'x-pack/platform/packages/shared/kbn-langchain/**/*.{ts,tsx}',
'x-pack/solutions/security/packages/**/*.{ts,tsx}',
'x-pack/plugins/security_solution/**/*.{ts,tsx}',
'x-pack/plugins/security_solution_ess/**/*.{ts,tsx}',
'x-pack/plugins/security_solution_serverless/**/*.{ts,tsx}',
'x-pack/solutions/security/plugins/security_solution/**/*.{ts,tsx}',
'x-pack/solutions/security/plugins/security_solution_ess/**/*.{ts,tsx}',
'x-pack/solutions/security/plugins/security_solution_serverless/**/*.{ts,tsx}',
'x-pack/solutions/security/plugins/timelines/**/*.{ts,tsx}',
'x-pack/plugins/cases/**/*.{ts,tsx}',
'src/platform/packages/shared/kbn-cell-actions/**/*.{ts,tsx}',
Expand Down Expand Up @@ -1211,9 +1211,9 @@ module.exports = {
'x-pack/platform/packages/shared/kbn-elastic-assistant-common/**/*.{js,mjs,ts,tsx}',
'x-pack/platform/packages/shared/kbn-langchain/**/*.{js,mjs,ts,tsx}',
'x-pack/solutions/security/packages/**/*.{js,mjs,ts,tsx}',
'x-pack/plugins/security_solution/**/*.{js,mjs,ts,tsx}',
'x-pack/plugins/security_solution_ess/**/*.{js,mjs,ts,tsx}',
'x-pack/plugins/security_solution_serverless/**/*.{js,mjs,ts,tsx}',
'x-pack/solutions/security/plugins/security_solution/**/*.{js,mjs,ts,tsx}',
'x-pack/solutions/security/plugins/security_solution_ess/**/*.{js,mjs,ts,tsx}',
'x-pack/solutions/security/plugins/security_solution_serverless/**/*.{js,mjs,ts,tsx}',
'x-pack/solutions/security/plugins/timelines/**/*.{js,mjs,ts,tsx}',
'x-pack/plugins/cases/**/*.{js,mjs,ts,tsx}',
'x-pack/solutions/security/packages/data-stream-adapter/**/*.{js,mjs,ts,tsx}',
Expand Down Expand Up @@ -1311,9 +1311,9 @@ module.exports = {
files: [
'x-pack/plugins/cases/**/*.{js,mjs,ts,tsx}',
'x-pack/solutions/security/plugins/ecs_data_quality_dashboard/**/*.{js,mjs,ts,tsx}',
'x-pack/plugins/security_solution/**/*.{js,mjs,ts,tsx}',
'x-pack/plugins/security_solution_ess/**/*.{js,mjs,ts,tsx}',
'x-pack/plugins/security_solution_serverless/**/*.{js,mjs,ts,tsx}',
'x-pack/solutions/security/plugins/security_solution/**/*.{js,mjs,ts,tsx}',
'x-pack/solutions/security/plugins/security_solution_ess/**/*.{js,mjs,ts,tsx}',
'x-pack/solutions/security/plugins/security_solution_serverless/**/*.{js,mjs,ts,tsx}',
'x-pack/solutions/security/packages/data-stream-adapter/**/*.{js,mjs,ts,tsx}',
'x-pack/solutions/security/packages/features/**/*.{js,mjs,ts,tsx}',
'x-pack/solutions/security/packages/navigation/**/*.{js,mjs,ts,tsx}',
Expand Down
2 changes: 1 addition & 1 deletion .github/codeql/codeql-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ paths-ignore:
- x-pack/plugins/observability_solution/*/scripts
- x-pack/platform/plugins/shared/osquery/scripts
- x-pack/plugins/rule_registry/scripts
- x-pack/plugins/security_solution/scripts
- x-pack/solutions/security/plugins/security_solution/scripts
- x-pack/solutions/security/plugins/threat_intelligence/scripts
- x-pack/scripts
- x-pack/test
8 changes: 4 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,10 @@ x-pack/platform/plugins/shared/osquery/cypress.config.d.ts
x-pack/platform/plugins/shared/osquery/cypress.config.js
x-pack/plugins/enterprise_search/cypress.config.d.ts
x-pack/plugins/enterprise_search/cypress.config.js
x-pack/plugins/security_solution/public/management/cypress.config.d.ts
x-pack/plugins/security_solution/public/management/cypress.config.js
x-pack/plugins/security_solution/public/management/cypress_endpoint.config.d.ts
x-pack/plugins/security_solution/public/management/cypress_endpoint.config.js
x-pack/solutions/security/plugins/security_solution/public/management/cypress.config.d.ts
x-pack/solutions/security/plugins/security_solution/public/management/cypress.config.js
x-pack/solutions/security/plugins/security_solution/public/management/cypress_endpoint.config.d.ts
x-pack/solutions/security/plugins/security_solution/public/management/cypress_endpoint.config.js

# release notes script output
report.csv
Expand Down
6 changes: 3 additions & 3 deletions docs/developer/plugin-list.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -864,16 +864,16 @@ to understand why a search request might be slow.
Kibana.


|{kib-repo}blob/{branch}/x-pack/plugins/security_solution/README.md[securitySolution]
|{kib-repo}blob/{branch}/x-pack/solutions/security/plugins/security_solution/README.md[securitySolution]
|Welcome to the Kibana Security Solution plugin! This README will go over getting started with development and testing.


|{kib-repo}blob/{branch}/x-pack/plugins/security_solution_ess/README.md[securitySolutionEss]
|{kib-repo}blob/{branch}/x-pack/solutions/security/plugins/security_solution_ess/README.md[securitySolutionEss]
|The security_solution_ess plugin is an internal plugin for Kibana's Security Solution, designed to encapsulate ESS-specific logic.
This plugin is only enabled when the application is built for stateful deployments (ESS or on-prem), keeping the main security_solution plugin clean and agnostic of the offering model.


|{kib-repo}blob/{branch}/x-pack/plugins/security_solution_serverless/README.md[securitySolutionServerless]
|{kib-repo}blob/{branch}/x-pack/solutions/security/plugins/security_solution_serverless/README.md[securitySolutionServerless]
|The security_solution_serverless plugin is an internal plugin for Kibana's Security Solution, designed to encapsulate serverless-specific logic.
This plugin is only enabled when the application is built for serverless project, keeping the main security_solution plugin clean and agnostic of the offering model.

Expand Down
2 changes: 1 addition & 1 deletion oas_docs/scripts/merge_ess_oas.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const { REPO_ROOT } = require('@kbn/repo-info');
`${REPO_ROOT}/x-pack/plugins/observability_solution/slo/docs/openapi/slo/bundled.yaml`,

// Security solution
`${REPO_ROOT}/x-pack/plugins/security_solution/docs/openapi/ess/*.schema.yaml`,
`${REPO_ROOT}/x-pack/solutions/security/plugins/security_solution/docs/openapi/ess/*.schema.yaml`,
`${REPO_ROOT}/packages/kbn-securitysolution-lists-common/docs/openapi/ess/*.schema.yaml`,
`${REPO_ROOT}/packages/kbn-securitysolution-exceptions-common/docs/openapi/ess/*.schema.yaml`,
`${REPO_ROOT}/packages/kbn-securitysolution-endpoint-exceptions-common/docs/openapi/ess/*.schema.yaml`,
Expand Down
Loading
Loading