Skip to content

Commit fd1c389

Browse files
animehartanimehart
committed
Merge branch 'update-empty-state-findingspage-integration' of github.com:animehart/kibana into update-empty-state-findingspage-integration
2 parents b11acb7 + b92be36 commit fd1c389

3,602 files changed

Lines changed: 167559 additions & 144162 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_platform_stateful_configs.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ enabled:
7575
- src/platform/test/functional/apps/discover/ccs_compatibility/config.ts
7676
- src/platform/test/functional/apps/discover/embeddable/config.ts
7777
- src/platform/test/functional/apps/discover/esql/config.ts
78+
- src/platform/test/functional/apps/discover/background_search/config.ts
7879
- src/platform/test/functional/apps/discover/group1/config.ts
7980
- src/platform/test/functional/apps/discover/group2_data_grid1/config.ts
8081
- src/platform/test/functional/apps/discover/group2_data_grid2/config.ts
@@ -144,6 +145,8 @@ enabled:
144145
- x-pack/platform/test/alerting_api_integration/security_and_spaces/group4/config.ts
145146
- x-pack/platform/test/alerting_api_integration/security_and_spaces/group5/config.ts
146147
- x-pack/platform/test/alerting_api_integration/security_and_spaces/group6/config.ts
148+
- x-pack/platform/test/alerting_api_integration/security_and_spaces/group7/config.ts
149+
- x-pack/platform/test/alerting_api_integration/security_and_spaces/group8/config.ts
147150
- x-pack/platform/test/alerting_api_integration/security_and_spaces/group3/config_with_schedule_circuit_breaker.ts
148151
- x-pack/platform/test/alerting_api_integration/security_and_spaces/group2/config_non_dedicated_task_runner.ts
149152
- x-pack/platform/test/alerting_api_integration/security_and_spaces/group4/config_non_dedicated_task_runner.ts
@@ -170,6 +173,7 @@ enabled:
170173
- x-pack/platform/test/fleet_api_integration/config.fleet.ts
171174
- x-pack/platform/test/fleet_api_integration/config.package_policy.ts
172175
- x-pack/platform/test/fleet_api_integration/config.space_awareness.ts
176+
- x-pack/platform/test/fleet_api_integration/config.cloud_connector.ts
173177
- x-pack/platform/test/fleet_functional/config.ts
174178
- x-pack/platform/test/fleet_tasks/config.ts
175179
- x-pack/platform/test/ftr_apis/security_and_spaces/config.ts

‎.buildkite/ftr_security_serverless_configs.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,9 @@ enabled:
8787
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_update/basic_license_essentials_tier/configs/serverless.config.ts
8888
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/common/configs/serverless_essentials_tier.config.ts
8989
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_disabled/configs/serverless_essentials_tier.config.ts
90-
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/configs/serverless.config.ts
90+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/customization/configs/serverless.config.ts
91+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_prebuilt_rules/configs/serverless.config.ts
92+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_notifications/configs/serverless.config.ts
9193
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_prebuilt_rules/diffable_rule_fields/common_fields/configs/serverless.config.ts
9294
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_prebuilt_rules/diffable_rule_fields/type_specific_fields/configs/serverless.config.ts
9395
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/ml_disabled/configs/serverless_essentials_tier.config.ts

‎.buildkite/ftr_security_stateful_configs.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ enabled:
7373
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/common/configs/edge_cases/ess_air_gapped_with_bundled_large_package.config.ts
7474
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_disabled/configs/ess_basic_license.config.ts
7575
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/common/configs/edge_cases/ess_trial_license.config.ts
76-
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/configs/ess.config.ts
76+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/customization/configs/ess.config.ts
77+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_prebuilt_rules/configs/ess.config.ts
78+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_notifications/configs/ess.config.ts
7779
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_prebuilt_rules/diffable_rule_fields/common_fields/configs/ess.config.ts
7880
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_prebuilt_rules/diffable_rule_fields/type_specific_fields/configs/ess.config.ts
7981
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/ml_disabled/configs/ess_basic_license.config.ts

‎.buildkite/package-lock.json‎

Lines changed: 32 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.buildkite/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"js-yaml": "^4.1.0",
1616
"minimatch": "^5.0.1",
1717
"minimist": "^1.2.8",
18+
"p-limit": "^3.1.0",
1819
"tslib": "*"
1920
},
2021
"devDependencies": {
@@ -23,7 +24,7 @@
2324
"@types/jscodeshift": "^0.12.0",
2425
"@types/minimatch": "^3.0.5",
2526
"@types/minimist": "^1.2.5",
26-
"@types/node": "^15.12.2",
27+
"@types/node": "^22.17.1",
2728
"jest": "^30.0.3",
2829
"jscodeshift": "^17.1.2",
2930
"nock": "^12.0.2",

‎.buildkite/pipeline-utils/ci-stats/pick_test_group_run_order.ts‎

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -573,6 +573,15 @@ export async function pickTestGroupRunOrder() {
573573
);
574574
}
575575

576+
// copied from src/platform/packages/shared/kbn-scout/src/config/discovery/search_configs.ts
577+
interface ScoutTestDiscoveryConfig {
578+
group: string;
579+
path: string;
580+
usesParallelWorkers: boolean;
581+
configs: string[];
582+
type: 'plugin' | 'package';
583+
}
584+
576585
export async function pickScoutTestGroupRunOrder(scoutConfigsPath: string) {
577586
const bk = new BuildkiteClient();
578587
const envFromlabels: Record<string, string> = collectEnvFromLabels();
@@ -581,19 +590,22 @@ export async function pickScoutTestGroupRunOrder(scoutConfigsPath: string) {
581590
throw new Error(`Scout configs file not found at ${scoutConfigsPath}`);
582591
}
583592

584-
const rawScoutConfigs = JSON.parse(Fs.readFileSync(scoutConfigsPath, 'utf-8'));
585-
const pluginsWithScoutConfigs: string[] = Object.keys(rawScoutConfigs);
593+
const rawScoutConfigs = JSON.parse(Fs.readFileSync(scoutConfigsPath, 'utf-8')) as Record<
594+
string,
595+
ScoutTestDiscoveryConfig
596+
>;
597+
const pluginsOrPackagesWithScoutTests: string[] = Object.keys(rawScoutConfigs);
586598

587-
if (pluginsWithScoutConfigs.length === 0) {
599+
if (pluginsOrPackagesWithScoutTests.length === 0) {
588600
// no scout configs found, nothing to need to upload steps
589601
return;
590602
}
591603

592-
const scoutGroups = pluginsWithScoutConfigs.map((plugin) => ({
593-
title: plugin,
594-
key: plugin,
595-
usesParallelWorkers: rawScoutConfigs[plugin].usesParallelWorkers,
596-
group: rawScoutConfigs[plugin].group,
604+
const scoutCiRunGroups = pluginsOrPackagesWithScoutTests.map((name) => ({
605+
label: `Scout: [ ${rawScoutConfigs[name].group} / ${name} ] ${rawScoutConfigs[name].type}`,
606+
key: name,
607+
agents: expandAgentQueue(rawScoutConfigs[name].usesParallelWorkers ? 'n2-8-spot' : 'n2-4-spot'),
608+
group: rawScoutConfigs[name].group,
597609
}));
598610

599611
// upload the step definitions to Buildkite
@@ -603,12 +615,12 @@ export async function pickScoutTestGroupRunOrder(scoutConfigsPath: string) {
603615
group: 'Scout Configs',
604616
key: 'scout-configs',
605617
depends_on: ['build_scout_tests'],
606-
steps: scoutGroups.map(
607-
({ title, key, group, usesParallelWorkers }): BuildkiteStep => ({
608-
label: `Scout: [ ${group} / ${title} ] plugin`,
618+
steps: scoutCiRunGroups.map(
619+
({ label, key, group, agents }): BuildkiteStep => ({
620+
label,
609621
command: getRequiredEnv('SCOUT_CONFIGS_SCRIPT'),
610622
timeout_in_minutes: 60,
611-
agents: expandAgentQueue(usesParallelWorkers ? 'n2-8-spot' : 'n2-4-spot'),
623+
agents,
612624
env: {
613625
SCOUT_CONFIG_GROUP_KEY: key,
614626
SCOUT_CONFIG_GROUP_TYPE: group,

‎.buildkite/pipelines/flaky_tests/pipeline.ts‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,19 @@ if (Number.isNaN(concurrency)) {
3434
const BASE_JOBS = 1;
3535
const MAX_JOBS = 500;
3636

37+
function getScoutConfigGroupType(configPath: string): string | null {
38+
// Match platform paths: x-pack/platform/... or src/platform/...
39+
if (/^(x-pack|src)\/platform\//.test(configPath)) {
40+
return 'platform';
41+
}
42+
// Match solution paths: x-pack/solutions/<solution>/plugins/...
43+
const match = configPath.match(/^x-pack\/solutions\/([^/]+)\/plugins\//);
44+
if (match) {
45+
return match[1];
46+
}
47+
return null;
48+
}
49+
3750
function getTestSuitesFromJson(json: string) {
3851
const fail = (errorMsg: string) => {
3952
console.error('+++ Invalid test config provided');
@@ -55,6 +68,7 @@ function getTestSuitesFromJson(json: string) {
5568
const testSuites: Array<
5669
| { type: 'group'; key: string; count: number }
5770
| { type: 'ftrConfig'; ftrConfig: string; count: number }
71+
| { type: 'scoutConfig'; scoutConfig: string; count: number }
5872
> = [];
5973
for (const item of parsed) {
6074
if (typeof item !== 'object' || item === null) {
@@ -160,6 +174,33 @@ for (const testSuite of testSuites) {
160174
continue;
161175
}
162176

177+
if (testSuite.type === 'scoutConfig') {
178+
const usesParallelWorkers = testSuite.scoutConfig.endsWith('parallel.playwright.config.ts');
179+
const scoutConfigGroupType = getScoutConfigGroupType(testSuite.scoutConfig);
180+
181+
steps.push({
182+
command: `.buildkite/scripts/steps/test/scout_configs.sh`,
183+
env: {
184+
SCOUT_CONFIG: testSuite.scoutConfig,
185+
SCOUT_CONFIG_GROUP_TYPE: scoutConfigGroupType!,
186+
},
187+
key: `scout-suite-${suiteIndex++}`,
188+
label: `${testSuite.scoutConfig}`,
189+
parallelism: testSuite.count,
190+
concurrency,
191+
concurrency_group: process.env.UUID,
192+
concurrency_method: 'eager',
193+
agents: expandAgentQueue(usesParallelWorkers ? 'n2-8-spot' : 'n2-4-spot'),
194+
depends_on: 'build',
195+
timeout_in_minutes: 30,
196+
cancel_on_build_failing: true,
197+
retry: {
198+
automatic: [{ exit_status: '-1', limit: 3 }],
199+
},
200+
});
201+
continue;
202+
}
203+
163204
const [category, suiteName] = testSuite.key.split('/');
164205
switch (category) {
165206
case 'cypress':

‎.buildkite/pipelines/security_solution_quality_gate/mki_periodic/mki_periodic_rule_management.yml‎

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,9 +215,37 @@ steps:
215215
- exit_status: '1'
216216
limit: 2
217217

218-
- label: 'API MKI - prebuilt_rules_management:customization_enabled:qa:serverless'
219-
command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh prebuilt_rules_management:customization_enabled:qa:serverless
220-
key: prebuilt_rules_management:customization_enabled:qa:serverless
218+
- label: 'API MKI - prebuilt_rules_management:customization_enabled:customization:qa:serverless'
219+
command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh prebuilt_rules_management:customization_enabled:customization:qa:serverless
220+
key: prebuilt_rules_management:customization_enabled:customization:qa:serverless
221+
agents:
222+
image: family/kibana-ubuntu-2404
223+
imageProject: elastic-images-prod
224+
provider: gcp
225+
machineType: n2-standard-4
226+
timeout_in_minutes: 120
227+
retry:
228+
automatic:
229+
- exit_status: '1'
230+
limit: 2
231+
232+
- label: 'API MKI - prebuilt_rules_management:customization_enabled:upgrade_prebuilt_rules:qa:serverless'
233+
command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh prebuilt_rules_management:customization_enabled:upgrade_prebuilt_rules:qa:serverless
234+
key: prebuilt_rules_management:customization_enabled:upgrade_prebuilt_rules:qa:serverless
235+
agents:
236+
image: family/kibana-ubuntu-2404
237+
imageProject: elastic-images-prod
238+
provider: gcp
239+
machineType: n2-standard-4
240+
timeout_in_minutes: 120
241+
retry:
242+
automatic:
243+
- exit_status: '1'
244+
limit: 2
245+
246+
- label: 'API MKI - prebuilt_rules_management:customization_enabled:upgrade_notifications:qa:serverless'
247+
command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh prebuilt_rules_management:customization_enabled:upgrade_notifications:qa:serverless
248+
key: prebuilt_rules_management:customization_enabled:upgrade_notifications:qa:serverless
221249
agents:
222250
image: family/kibana-ubuntu-2404
223251
imageProject: elastic-images-prod

0 commit comments

Comments
 (0)