Skip to content

Commit f816bb2

Browse files
lgestclgestc
authored
Merge branch 'main' into remove_title_use_in_use_selected_patterns_hook
2 parents 050bb74 + df86cbb commit f816bb2

1,404 files changed

Lines changed: 20059 additions & 10451 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/pipeline-utils/agent_images.ts‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,34 @@
88
*/
99

1010
import { dump } from 'js-yaml';
11-
import { BuildkiteClient, BuildkiteCommandStep } from './buildkite';
11+
import { BuildkiteClient, BuildkiteAgentTargetingRule } from './buildkite';
1212

13-
type AgentImageConfig = BuildkiteCommandStep['agents'];
13+
const ELASTIC_IMAGES_QA_PROJECT = 'elastic-images-qa';
14+
const ELASTIC_IMAGES_PROD_PROJECT = 'elastic-images-prod';
1415

15-
const DEFAULT_AGENT_IMAGE_CONFIG: AgentImageConfig = {
16+
// constrain AgentImageConfig to the type that doesn't have the `queue` property
17+
const DEFAULT_AGENT_IMAGE_CONFIG: BuildkiteAgentTargetingRule = {
1618
provider: 'gcp',
1719
image: 'family/kibana-ubuntu-2004',
18-
imageProject: 'elastic-images-prod',
20+
imageProject: ELASTIC_IMAGES_PROD_PROJECT,
1921
};
2022

21-
const FIPS_AGENT_IMAGE_CONFIG: AgentImageConfig = {
23+
const FIPS_AGENT_IMAGE_CONFIG: BuildkiteAgentTargetingRule = {
2224
provider: 'gcp',
2325
image: 'family/kibana-fips-ubuntu-2004',
24-
imageProject: 'elastic-images-prod',
26+
imageProject: ELASTIC_IMAGES_PROD_PROJECT,
2527
};
2628

2729
const GITHUB_PR_LABELS = process.env.GITHUB_PR_LABELS ?? '';
2830
const FTR_ENABLE_FIPS_AGENT = process.env.FTR_ENABLE_FIPS_AGENT?.toLowerCase() === 'true';
31+
const USE_QA_IMAGE_FOR_PR = process.env.USE_QA_IMAGE_FOR_PR?.match(/(1|true)/i);
2932

3033
// Narrow the return type with overloads
31-
function getAgentImageConfig(): AgentImageConfig;
34+
function getAgentImageConfig(): BuildkiteAgentTargetingRule;
3235
function getAgentImageConfig(options: { returnYaml: true }): string;
33-
function getAgentImageConfig({ returnYaml = false } = {}): string | AgentImageConfig {
36+
function getAgentImageConfig({ returnYaml = false } = {}): string | BuildkiteAgentTargetingRule {
3437
const bk = new BuildkiteClient();
35-
let config: AgentImageConfig;
38+
let config: BuildkiteAgentTargetingRule;
3639

3740
if (FTR_ENABLE_FIPS_AGENT || GITHUB_PR_LABELS.includes('ci:enable-fips-agent')) {
3841
config = FIPS_AGENT_IMAGE_CONFIG;
@@ -46,6 +49,10 @@ function getAgentImageConfig({ returnYaml = false } = {}): string | AgentImageCo
4649
config = DEFAULT_AGENT_IMAGE_CONFIG;
4750
}
4851

52+
if (USE_QA_IMAGE_FOR_PR || GITHUB_PR_LABELS.includes('ci:use-qa-image')) {
53+
config.imageProject = ELASTIC_IMAGES_QA_PROJECT;
54+
}
55+
4956
if (returnYaml) {
5057
return dump({ agents: config });
5158
}

‎.buildkite/pipeline-utils/buildkite/client.ts‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,25 +38,27 @@ export type BuildkiteStep =
3838
| BuildkiteTriggerStep
3939
| BuildkiteWaitStep;
4040

41+
export interface BuildkiteAgentQueue {
42+
queue: string;
43+
}
44+
45+
export interface BuildkiteAgentTargetingRule {
46+
provider?: string;
47+
image?: string;
48+
imageProject?: string;
49+
machineType?: string;
50+
minCpuPlatform?: string;
51+
preemptible?: boolean;
52+
}
53+
4154
export interface BuildkiteCommandStep {
4255
command: string;
4356
label: string;
4457
parallelism?: number;
4558
concurrency?: number;
4659
concurrency_group?: string;
4760
concurrency_method?: 'eager' | 'ordered';
48-
agents:
49-
| {
50-
queue: string;
51-
}
52-
| {
53-
provider?: string;
54-
image?: string;
55-
imageProject?: string;
56-
machineType?: string;
57-
minCpuPlatform?: string;
58-
preemptible?: boolean;
59-
};
61+
agents: BuildkiteAgentQueue | BuildkiteAgentTargetingRule;
6062
timeout_in_minutes?: number;
6163
key?: string;
6264
cancel_on_build_failing?: boolean;

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,7 @@ src/platform/packages/shared/kbn-analytics @elastic/kibana-core
411411
src/platform/packages/shared/kbn-apm-data-view @elastic/obs-ux-infra_services-team
412412
src/platform/packages/shared/kbn-apm-synthtrace @elastic/obs-ux-infra_services-team @elastic/obs-ux-logs-team
413413
src/platform/packages/shared/kbn-apm-synthtrace-client @elastic/obs-ux-infra_services-team @elastic/obs-ux-logs-team
414+
src/platform/packages/shared/kbn-apm-ui-shared @elastic/obs-ux-infra_services-team
414415
src/platform/packages/shared/kbn-apm-utils @elastic/obs-ux-infra_services-team
415416
src/platform/packages/shared/kbn-avc-banner @elastic/security-defend-workflows
416417
src/platform/packages/shared/kbn-axe-config @elastic/appex-qa
@@ -2376,7 +2377,6 @@ x-pack/test/security_solution_cypress/cypress/tasks/expandable_flyout @elastic/
23762377
/x-pack/solutions/security/plugins/security_solution/public/common/components/alert_count_by_status @elastic/security-threat-hunting-explore
23772378
/x-pack/solutions/security/plugins/security_solution/public/common/components/guided_onboarding_tour @elastic/security-threat-hunting-explore
23782379
/x-pack/solutions/security/plugins/security_solution/public/common/components/charts @elastic/security-threat-hunting-explore
2379-
/x-pack/solutions/security/plugins/security_solution/public/detections/components/alerts_table/grouping_settings @elastic/security-threat-hunting-explore
23802380
/x-pack/solutions/security/plugins/security_solution/public/common/components/header_page @elastic/security-threat-hunting-explore
23812381
/x-pack/solutions/security/plugins/security_solution/public/common/components/header_section @elastic/security-threat-hunting-explore
23822382
/x-pack/solutions/security/plugins/security_solution/public/common/components/inspect @elastic/security-threat-hunting-explore

‎api_docs/actions.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/actions
88
title: "actions"
99
image: https://source.unsplash.com/400x175/?github
1010
description: API docs for the actions plugin
11-
date: 2025-04-03
11+
date: 2025-04-04
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'actions']
1313
---
1414
import actionsObj from './actions.devdocs.json';

‎api_docs/advanced_settings.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/advancedSettings
88
title: "advancedSettings"
99
image: https://source.unsplash.com/400x175/?github
1010
description: API docs for the advancedSettings plugin
11-
date: 2025-04-03
11+
date: 2025-04-04
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'advancedSettings']
1313
---
1414
import advancedSettingsObj from './advanced_settings.devdocs.json';

‎api_docs/ai_assistant_management_selection.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiAssistantManagementSelection
88
title: "aiAssistantManagementSelection"
99
image: https://source.unsplash.com/400x175/?github
1010
description: API docs for the aiAssistantManagementSelection plugin
11-
date: 2025-04-03
11+
date: 2025-04-04
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiAssistantManagementSelection']
1313
---
1414
import aiAssistantManagementSelectionObj from './ai_assistant_management_selection.devdocs.json';

‎api_docs/aiops.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiops
88
title: "aiops"
99
image: https://source.unsplash.com/400x175/?github
1010
description: API docs for the aiops plugin
11-
date: 2025-04-03
11+
date: 2025-04-04
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiops']
1313
---
1414
import aiopsObj from './aiops.devdocs.json';

‎api_docs/alerting.devdocs.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4769,7 +4769,7 @@
47694769
},
47704770
"<Params>>; getAlertState: (params: ",
47714771
"GetAlertStateParams",
4772-
") => Promise<void | Readonly<{ alertTypeState?: Record<string, any> | undefined; alertInstances?: Record<string, Readonly<{ meta?: Readonly<{ flapping?: boolean | undefined; uuid?: string | undefined; lastScheduledActions?: Readonly<{ actions?: Record<string, Readonly<{} & { date: string; }>> | undefined; subgroup?: string | undefined; } & { date: string; group: string; }> | undefined; flappingHistory?: boolean[] | undefined; maintenanceWindowIds?: string[] | undefined; pendingRecoveredCount?: number | undefined; activeCount?: number | undefined; } & {}> | undefined; state?: Record<string, any> | undefined; } & {}>> | undefined; alertRecoveredInstances?: Record<string, Readonly<{ meta?: Readonly<{ flapping?: boolean | undefined; uuid?: string | undefined; lastScheduledActions?: Readonly<{ actions?: Record<string, Readonly<{} & { date: string; }>> | undefined; subgroup?: string | undefined; } & { date: string; group: string; }> | undefined; flappingHistory?: boolean[] | undefined; maintenanceWindowIds?: string[] | undefined; pendingRecoveredCount?: number | undefined; activeCount?: number | undefined; } & {}> | undefined; state?: Record<string, any> | undefined; } & {}>> | undefined; previousStartedAt?: string | null | undefined; summaryActions?: Record<string, Readonly<{} & { date: string; }>> | undefined; } & {}>>; getAlertSummary: (params: ",
4772+
") => Promise<void | Readonly<{ alertTypeState?: Record<string, any> | undefined; alertInstances?: Record<string, Readonly<{ meta?: Readonly<{ flapping?: boolean | undefined; uuid?: string | undefined; lastScheduledActions?: Readonly<{ actions?: Record<string, Readonly<{} & { date: string; }>> | undefined; subgroup?: string | undefined; } & { date: string; group: string; }> | undefined; flappingHistory?: boolean[] | undefined; maintenanceWindowIds?: string[] | undefined; pendingRecoveredCount?: number | undefined; activeCount?: number | undefined; } & {}> | undefined; state?: Record<string, any> | undefined; } & {}>> | undefined; alertRecoveredInstances?: Record<string, Readonly<{ meta?: Readonly<{ flapping?: boolean | undefined; uuid?: string | undefined; lastScheduledActions?: Readonly<{ actions?: Record<string, Readonly<{} & { date: string; }>> | undefined; subgroup?: string | undefined; } & { date: string; group: string; }> | undefined; flappingHistory?: boolean[] | undefined; maintenanceWindowIds?: string[] | undefined; pendingRecoveredCount?: number | undefined; activeCount?: number | undefined; } & {}> | undefined; state?: Record<string, any> | undefined; } & {}>> | undefined; previousStartedAt?: string | null | undefined; summaryActions?: Record<string, Readonly<{} & { date: string; }>> | undefined; trackedExecutions?: string[] | undefined; } & {}>>; getAlertSummary: (params: ",
47734773
"GetAlertSummaryParams",
47744774
") => Promise<",
47754775
{
@@ -10526,7 +10526,7 @@
1052610526
"label": "LatestTaskStateSchema",
1052710527
"description": [],
1052810528
"signature": [
10529-
"{ readonly alertTypeState?: Record<string, any> | undefined; readonly alertInstances?: Record<string, Readonly<{ meta?: Readonly<{ flapping?: boolean | undefined; uuid?: string | undefined; lastScheduledActions?: Readonly<{ actions?: Record<string, Readonly<{} & { date: string; }>> | undefined; subgroup?: string | undefined; } & { date: string; group: string; }> | undefined; flappingHistory?: boolean[] | undefined; maintenanceWindowIds?: string[] | undefined; pendingRecoveredCount?: number | undefined; activeCount?: number | undefined; } & {}> | undefined; state?: Record<string, any> | undefined; } & {}>> | undefined; readonly alertRecoveredInstances?: Record<string, Readonly<{ meta?: Readonly<{ flapping?: boolean | undefined; uuid?: string | undefined; lastScheduledActions?: Readonly<{ actions?: Record<string, Readonly<{} & { date: string; }>> | undefined; subgroup?: string | undefined; } & { date: string; group: string; }> | undefined; flappingHistory?: boolean[] | undefined; maintenanceWindowIds?: string[] | undefined; pendingRecoveredCount?: number | undefined; activeCount?: number | undefined; } & {}> | undefined; state?: Record<string, any> | undefined; } & {}>> | undefined; readonly previousStartedAt?: string | null | undefined; readonly summaryActions?: Record<string, Readonly<{} & { date: string; }>> | undefined; }"
10529+
"{ readonly alertTypeState?: Record<string, any> | undefined; readonly alertInstances?: Record<string, Readonly<{ meta?: Readonly<{ flapping?: boolean | undefined; uuid?: string | undefined; lastScheduledActions?: Readonly<{ actions?: Record<string, Readonly<{} & { date: string; }>> | undefined; subgroup?: string | undefined; } & { date: string; group: string; }> | undefined; flappingHistory?: boolean[] | undefined; maintenanceWindowIds?: string[] | undefined; pendingRecoveredCount?: number | undefined; activeCount?: number | undefined; } & {}> | undefined; state?: Record<string, any> | undefined; } & {}>> | undefined; readonly alertRecoveredInstances?: Record<string, Readonly<{ meta?: Readonly<{ flapping?: boolean | undefined; uuid?: string | undefined; lastScheduledActions?: Readonly<{ actions?: Record<string, Readonly<{} & { date: string; }>> | undefined; subgroup?: string | undefined; } & { date: string; group: string; }> | undefined; flappingHistory?: boolean[] | undefined; maintenanceWindowIds?: string[] | undefined; pendingRecoveredCount?: number | undefined; activeCount?: number | undefined; } & {}> | undefined; state?: Record<string, any> | undefined; } & {}>> | undefined; readonly previousStartedAt?: string | null | undefined; readonly summaryActions?: Record<string, Readonly<{} & { date: string; }>> | undefined; readonly trackedExecutions?: string[] | undefined; }"
1053010530
],
1053110531
"path": "x-pack/platform/packages/private/kbn-alerting-state-types/src/task_state/index.ts",
1053210532
"deprecated": false,

‎api_docs/alerting.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/alerting
88
title: "alerting"
99
image: https://source.unsplash.com/400x175/?github
1010
description: API docs for the alerting plugin
11-
date: 2025-04-03
11+
date: 2025-04-04
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'alerting']
1313
---
1414
import alertingObj from './alerting.devdocs.json';

‎api_docs/apm.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/apm
88
title: "apm"
99
image: https://source.unsplash.com/400x175/?github
1010
description: API docs for the apm plugin
11-
date: 2025-04-03
11+
date: 2025-04-04
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'apm']
1313
---
1414
import apmObj from './apm.devdocs.json';

0 commit comments

Comments
 (0)