Skip to content

Commit 4dafdfa

Browse files
ThomThomsonThomThomson
committed
Merge remote-tracking branch 'upstream/9.2' into backport/9.2/pr-257779
2 parents c596e23 + fda1072 commit 4dafdfa

69 files changed

Lines changed: 1383 additions & 341 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/disabled_jest_configs.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
[]
1+
[
2+
"src/core/server/integration_tests/saved_objects/serverless/migrations/jest.integration.config.js"
3+
]

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ export interface TestGroupRunOrderResponse {
5151
names: string[];
5252
}>;
5353
tooLong?: Array<{ config: string; durationMin: number }>;
54+
tooLongMin?: number;
5455
namesWithoutDurations: string[];
5556
}>;
5657
}
@@ -170,6 +171,7 @@ export class CiStatsClient {
170171
queue?: string;
171172
defaultMin?: number;
172173
maxMin: number;
174+
tooLongMin?: number;
173175
minimumIsolationMin?: number;
174176
overheadMin?: number;
175177
warmupMin?: number;

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

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,18 @@ function getRunGroups(bk: BuildkiteClient, allTypes: RunGroup[], typeName: strin
4141
throw new Error(`missing test group run order for group [${typeName}]`);
4242
}
4343

44+
const uniqueTooLongMin = [
45+
...new Set(
46+
types.map((t) => t.tooLongMin).filter((value): value is number => typeof value === 'number')
47+
),
48+
];
49+
const tooLongThresholdLabel =
50+
uniqueTooLongMin.length > 0
51+
? `configured warning threshold${
52+
uniqueTooLongMin.length === 1 ? ` of ${uniqueTooLongMin[0]} minutes` : ''
53+
}`
54+
: 'maximum amount of time desired for a single CI job';
55+
4456
const misses = types.flatMap((t) => t.namesWithoutDurations);
4557
if (misses.length > 0) {
4658
bk.setAnnotation(
@@ -70,10 +82,10 @@ function getRunGroups(bk: BuildkiteClient, allTypes: RunGroup[], typeName: strin
7082
'warning',
7183
[
7284
tooLongs.length === 1
73-
? `The following "${typeName}" config has a duration that exceeds the maximum amount of time desired for a single CI job. ` +
85+
? `The following "${typeName}" config has a duration that exceeds the ${tooLongThresholdLabel}. ` +
7486
`This is not an error, and if you don't own this config then you can ignore this warning. ` +
7587
`If you own this config please split it up ASAP and ask Operations if you have questions about how to do that.`
76-
: `The following "${typeName}" configs have durations that exceed the maximum amount of time desired for a single CI job. ` +
88+
: `The following "${typeName}" configs have durations that exceed the ${tooLongThresholdLabel}. ` +
7789
`This is not an error, and if you don't own any of these configs then you can ignore this warning.` +
7890
`If you own any of these configs please split them up ASAP and ask Operations if you have questions about how to do that.`,
7991
'',
@@ -233,6 +245,10 @@ export async function pickTestGroupRunOrder() {
233245
throw new Error(`invalid FUNCTIONAL_MAX_MINUTES: ${process.env.FUNCTIONAL_MAX_MINUTES}`);
234246
}
235247

248+
const JEST_UNIT_TOO_LONG_MINUTES = 27;
249+
const JEST_INTEGRATION_TOO_LONG_MINUTES = 27;
250+
const FUNCTIONAL_TOO_LONG_MINUTES = 27;
251+
236252
/**
237253
* This env variable corresponds to the env stanza within
238254
* https://github.com/elastic/kibana/blob/bc2cb5dc613c3d455a5fed9c54450fd7e46ffd92/.buildkite/pipelines/code_coverage/daily.yml#L17
@@ -416,6 +432,7 @@ export async function pickTestGroupRunOrder() {
416432
type: UNIT_TYPE,
417433
defaultMin: 4,
418434
maxMin: JEST_MAX_MINUTES,
435+
tooLongMin: JEST_UNIT_TOO_LONG_MINUTES,
419436
overheadMin: 0.2,
420437
warmupMin: 4,
421438
names: jestUnitConfigs,
@@ -424,6 +441,7 @@ export async function pickTestGroupRunOrder() {
424441
type: INTEGRATION_TYPE,
425442
defaultMin: 60,
426443
maxMin: JEST_MAX_MINUTES,
444+
tooLongMin: JEST_INTEGRATION_TOO_LONG_MINUTES,
427445
overheadMin: 0.2,
428446
warmupMin: 2,
429447
names: jestIntegrationConfigs,
@@ -433,6 +451,7 @@ export async function pickTestGroupRunOrder() {
433451
defaultMin: 60,
434452
queue,
435453
maxMin: FUNCTIONAL_MAX_MINUTES,
454+
tooLongMin: FUNCTIONAL_TOO_LONG_MINUTES,
436455
minimumIsolationMin: FUNCTIONAL_MINIMUM_ISOLATION_MIN,
437456
overheadMin: 0,
438457
warmupMin: 3,

‎fleet_packages.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
},
5757
{
5858
"name": "security_detection_engine",
59-
"version": "9.2.8"
59+
"version": "9.2.9"
6060
},
6161
{
6262
"name": "security_ai_prompts",

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
"**/chokidar": "3.5.3",
8989
"**/d3-scale/**/d3-color": "npm:@elastic/kibana-d3-color@2.0.1",
9090
"**/express-rate-limit": "8.3.0",
91-
"**/fast-xml-parser": "5.5.6",
91+
"**/fast-xml-parser": "5.5.7",
9292
"**/hoist-non-react-statics": "3.3.2",
9393
"**/isomorphic-fetch/node-fetch": "2.7.0",
9494
"**/langchain": "0.3.37",
@@ -124,9 +124,9 @@
124124
"@dnd-kit/core": "6.3.1",
125125
"@dnd-kit/sortable": "10.0.0",
126126
"@dnd-kit/utilities": "3.2.2",
127-
"@elastic/apm-rum": "5.17.0",
128-
"@elastic/apm-rum-core": "5.23.0",
129-
"@elastic/apm-rum-react": "2.0.6",
127+
"@elastic/apm-rum": "5.17.3",
128+
"@elastic/apm-rum-core": "5.25.1",
129+
"@elastic/apm-rum-react": "2.0.9",
130130
"@elastic/charts": "71.1.2",
131131
"@elastic/datemath": "5.0.3",
132132
"@elastic/ebt": "1.4.1",

‎src/core/packages/root/browser-internal/src/filters/ebt_span_filter.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ describe('ebtSpanFilter', () => {
2828
});
2929

3030
it('does not throw if payload is empty', () => {
31-
const payload: Payload = {};
31+
const payload: Payload = {} as Partial<Payload> as Payload;
3232
expect(() => ebtSpanFilter(payload)).not.toThrow();
3333
expect(ebtSpanFilter(payload)).toEqual({});
3434
});

‎src/core/packages/root/browser-internal/src/filters/ebt_span_filter.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ const ignorePaths = ['/kibana-browser'];
1212
// Copied from @elastic/apm-rum/src/common/types.ts
1313
export type FilterFn = (payload: Payload) => Payload | boolean | void;
1414
export interface Payload {
15+
transactions: Array<Record<string, any>>;
16+
errors: Array<Record<string, any>>;
1517
[key: string]: any;
1618
}
1719

‎src/core/server/integration_tests/elasticsearch/capabilities_serverless.test.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ import { createTestServerlessInstances } from '@kbn/core-test-helpers-kbn-server
1212
import type { ElasticsearchClient } from '@kbn/core-elasticsearch-server';
1313
import { getCapabilitiesFromClient } from '@kbn/core-elasticsearch-server-internal';
1414

15-
describe('ES capabilities for serverless ES', () => {
15+
// Serverless tests only supported on main
16+
// FLAKY: https://github.com/elastic/kibana/issues/167248
17+
describe.skip('ES capabilities for serverless ES', () => {
1618
let serverlessES: TestServerlessESUtils;
1719
let client: ElasticsearchClient;
1820

‎src/core/server/integration_tests/saved_objects/serverless/migrations/basic_document_migration.test.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ import Path from 'path';
1111
import { createTestServerlessInstances } from '@kbn/core-test-helpers-kbn-server';
1212
import { createBasicDocumentsMigrationTest } from '../../migrations/shared_suites/zdt/basic_document_migration';
1313

14-
describe('serverless - ZDT upgrades - basic document migration', () => {
14+
// FLAKY: https://github.com/elastic/kibana/issues/167250
15+
describe.skip('serverless - ZDT upgrades - basic document migration', () => {
1516
const startElasticsearch = async () => {
1617
const { startES } = createTestServerlessInstances({
1718
adjustTimeout: jest.setTimeout,

‎src/core/server/integration_tests/saved_objects/serverless/migrations/smoke.test.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ describe('Basic smoke test', function () {
3434
await serverlessKibana?.stop();
3535
});
3636

37-
test('it can start Kibana running against serverless ES', async () => {
37+
// FLAKY: https://github.com/elastic/kibana/issues/167249
38+
test.skip('it can start Kibana running against serverless ES', async () => {
3839
const { body } = await request.get(root, '/api/status').expect(200);
3940
expect(body).toMatchObject({ status: { overall: { level: 'available' } } });
4041
});

0 commit comments

Comments
 (0)