Skip to content

Commit b50aad8

Browse files
Merge branch 'main' into fix/network-cropped-metrics-issue-210806
2 parents 2642a58 + 9fa4e56 commit b50aad8

3,272 files changed

Lines changed: 49062 additions & 26483 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.buildkite/ftr_security_serverless_configs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ enabled:
7878
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/management/trial_license_complete_tier/configs/serverless.config.ts
7979
- 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
8080
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/prebuilt_rule_customization/customization_enabled/configs/serverless.config.ts
81+
- 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
82+
- 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
8183
- 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
8284
- 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
8385
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_bulk_actions/trial_license_complete_tier/configs/serverless.config.ts

.buildkite/ftr_security_stateful_configs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ enabled:
5959
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/management/trial_license_complete_tier/configs/ess.config.ts
6060
- 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
6161
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/prebuilt_rule_customization/customization_enabled/configs/ess.config.ts
62+
- 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
63+
- 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
6264
- 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
6365
- 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
6466
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_bulk_actions/trial_license_complete_tier/configs/ess.config.ts

.buildkite/scripts/pipelines/pull_request/pipeline.ts

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
9292
if (
9393
(await doAnyChangesMatch([
9494
/^x-pack\/solutions\/observability\/plugins\/apm/,
95-
/^packages\/kbn-apm-synthtrace/,
95+
/^src\/platform\/packages\/shared\/kbn-apm-synthtrace/,
9696
])) ||
9797
GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
9898
) {
@@ -102,7 +102,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
102102
if (
103103
(await doAnyChangesMatch([
104104
/^x-pack\/solutions\/observability\/plugins\/inventory/,
105-
/^packages\/kbn-apm-synthtrace/,
105+
/^src\/platform\/packages\/shared\/kbn-apm-synthtrace/,
106106
])) ||
107107
GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
108108
) {
@@ -236,7 +236,8 @@ const getPipeline = (filename: string, removeSteps = true) => {
236236

237237
if (
238238
(await doAnyChangesMatch([
239-
/^packages\/kbn-securitysolution-.*/,
239+
/^src\/platform\/packages\/shared\/kbn-securitysolution-.*/,
240+
/^x-pack\/solutions\/security\/packages\/kbn-securitysolution-.*/,
240241
/^x-pack\/solutions\/security\/plugins\/security_solution/,
241242
/^x-pack\/test\/defend_workflows_cypress/,
242243
/^x-pack\/test\/security_solution_cypress/,
@@ -252,7 +253,8 @@ const getPipeline = (filename: string, removeSteps = true) => {
252253
if (
253254
(await doAnyChangesMatch([
254255
/^package.json/,
255-
/^packages\/kbn-securitysolution-.*/,
256+
/^src\/platform\/packages\/shared\/kbn-securitysolution-.*/,
257+
/^x-pack\/solutions\/security\/packages\/kbn-securitysolution-.*/,
256258
/^x-pack\/platform\/plugins\/shared\/alerting/,
257259
/^x-pack\/platform\/plugins\/shared\/data_views\/common/,
258260
/^x-pack\/solutions\/security\/plugins\/lists/,
@@ -297,7 +299,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
297299
(await doAnyChangesMatch([
298300
/^package.json/,
299301
/^src\/platform\/packages\/shared\/kbn-discover-utils/,
300-
/^packages\/kbn-doc-links/,
302+
/^src\/platform\/packages\/shared\/kbn-doc-links/,
301303
/^src\/platform\/packages\/shared\/kbn-dom-drag-drop/,
302304
/^src\/platform\/packages\/shared\/kbn-es-query/,
303305
/^src\/platform\/packages\/shared\/kbn-i18n/,
@@ -308,16 +310,17 @@ const getPipeline = (filename: string, removeSteps = true) => {
308310
/^src\/platform\/packages\/shared\/kbn-rule-data-utils/,
309311
/^src\/platform\/packages\/shared\/kbn-safer-lodash-set/,
310312
/^src\/platform\/packages\/shared\/kbn-search-types/,
311-
/^packages\/kbn-securitysolution-.*/,
313+
/^src\/platform\/packages\/shared\/kbn-securitysolution-.*/,
314+
/^x-pack\/solutions\/security\/packages\/kbn-securitysolution-.*/,
312315
/^src\/platform\/packages\/shared\/kbn-securitysolution-ecs/,
313316
/^x-pack\/solutions\/security\/packages\/kbn-securitysolution-io-ts-alerting-types/,
314317
/^x-pack\/solutions\/security\/packages\/kbn-securitysolution-io-ts-list-types/,
315318
/^x-pack\/solutions\/security\/packages\/kbn-securitysolution-list-hooks/,
316319
/^x-pack\/solutions\/security\/packages\/kbn-securitysolution-t-grid/,
317320
/^src\/platform\/packages\/shared\/kbn-ui-theme/,
318321
/^src\/platform\/packages\/shared\/kbn-utility-types/,
319-
/^packages\/react/,
320-
/^packages\/shared-ux/,
322+
/^src\/platform\/packages\/shared\/react/,
323+
/^src\/platform\/packages\/shared\/shared-ux/,
321324
/^src\/core/,
322325
/^src\/platform\/plugins\/shared\/charts/,
323326
/^src\/platform\/plugins\/shared\/controls/,
@@ -362,7 +365,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
362365
(await doAnyChangesMatch([
363366
/^package.json/,
364367
/^src\/platform\/packages\/shared\/kbn-discover-utils/,
365-
/^packages\/kbn-doc-links/,
368+
/^src\/platform\/packages\/shared\/kbn-doc-links/,
366369
/^src\/platform\/packages\/shared\/kbn-dom-drag-drop/,
367370
/^src\/platform\/packages\/shared\/kbn-es-query/,
368371
/^src\/platform\/packages\/shared\/kbn-i18n/,
@@ -373,16 +376,15 @@ const getPipeline = (filename: string, removeSteps = true) => {
373376
/^src\/platform\/packages\/shared\/kbn-rule-data-utils/,
374377
/^src\/platform\/packages\/shared\/kbn-safer-lodash-set/,
375378
/^src\/platform\/packages\/shared\/kbn-search-types/,
376-
/^packages\/kbn-securitysolution-.*/,
377379
/^src\/platform\/packages\/shared\/kbn-securitysolution-ecs/,
378380
/^x-pack\/solutions\/security\/packages\/kbn-securitysolution-io-ts-alerting-types/,
379381
/^x-pack\/solutions\/security\/packages\/kbn-securitysolution-io-ts-list-types/,
380382
/^x-pack\/solutions\/security\/packages\/kbn-securitysolution-list-hooks/,
381383
/^x-pack\/solutions\/security\/packages\/kbn-securitysolution-t-grid/,
382384
/^src\/platform\/packages\/shared\/kbn-ui-theme/,
383385
/^src\/platform\/packages\/shared\/kbn-utility-types/,
384-
/^packages\/react/,
385-
/^packages\/shared-ux/,
386+
/^src\/platform\/packages\/shared\/react/,
387+
/^src\/platform\/packages\/shared\/shared-ux/,
386388
/^src\/core/,
387389
/^src\/platform\/plugins\/shared\/charts/,
388390
/^src\/platform\/plugins\/shared\/controls/,
@@ -458,7 +460,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
458460
(await doAnyChangesMatch([
459461
/^x-pack\/platform\/plugins\/private\/discover_enhanced\/ui_tests/,
460462
/^x-pack\/solutions\/observability\/plugins\/observability_onboarding/,
461-
/^packages\/kbn-scout/,
463+
/^src\/platform\/packages\/shared\/kbn-scout/,
462464
])) ||
463465
GITHUB_PR_LABELS.includes('ci:scout-ui-tests')
464466
) {

.buildkite/scripts/steps/test/jest_parallel.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ echo "+++ ⚠️ WARNING ⚠️"
5151
echo "
5252
console.log(), console.warn(), and console.error() output in jest tests causes a massive amount
5353
of noise on CI without any percevable benefit, so they have been disabled. If you want to log
54-
output in your test temporarily, you can modify 'packages/kbn-test/src/jest/setup/disable_console_logs.js'
54+
output in your test temporarily, you can modify 'src/platform/packages/shared/kbn-test/src/jest/setup/disable_console_logs.js'
5555
"
5656

5757
while read -r config; do

.eslintignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ snapshots.js
3232
/packages/kbn-eslint-config
3333
/packages/kbn-plugin-generator/template
3434
/packages/kbn-generate/templates
35-
/packages/kbn-test/src/functional_test_runner/__tests__/fixtures/
36-
/packages/kbn-test/src/functional_test_runner/lib/config/__tests__/fixtures/
35+
/src/platform/packages/shared/kbn-test/src/functional_test_runner/__tests__/fixtures/
36+
/src/platform/packages/shared/kbn-test/src/functional_test_runner/lib/config/__tests__/fixtures/
3737
/src/platform/packages/shared/kbn-flot-charts/lib
3838
/src/platform/packages/shared/kbn-monaco/src/**/antlr
3939
/src/platform/packages/shared/kbn-esql-ast/src/**/antlr

.eslintrc.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,7 @@ module.exports = {
724724
*/
725725
{
726726
files: [
727-
'packages/kbn-ftr-common-functional-ui-services/services/web_element_wrapper/scroll_into_view_if_necessary.js',
727+
'src/platform/packages/shared/kbn-ftr-common-functional-ui-services/services/web_element_wrapper/scroll_into_view_if_necessary.js',
728728
'**/browser_exec_scripts/**/*.js',
729729
],
730730
rules: {
@@ -1441,13 +1441,13 @@ module.exports = {
14411441
},
14421442
{
14431443
files: [
1444-
'packages/kbn-scout/src/playwright/**/*.ts',
1444+
'src/platform/packages/shared/kbn-scout/src/playwright/**/*.ts',
14451445
'x-pack/solutions/observability/packages/kbn-scout-oblt/src/playwright/**/*.ts',
14461446
'src/platform/plugins/**/ui_tests/**/*.ts',
14471447
'x-pack/platform/plugins/**/ui_tests/**/*.ts',
14481448
'x-pack/solutions/**/plugins/**/ui_tests/**/*.ts',
14491449
],
1450-
excludedFiles: ['packages/kbn-scout/src/playwright/**/*.test.ts'],
1450+
excludedFiles: ['src/platform/packages/shared/kbn-scout/src/playwright/**/*.test.ts'],
14511451
extends: ['plugin:playwright/recommended'],
14521452
plugins: ['playwright'],
14531453
settings: {
@@ -1909,7 +1909,7 @@ module.exports = {
19091909
'test/interactive_setup_functional/**/*.{js,mjs,ts,tsx}',
19101910

19111911
'packages/kbn-mock-idp-plugin/**/*.{js,mjs,ts,tsx}',
1912-
'packages/kbn-mock-idp-utils/**/*.{js,mjs,ts,tsx}',
1912+
'src/platform/packages/private/kbn-mock-idp-utils/**/*.{js,mjs,ts,tsx}',
19131913
'src/platform/packages/shared/kbn-security-hardening/**/*.{js,mjs,ts,tsx}',
19141914
'src/platform/packages/shared/kbn-user-profile-components/**/*.{js,mjs,ts,tsx}',
19151915

@@ -1995,7 +1995,7 @@ module.exports = {
19951995
'src/platform/packages/shared/kbn-config-schema',
19961996
'src/platform/plugins/shared/saved_objects_management/**',
19971997
'src/platform/packages/shared/kbn-analytics/**',
1998-
'packages/kbn-telemetry-tools/**',
1998+
'src/platform/packages/private/kbn-telemetry-tools/**',
19991999
'src/platform/plugins/private/kibana_usage_collection/**',
20002000
'src/platform/plugins/shared/usage_collection/**',
20012001
'src/platform/plugins/shared/telemetry/**',
@@ -2063,7 +2063,8 @@ module.exports = {
20632063
*/
20642064
{
20652065
files: [
2066-
'packages/kbn-{package-*,repo-*,dep-*}/**/*',
2066+
'src/platform/packages/*/kbn-repo-*/**/*',
2067+
'packages/kbn-repo-*/**/*',
20672068
'packages/kbn-validate-next-docs-cli/**/*',
20682069
'packages/kbn-find-used-node-modules/**/*',
20692070
],

0 commit comments

Comments
 (0)