Skip to content

Commit 02af036

Browse files
mattkimemattkime
authored
Merge branch 'main' into data_views_support_rollups_with_aliases_v9
2 parents cbfe3ed + 85baab2 commit 02af036

5,266 files changed

Lines changed: 115022 additions & 117638 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: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,13 @@ enabled:
8888
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_delete/basic_license_essentials_tier/configs/serverless.config.ts
8989
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_import_export/trial_license_complete_tier/configs/serverless.config.ts
9090
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_import_export/basic_license_essentials_tier/configs/serverless.config.ts
91+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_import_export/import_non_customized_prebuilt_rules/feature_enabled/configs/serverless_essentials_tier.config.ts
92+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_import_export/import_non_customized_prebuilt_rules/feature_disabled/configs/serverless_feature_flag_disabled.config.ts
93+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_import_export/import_customized_prebuilt_rules/feature_enabled/configs/serverless_complete_tier.config.ts
94+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_import_export/import_customized_prebuilt_rules/feature_disabled/configs/serverless_essentials_tier.config.ts
95+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_import_export/import_customized_prebuilt_rules/feature_disabled/configs/serverless_feature_flag_disabled.config.ts
96+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_import_export/export_prebuilt_rules/feature_enabled/configs/serverless_essentials_tier.config.ts
97+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_import_export/export_prebuilt_rules/feature_disabled/configs/serverless_feature_flag_disabled.config.ts
9198
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_management/basic_license_essentials_tier/configs/serverless.config.ts
9299
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_management/trial_license_complete_tier/configs/serverless.config.ts
93100
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_read/trial_license_complete_tier/configs/serverless.config.ts

‎.buildkite/ftr_security_stateful_configs.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,13 @@ enabled:
7070
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_import_export/trial_license_complete_tier/configs/ess.config.ts
7171
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_import_export/basic_license_essentials_tier/configs/ess.config.ts
7272
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_management/basic_license_essentials_tier/configs/ess.config.ts
73+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_import_export/import_non_customized_prebuilt_rules/feature_enabled/configs/ess_basic_license.config.ts
74+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_import_export/import_non_customized_prebuilt_rules/feature_disabled/configs/ess_feature_flag_disabled.config.ts
75+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_import_export/import_customized_prebuilt_rules/feature_enabled/configs/ess_enterprise_license.config.ts
76+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_import_export/import_customized_prebuilt_rules/feature_disabled/configs/ess_basic_license.config.ts
77+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_import_export/import_customized_prebuilt_rules/feature_disabled/configs/ess_feature_flag_disabled.config.ts
78+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_import_export/export_prebuilt_rules/feature_enabled/configs/ess_basic_license.config.ts
79+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_import_export/export_prebuilt_rules/feature_disabled/configs/ess_feature_flag_disabled.config.ts
7380
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_management/trial_license_complete_tier/configs/ess.config.ts
7481
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_read/trial_license_complete_tier/configs/ess.config.ts
7582
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_read/basic_license_essentials_tier/configs/ess.config.ts

‎.buildkite/pipeline-resource-definitions/kibana-es-snapshots.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,6 @@ spec:
6868
cronline: 0 22 * * * America/New_York
6969
message: Daily build
7070
branch: '8.16'
71-
Daily build (8.15):
72-
cronline: 0 22 * * * America/New_York
73-
message: Daily build
74-
branch: '8.15'
7571
Daily build (7.17):
7672
cronline: 0 20 * * * America/New_York
7773
message: Daily build

‎.buildkite/pipeline-resource-definitions/kibana-vm-images.yml‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,24 @@ spec:
2727
provider_settings:
2828
trigger_mode: none
2929
schedules:
30-
daily kibana image build:
30+
daily kibana base image build:
3131
branch: main
3232
cronline: '0 0 * * *'
3333
env:
34-
IMAGES_CONFIG: kibana/images.yml
35-
message: Builds Kibana VM images daily
34+
IMAGES_CONFIG: kibana/base_image.yml
35+
message: Builds Kibana VM base image daily
36+
daily kibana cache layer build:
37+
branch: main
38+
cronline: '0 1 * * *' # make sure this runs after the daily kibana base image build
39+
env:
40+
IMAGES_CONFIG: kibana/image_cache.yml
41+
BASE_IMAGES_CONFIG: 'core/images.yml,kibana/base_image.yml'
42+
message: Builds Kibana VM cache warmup daily
3643
daily kibana fips image build:
3744
branch: main
38-
cronline: '0 4 * * *' # make sure this runs after the daily kibana image build
45+
cronline: '0 4 * * *' # make sure this runs after the daily kibana cache image build
3946
env:
40-
BASE_IMAGES_CONFIG: 'core/images.yml,kibana/images.yml'
47+
BASE_IMAGES_CONFIG: 'core/images.yml,kibana/base_image.yml,kibana/image_cache.yml'
4148
IMAGES_CONFIG: kibana/fips.yml
4249
message: Builds Kibana FIPS VM image daily
4350
teams:

‎.buildkite/scripts/steps/es_serverless/promote_es_serverless_image.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ steps:
7777
async: true
7878
build:
7979
env:
80-
IMAGES_CONFIG: "kibana/images.yml"
80+
IMAGES_CONFIG: 'kibana/image_cache.yml'
81+
BASE_IMAGES_CONFIG: 'core/images.yml,kibana/base_image.yml'
8182
RETRY: "1"
8283
EOF

‎.buildkite/scripts/steps/es_snapshots/promote.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ steps:
2525
async: true
2626
build:
2727
env:
28-
IMAGES_CONFIG: "kibana/images.yml"
28+
IMAGES_CONFIG: 'kibana/image_cache.yml'
29+
BASE_IMAGES_CONFIG: 'core/images.yml,kibana/base_image.yml'
2930
RETRY: "1"
3031
EOF

‎.buildkite/scripts/steps/fleet/promote_package_registry.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ steps:
1414
async: true
1515
build:
1616
env:
17-
IMAGES_CONFIG: "kibana/images.yml"
17+
IMAGES_CONFIG: 'kibana/image_cache.yml'
18+
BASE_IMAGES_CONFIG: 'core/images.yml,kibana/base_image.yml'
1819
RETRY: "1"
1920
EOF
2021
else

‎.eslintrc.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1089,6 +1089,7 @@ module.exports = {
10891089
'x-pack/platform/plugins/private/transform/**/*.{js,mjs,ts,tsx}',
10901090
'x-pack/platform/packages/shared/ml/**/*.{js,mjs,ts,tsx}',
10911091
'x-pack/platform/packages/private/ml/**/*.{js,mjs,ts,tsx}',
1092+
'x-pack/platform/plugins/private/file_upload/**/*.{js,mjs,ts,tsx}',
10921093
],
10931094
rules: {
10941095
'@typescript-eslint/consistent-type-imports': 'error',
@@ -1642,10 +1643,11 @@ module.exports = {
16421643
*/
16431644
{
16441645
files: [
1645-
'src/platform/plugins/shared/discover/**/*.{ts,tsx}',
1646-
'src/platform/plugins/shared/saved_search/**/*.{ts,tsx}',
1646+
'src/platform/plugins/shared/discover/**/*.{js,mjs,ts,tsx}',
1647+
'src/platform/plugins/shared/saved_search/**/*.{js,mjs,ts,tsx}',
16471648
],
16481649
rules: {
1650+
'@typescript-eslint/consistent-type-imports': 'error',
16491651
'@typescript-eslint/no-explicit-any': 'error',
16501652
'@typescript-eslint/ban-ts-comment': [
16511653
'error',

‎.github/CODEOWNERS‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -446,9 +446,9 @@ src/platform/packages/shared/kbn-es-errors @elastic/kibana-core
446446
src/platform/packages/shared/kbn-es-query @elastic/kibana-data-discovery
447447
src/platform/packages/shared/kbn-es-types @elastic/kibana-core @elastic/obs-knowledge-team
448448
src/platform/packages/shared/kbn-esql-ast @elastic/kibana-esql
449+
src/platform/packages/shared/kbn-esql-types @elastic/kibana-esql
449450
src/platform/packages/shared/kbn-esql-utils @elastic/kibana-esql
450451
src/platform/packages/shared/kbn-esql-validation-autocomplete @elastic/kibana-esql
451-
src/platform/packages/shared/kbn-esql-variables-types @elastic/kibana-esql
452452
src/platform/packages/shared/kbn-event-annotation-common @elastic/kibana-visualizations
453453
src/platform/packages/shared/kbn-event-annotation-components @elastic/kibana-visualizations
454454
src/platform/packages/shared/kbn-expect @elastic/kibana-operations @elastic/appex-qa
@@ -700,7 +700,7 @@ src/platform/plugins/shared/ui_actions @elastic/appex-sharedux
700700
src/platform/plugins/shared/ui_actions_enhanced @elastic/appex-sharedux
701701
src/platform/plugins/shared/unified_doc_viewer @elastic/kibana-data-discovery
702702
src/platform/plugins/shared/unified_histogram @elastic/kibana-data-discovery
703-
src/platform/plugins/shared/unified_search @elastic/kibana-visualizations
703+
src/platform/plugins/shared/unified_search @elastic/kibana-presentation
704704
src/platform/plugins/shared/usage_collection @elastic/kibana-core
705705
src/platform/plugins/shared/vis_types/timeseries @elastic/kibana-visualizations
706706
src/platform/plugins/shared/visualizations @elastic/kibana-visualizations
@@ -2503,10 +2503,13 @@ x-pack/solutions/security/plugins/security_solution/server/assistant/tools/defen
25032503
/x-pack/solutions/security/plugins/security_solution_serverless/public/upselling/sections/endpoint_management @elastic/security-defend-workflows
25042504
/x-pack/solutions/security/plugins/security_solution_serverless/public/upselling/pages/endpoint_management @elastic/security-defend-workflows
25052505
/x-pack/solutions/security/plugins/security_solution_serverless/server/endpoint @elastic/security-defend-workflows
2506+
/x-pack/solutions/security/plugins/security_solution_serverless/server/ai4soc @elastic/security-defend-workflows
25062507
x-pack/platform/packages/shared/kbn-elastic-assistant-common/impl/schemas/defend_insights @elastic/security-defend-workflows
25072508
x-pack/plugins/elastic_assistant/server/__mocks__/defend_insights_schema.mock.ts @elastic/security-defend-workflows
25082509
x-pack/plugins/elastic_assistant/server/ai_assistant_data_clients/defend_insights @elastic/security-defend-workflows
25092510
x-pack/plugins/elastic_assistant/server/routes/defend_insights @elastic/security-defend-workflows
2511+
x-pack/solutions/security/plugins/elastic_assistant/server/lib/defend_insights @elastic/security-defend-workflows
2512+
x-pack/solutions/security/plugins/elastic_assistant/server/routes/defend_insights @elastic/security-defend-workflows
25102513
/x-pack/solutions/security/plugins/security_solution/public/common/components/response_actions @elastic/security-defend-workflows
25112514
/x-pack/solutions/security/plugins/security_solution_serverless/public/upselling/pages/osquery_automated_response_actions.tsx @elastic/security-defend-workflows
25122515

‎.github/codeql/codeql-config.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ paths-ignore:
2020
- '**/kbn-scout-*'
2121
- '**/mocks.*'
2222
- '**/mocks/**'
23+
- '**/stub/**'
2324
- '**/scripts/**'
2425
- '**/storybook/**'
2526
- '**/test_helpers/**'

0 commit comments

Comments
 (0)