Skip to content

Commit 4dfd57e

Browse files
authored
Merge branch 'main' into migrate-explore-euid-pr1-flyouts
2 parents 73756bb + d1b6923 commit 4dfd57e

108 files changed

Lines changed: 4353 additions & 2659 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.

.cycodeignore

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
**/__fixtures__/**
2+
**/__jest__/**
3+
**/__mocks__/**
4+
**/__snapshots__/**
5+
**/__stories__/**
6+
**/__tests__/**
7+
**/.storybook/**
8+
**/*-mocks/**
9+
**/*.cy.*
10+
**/*.md
11+
**/*.yaml
12+
**/*.yml
13+
**/*.hbs
14+
**/*.njk
15+
**/*.mock.*
16+
**/*.mocks.*
17+
**/*.test.*
18+
**/cypress/**
19+
**/e2e/**
20+
**/ftr_e2e/**
21+
**/integration_tests/**
22+
**/jest.config.*
23+
**/jest.integration.config.*
24+
**/kbn-scout-*
25+
**/mocks.*
26+
**/mocks/**
27+
**/stub/**
28+
**/scripts/**
29+
**/setup_tests.*
30+
**/storybook/**
31+
**/*_test_utils/**
32+
**/*-test-data/**
33+
**/test_helpers/**
34+
**/test-helpers/**
35+
**/test_utils/**
36+
.github/codeql/custom-queries/**
37+
api_docs
38+
dev_docs
39+
docs
40+
examples
41+
kbn_pm
42+
legacy_rfcs
43+
oas_docs
44+
packages/kbn-babel-*
45+
packages/kbn-capture-oas-snapshot-cli
46+
packages/kbn-check-prod-native-modules-cli
47+
packages/kbn-check-saved-objects-cli
48+
packages/kbn-ci-*
49+
packages/kbn-cli-dev-mode
50+
packages/kbn-dependency-*
51+
packages/kbn-docs-utils
52+
packages/kbn-eslint-*
53+
packages/kbn-failed-test-reporter-cli
54+
packages/kbn-find-used-node-modules
55+
packages/kbn-ftr-*
56+
packages/kbn-import-locator
57+
packages/kbn-generate
58+
packages/kbn-generate-console-definitions
59+
packages/kbn-json-ast
60+
packages/kbn-kibana-manifest-schema
61+
packages/kbn-lint-*
62+
packages/kbn-managed-vscode-*
63+
packages/kbn-manifest
64+
packages/kbn-mock-idp-plugin
65+
packages/kbn-optimizer
66+
packages/kbn-peggy-loader
67+
packages/kbn-performance-testing-dataset-extractor
68+
packages/kbn-picomatcher
69+
packages/kbn-plugin-*
70+
packages/kbn-relocate
71+
packages/kbn-repo-*
72+
packages/kbn-set-map
73+
packages/kbn-sort-package-json
74+
packages/kbn-styled-components-mapping-cli
75+
packages/kbn-test-*
76+
packages/kbn-ts-*
77+
packages/kbn-validate-next-docs-cli
78+
packages/kbn-web-worker-stub
79+
packages/kbn-whereis-pkg-cli
80+
packages/kbn-yarn-lock-validator
81+
scripts
82+
src/platform/packages/*/kbn-ambient-*-types
83+
src/platform/packages/*/kbn-babel-*
84+
src/platform/packages/*/kbn-ci-*
85+
src/platform/packages/*/kbn-cypress-*
86+
src/platform/packages/*/kbn-ftr-*
87+
src/platform/packages/*/kbn-jest-*
88+
src/platform/packages/*/kbn-optimizer-*
89+
src/platform/packages/*/kbn-test-*
90+
src/platform/packages/private/kbn-code-owners
91+
src/platform/packages/private/kbn-gen-ai-functional-testing
92+
src/platform/packages/private/kbn-get-repo-files
93+
src/platform/packages/private/kbn-import-resolver
94+
src/platform/packages/private/kbn-journeys
95+
src/platform/packages/private/kbn-mock-idp-utils
96+
src/platform/packages/private/kbn-node-libs-browser-webpack-plugin
97+
src/platform/packages/private/kbn-optimizer-webpack-helpers
98+
src/platform/packages/private/kbn-reporting/mocks_server
99+
src/platform/packages/private/kbn-peggy
100+
src/platform/packages/private/kbn-repo-path
101+
src/platform/packages/private/kbn-some-dev-log
102+
src/platform/packages/private/kbn-stdio-dev-helpers
103+
src/platform/packages/private/kbn-telemetry-tools
104+
src/platform/packages/shared/kbn-synthtrace
105+
src/platform/packages/shared/kbn-axe-config
106+
src/platform/packages/shared/kbn-cache-cli
107+
src/platform/packages/shared/kbn-dev-cli-errors
108+
src/platform/packages/shared/kbn-dev-cli-runner
109+
src/platform/packages/shared/kbn-dev-proc-runner
110+
src/platform/packages/shared/kbn-dev-utils
111+
src/platform/packages/shared/kbn-es
112+
src/platform/packages/shared/kbn-es-archiver
113+
src/platform/packages/shared/kbn-expect
114+
src/platform/packages/shared/kbn-openapi-*
115+
src/platform/packages/shared/kbn-scout
116+
src/platform/packages/shared/kbn-storybook
117+
src/platform/packages/shared/kbn-test
118+
src/platform/packages/shared/kbn-tooling-log
119+
src/platform/test
120+
typings
121+
x-pack/examples
122+
x-pack/packages/ai-infra/product-doc-artifact-builder
123+
x-pack/packages/kbn-synthetics-private-location
124+
x-pack/platform/packages/shared/kbn-ai-tools-cli
125+
x-pack/platform/packages/shared/kbn-data-forge
126+
x-pack/platform/packages/shared/kbn-inference-cli
127+
x-pack/platform/packages/shared/kbn-kibana-api-cli
128+
x-pack/platform/packages/shared/kbn-sample-parser
129+
x-pack/platform/plugins/private/cloud_integrations/cloud_full_story/public/assets/**
130+
x-pack/platform/test
131+
x-pack/performance
132+
x-pack/scripts
133+
x-pack/solutions/observability/packages/kbn-evals-suite-obs-ai-assistant
134+
x-pack/solutions/observability/packages/kbn-genai-cli
135+
x-pack/solutions/*/test

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2284,6 +2284,7 @@ x-pack/platform/plugins/shared/inference_endpoint @elastic/search-kibana
22842284

22852285
/src/platform/test/server_integration/config.base.js @elastic/kibana-security @elastic/kibana-core # Assigned per https://github.com/elastic/kibana/pull/199795#discussion_r1846510782
22862286
/src/platform/test/server_integration/__fixtures__ @elastic/kibana-security # Assigned per https://github.com/elastic/kibana/pull/53810
2287+
.cycodeignore @elastic/kibana-security
22872288
/.github/codeql @elastic/kibana-security
22882289
/.github/workflows/codeql.yml @elastic/kibana-security
22892290
/.github/workflows/codeql-pr.yml @elastic/kibana-security

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.3.6"
59+
"version": "9.3.7"
6060
},
6161
{
6262
"name": "security_ai_prompts",

packages/kbn-optimizer/limits.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ pageLoadAssetSize:
176176
spaces: 28871
177177
stackAlerts: 31499
178178
stackConnectors: 85421
179-
streams: 10000
179+
streams: 11422
180180
streamsApp: 25375
181181
synthetics: 31571
182182
telemetry: 25755

packages/kbn-ts-type-check-cli/run_type_check_cli.ts

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,20 @@ async function createTypeCheckConfigs(
8888
);
8989
}
9090

91-
async function detectLocalChanges(): Promise<boolean> {
92-
const { stdout } = await execa('git', ['status', '--porcelain'], {
93-
cwd: REPO_ROOT,
94-
});
91+
async function detectLocalChanges(): Promise<string[]> {
92+
const { stdout } = await execa(
93+
'git',
94+
// Some CI environments change these files dynamically, like FIPS but it shouldn't invalidate the cache
95+
['status', '--porcelain', '--', '.', ':!:config/node.options', ':!config/kibana.yml'],
96+
{
97+
cwd: REPO_ROOT,
98+
}
99+
);
95100

96-
return stdout.trim().length > 0;
101+
return stdout
102+
.split('\n')
103+
.map((line) => line.trimEnd())
104+
.filter((line) => line.length > 0);
97105
}
98106

99107
run(
@@ -172,14 +180,16 @@ run(
172180
didTypeCheckFail = true;
173181
}
174182

175-
const hasLocalChanges = shouldUseArchive ? await detectLocalChanges() : false;
183+
const localChanges = shouldUseArchive ? await detectLocalChanges() : [];
184+
const hasLocalChanges = localChanges.length > 0;
176185

177186
if (shouldUseArchive) {
178187
if (hasLocalChanges) {
179-
const message = `uncommitted changes were detected after the TypeScript build. TypeScript cache artifacts must be generated from a clean working tree.`;
188+
const changedFiles = localChanges.join('\n');
189+
const message = `uncommitted changes were detected after the TypeScript build. TypeScript cache artifacts must be generated from a clean working tree.\nChanged files:\n${changedFiles}`;
180190

181191
if (isCiEnvironment()) {
182-
throw new Error(`Canceling TypeScript cache archive because ${message}`);
192+
throw new Error(`Cancelling TypeScript cache archive because ${message}`);
183193
}
184194

185195
log.info(`Skipping TypeScript cache archive because ${message}`);

src/platform/packages/shared/kbn-lens-embeddable-utils/config_builder/schema/alignments.ts

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@ const HORIZONTAL_ALIGN = ['left', 'center', 'right'] as const;
1313
const VERTICAL_ALIGN = ['top', 'bottom'] as const;
1414
const LR_ALIGN = ['left', 'right'] as const;
1515
const BEFORE_AFTER_ALIGN = ['before', 'after'] as const;
16+
const POSITION = [...VERTICAL_ALIGN, ...LR_ALIGN] as const;
17+
const CORNER_POSITION = ['top_left', 'top_right', 'bottom_left', 'bottom_right'] as const;
1618

17-
type Position = 'top' | 'bottom' | 'left' | 'right';
18-
19+
type Position = (typeof POSITION)[number];
20+
type CornerPosition = (typeof CORNER_POSITION)[number];
1921
type HorizontalAlignment = (typeof HORIZONTAL_ALIGN)[number];
2022
type VerticalAlignment = (typeof VERTICAL_ALIGN)[number];
2123
type LeftRightAlignment = (typeof LR_ALIGN)[number];
@@ -46,5 +48,16 @@ export const positionSchema = (opts?: Options<Position>) =>
4648
opts
4749
);
4850

49-
export const beforeAfterAlignmentSchema = (opts?: Options<BeforeAfterAlignment>) =>
51+
export const cornerPositionSchema = (opts?: Options<CornerPosition>) =>
52+
schema.oneOf(
53+
[
54+
schema.literal('top_left'),
55+
schema.literal('top_right'),
56+
schema.literal('bottom_left'),
57+
schema.literal('bottom_right'),
58+
],
59+
opts
60+
);
61+
62+
export const placementSchema = (opts?: Options<BeforeAfterAlignment>) =>
5063
schema.oneOf([schema.literal('before'), schema.literal('after')], opts);

src/platform/packages/shared/kbn-lens-embeddable-utils/config_builder/schema/bucket_ops.ts

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import {
2121
} from './constants';
2222
import { formatSchema } from './format';
2323
import { labelSharedProp } from './shared';
24+
import { builderEnums } from './enums';
2425

2526
export const bucketDateHistogramOperationSchema = schema.object(
2627
{
@@ -175,7 +176,9 @@ export const bucketTermsOperationSchema = schema.object(
175176
/**
176177
* Direction of the alphabetical order
177178
*/
178-
direction: schema.oneOf([schema.literal('asc'), schema.literal('desc')]),
179+
direction: builderEnums.direction({
180+
meta: { id: 'termsRankByAlphabeticalDirection' },
181+
}),
179182
}),
180183
schema.object({
181184
type: schema.literal('rare'),
@@ -204,7 +207,9 @@ export const bucketTermsOperationSchema = schema.object(
204207
/**
205208
* Direction of the column
206209
*/
207-
direction: schema.oneOf([schema.literal('asc'), schema.literal('desc')]),
210+
direction: builderEnums.direction({
211+
meta: { id: 'termsRankByColumnDirection' },
212+
}),
208213
}),
209214
schema.object({
210215
type: schema.literal('custom'),
@@ -236,7 +241,9 @@ export const bucketTermsOperationSchema = schema.object(
236241
/**
237242
* Direction of the custom operation
238243
*/
239-
direction: schema.oneOf([schema.literal('asc'), schema.literal('desc')]),
244+
direction: builderEnums.direction({
245+
meta: { id: 'termsRankByCustomDirection' },
246+
}),
240247
}),
241248
])
242249
),

src/platform/packages/shared/kbn-lens-embeddable-utils/config_builder/schema/charts/datatable.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import {
2525
} from './shared';
2626
import { horizontalAlignmentSchema } from '../alignments';
2727
import { bucketOperationDefinitionSchema } from '../bucket_ops';
28+
import { builderEnums } from '../enums';
2829

2930
/**
3031
* Datatable supports an additional "badge" mode (render colored values as badges),
@@ -49,9 +50,7 @@ const sortingSchema = schema.oneOf(
4950
min: 0,
5051
meta: { description: 'Index of the column/row to sort by (0-based)' },
5152
}),
52-
direction: schema.oneOf([schema.literal('asc'), schema.literal('desc')], {
53-
meta: { description: 'Sort direction' },
54-
}),
53+
direction: builderEnums.direction({ meta: { description: 'Sort direction' } }),
5554
},
5655
{ meta: { description: 'Sort by a metric or row column' } }
5756
),
@@ -73,9 +72,7 @@ const sortingSchema = schema.oneOf(
7372
description: 'Array of pivot values, one for each split_metrics_by column in order',
7473
},
7574
}),
76-
direction: schema.oneOf([schema.literal('asc'), schema.literal('desc')], {
77-
meta: { description: 'Sort direction' },
78-
}),
75+
direction: builderEnums.direction({ meta: { description: 'Sort direction' } }),
7976
},
8077
{
8178
meta: {

0 commit comments

Comments
 (0)