Skip to content

Commit 5ed0f10

Browse files
Merge branch 'main' into flaky-test-237285
2 parents efd0e19 + 4f06a03 commit 5ed0f10

73 files changed

Lines changed: 1460 additions & 222 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/package-lock.json

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

.buildkite/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"@types/jscodeshift": "^0.12.0",
2525
"@types/minimatch": "^3.0.5",
2626
"@types/minimist": "^1.2.5",
27-
"@types/node": "^22.19.1",
27+
"@types/node": "22.19.0",
2828
"jest": "^30.0.3",
2929
"jscodeshift": "^17.1.2",
3030
"nock": "^12.0.2",

.buildkite/scripts/steps/typecheck/check_types.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ source .buildkite/scripts/common/util.sh
77
.buildkite/scripts/bootstrap.sh
88

99
echo --- Check Types
10-
set +e
11-
node scripts/type_check --with-archive
10+
11+
node scripts/type_check

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2625,6 +2625,7 @@ x-pack/solutions/security/test/serverless/functional/configs/config.context_awar
26252625
/x-pack/solutions/security/plugins/security_solution/public/detections/utils @elastic/security-threat-hunting-investigations
26262626
/x-pack/solutions/security/plugins/security_solution/public/flyout/document_details @elastic/security-threat-hunting-investigations
26272627
/x-pack/solutions/security/plugins/security_solution/public/flyout/network_details @elastic/security-threat-hunting-investigations
2628+
/x-pack/solutions/security/plugins/security_solution/public/flyout/attack_details @elastic/security-threat-hunting-investigations
26282629
/x-pack/solutions/security/plugins/security_solution/public/flyout/shared @elastic/security-threat-hunting-investigations
26292630
/x-pack/solutions/security/plugins/security_solution/public/flyout/rule_details @elastic/security-threat-hunting-investigations
26302631
/x-pack/solutions/security/plugins/security_solution/public/investigations @elastic/security-threat-hunting-investigations

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ If you want to use a Kibana release in production, give it a test run, or just p
2121

2222
- Download the latest version on the [Kibana Download Page](https://www.elastic.co/downloads/kibana).
2323
- Learn more about Kibana's features and capabilities on the
24-
[Kibana Product Page](https://www.elastic.co/products/kibana).
24+
[Kibana Product Page](https://www.elastic.co/kibana).
2525
- We also offer a hosted version of Kibana on our
2626
[Cloud Service](https://www.elastic.co/cloud/as-a-service).
2727

@@ -32,8 +32,7 @@ out an open PR:
3232

3333
- [CONTRIBUTING.md](CONTRIBUTING.md) will help you get Kibana up and running.
3434
- If you would like to contribute code, please follow our [STYLEGUIDE.mdx](STYLEGUIDE.mdx).
35-
- For all other questions, check out the [FAQ.md](FAQ.md) and
36-
[wiki](https://github.com/elastic/kibana/wiki).
35+
- For all other questions, check out the [FAQ.md](FAQ.md).
3736

3837
## Documentation
3938

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1829,7 +1829,7 @@
18291829
"@types/moment-duration-format": "^2.2.6",
18301830
"@types/mustache": "^4.2.5",
18311831
"@types/nock": "^10.0.3",
1832-
"@types/node": "22.19.1",
1832+
"@types/node": "22.19.0",
18331833
"@types/node-fetch": "2.6.4",
18341834
"@types/node-forge": "^1.3.14",
18351835
"@types/nodemailer": "^7.0.4",

src/dev/build/build_distributables.ts

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import chalk from 'chalk';
1111
import type { ToolingLog } from '@kbn/tooling-log';
1212

13-
import { Config, createRunner } from './lib';
13+
import { Config, SOLUTION_BUILDS, createRunner } from './lib';
1414
import * as Tasks from './tasks';
1515

1616
export interface BuildOptions {
@@ -167,16 +167,12 @@ export async function buildDistributables(log: ToolingLog, options: BuildOptions
167167

168168
if (options.createDockerServerless) {
169169
// control w/ --docker-images and --skip-docker-serverless
170-
artifactTasks.push(Tasks.CreateDockerServerless('x64', null));
171-
artifactTasks.push(Tasks.CreateDockerServerless('x64', 'workplaceai'));
172-
artifactTasks.push(Tasks.CreateDockerServerless('x64', 'observability'));
173-
artifactTasks.push(Tasks.CreateDockerServerless('x64', 'elasticsearch'));
174-
artifactTasks.push(Tasks.CreateDockerServerless('x64', 'security'));
175-
artifactTasks.push(Tasks.CreateDockerServerless('aarch64', null));
176-
artifactTasks.push(Tasks.CreateDockerServerless('aarch64', 'workplaceai'));
177-
artifactTasks.push(Tasks.CreateDockerServerless('aarch64', 'observability'));
178-
artifactTasks.push(Tasks.CreateDockerServerless('aarch64', 'elasticsearch'));
179-
artifactTasks.push(Tasks.CreateDockerServerless('aarch64', 'security'));
170+
artifactTasks.push(Tasks.CreateDockerServerless('x64'));
171+
artifactTasks.push(Tasks.CreateDockerServerless('aarch64'));
172+
SOLUTION_BUILDS.forEach((solution) => {
173+
artifactTasks.push(Tasks.CreateDockerServerless('x64', solution));
174+
artifactTasks.push(Tasks.CreateDockerServerless('aarch64', solution));
175+
});
180176
}
181177

182178
if (options.createDockerFIPS) {

src/dev/build/lib/archive_utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export async function unzipBuffer(buffer: Buffer): Promise<ZipEntry[]> {
4444
return zipEntries;
4545
}
4646

47-
export async function createZipFile(entries: ZipEntry[], destination: string): Promise<Buffer> {
47+
export async function createZipFile(entries: ZipEntry[], destination: string): Promise<void> {
4848
const zipfile = new yazl.ZipFile();
4949

5050
for (const entry of entries) {

src/dev/build/lib/build.ts

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import chalk from 'chalk';
1111

1212
import type { Config } from './config';
1313
import type { Platform } from './platform';
14+
import { dashSuffix } from './util';
1415

1516
export class Build {
1617
private buildDesc: string = '';
@@ -24,32 +25,30 @@ export class Build {
2425
}
2526

2627
resolvePathForPlatform(platform: Platform, ...args: string[]) {
27-
const variant = platform.getVariant() ? `-${platform.getVariant()}` : '';
28-
const solution = platform.getSolution() ? `-${platform.getSolution()}` : '';
2928
return this.config.resolveFromRepo(
3029
'build',
3130
'default',
32-
`kibana${variant}${solution}-${this.config.getBuildVersion()}-${platform.getBuildName()}`,
31+
`kibana${dashSuffix(platform.getVariant())}${dashSuffix(
32+
platform.getSolutionArtifact()
33+
)}-${this.config.getBuildVersion()}-${platform.getBuildName()}`,
3334
...args
3435
);
3536
}
3637

3738
getPlatformArchivePath(platform: Platform) {
3839
const ext = platform.isWindows() ? 'zip' : 'tar.gz';
39-
const variant = platform.getVariant() ? `-${platform.getVariant()}` : '';
40-
const solution = platform.getSolution() ? `-${platform.getSolution()}` : '';
4140
return this.config.resolveFromRepo(
4241
'target',
43-
`${
44-
this.name
45-
}${variant}${solution}-${this.config.getBuildVersion()}-${platform.getBuildName()}.${ext}`
42+
`${this.name}${dashSuffix(platform.getVariant())}${dashSuffix(
43+
platform.getSolutionArtifact()
44+
)}-${this.config.getBuildVersion()}-${platform.getBuildName()}.${ext}`
4645
);
4746
}
4847

4948
getRootDirectory(platform: Platform) {
50-
const variant = platform.getVariant() ? `-${platform.getVariant()}` : '';
51-
const solution = platform.getSolution() ? `-${platform.getSolution()}` : '';
52-
return `${this.name}${variant}${solution}-${this.config.getBuildVersion()}`;
49+
return `${this.name}${dashSuffix(platform.getVariant())}${dashSuffix(
50+
platform.getSolutionArtifact()
51+
)}-${this.config.getBuildVersion()}`;
5352
}
5453

5554
getName() {

src/dev/build/lib/config.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ import {
1818
type PluginPackage,
1919
getPluginPackagesFilter,
2020
} from '@kbn/repo-packages';
21+
import type { KibanaSolution } from '@kbn/projects-solutions-groups';
2122
import type { VersionInfo } from './version_info';
2223
import { getVersionInfo } from './version_info';
23-
import type { PlatformName, PlatformArchitecture, Solution } from './platform';
24+
import type { PlatformName, PlatformArchitecture } from './platform';
2425
import { ALL_PLATFORMS, SERVERLESS_PLATFORMS } from './platform';
2526
import type { BuildOptions } from '../build_distributables';
2627

@@ -275,7 +276,7 @@ export class Config {
275276
return getPackages(this.repoRoot).filter((p) => !p.isDevOnly() && this.pluginFilter(p));
276277
}
277278

278-
getPrivateSolutionPackagesFromRepo(project: Solution) {
279+
getPrivateSolutionPackagesFromRepo(project: KibanaSolution) {
279280
return getPackages(this.repoRoot).filter(
280281
(p) => p.group === project && p.visibility === 'private'
281282
);

0 commit comments

Comments
 (0)