Skip to content

Commit

Permalink
Merge branch '8.x' into eui/v98.2.1-borealis.1-8.x
Browse files Browse the repository at this point in the history
  • Loading branch information
mgadewoll authored Jan 7, 2025
2 parents 244afc9 + 833ef86 commit 6e74612
Show file tree
Hide file tree
Showing 386 changed files with 2,047 additions and 1,676 deletions.
28 changes: 14 additions & 14 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ packages/kbn-gen-ai-functional-testing @elastic/appex-ai-infra
x-pack/examples/gen_ai_streaming_response_example @elastic/response-ops
packages/kbn-generate @elastic/kibana-operations
packages/kbn-generate-console-definitions @elastic/kibana-management
packages/kbn-generate-csv @elastic/appex-sharedux
src/platform/packages/private/kbn-generate-csv @elastic/appex-sharedux
packages/kbn-get-repo-files @elastic/kibana-operations
x-pack/platform/plugins/private/global_search_bar @elastic/appex-sharedux
x-pack/platform/plugins/shared/global_search @elastic/appex-sharedux
Expand Down Expand Up @@ -733,24 +733,24 @@ src/platform/packages/private/kbn-repo-packages @elastic/kibana-operations
packages/kbn-repo-path @elastic/kibana-operations
packages/kbn-repo-source-classifier @elastic/kibana-operations
packages/kbn-repo-source-classifier-cli @elastic/kibana-operations
packages/kbn-reporting/common @elastic/appex-sharedux
packages/kbn-reporting/get_csv_panel_actions @elastic/appex-sharedux
packages/kbn-reporting/export_types/csv @elastic/appex-sharedux
packages/kbn-reporting/export_types/csv_common @elastic/appex-sharedux
packages/kbn-reporting/export_types/pdf @elastic/appex-sharedux
packages/kbn-reporting/export_types/pdf_common @elastic/appex-sharedux
packages/kbn-reporting/export_types/png @elastic/appex-sharedux
packages/kbn-reporting/export_types/png_common @elastic/appex-sharedux
packages/kbn-reporting/mocks_server @elastic/appex-sharedux
src/platform/packages/private/kbn-reporting/common @elastic/appex-sharedux
src/platform/packages/private/kbn-reporting/get_csv_panel_actions @elastic/appex-sharedux
src/platform/packages/private/kbn-reporting/export_types/csv @elastic/appex-sharedux
src/platform/packages/private/kbn-reporting/export_types/csv_common @elastic/appex-sharedux
src/platform/packages/private/kbn-reporting/export_types/pdf @elastic/appex-sharedux
src/platform/packages/private/kbn-reporting/export_types/pdf_common @elastic/appex-sharedux
src/platform/packages/private/kbn-reporting/export_types/png @elastic/appex-sharedux
src/platform/packages/private/kbn-reporting/export_types/png_common @elastic/appex-sharedux
src/platform/packages/private/kbn-reporting/mocks_server @elastic/appex-sharedux
x-pack/platform/plugins/private/reporting @elastic/appex-sharedux
packages/kbn-reporting/public @elastic/appex-sharedux
packages/kbn-reporting/server @elastic/appex-sharedux
src/platform/packages/private/kbn-reporting/public @elastic/appex-sharedux
src/platform/packages/private/kbn-reporting/server @elastic/appex-sharedux
src/platform/packages/shared/kbn-resizable-layout @elastic/kibana-data-discovery
examples/resizable_layout_examples @elastic/kibana-data-discovery
x-pack/test/plugin_functional/plugins/resolver_test @elastic/security-solution
packages/response-ops/feature_flag_service @elastic/response-ops
packages/response-ops/rule_form @elastic/response-ops
src/platform/packages/private/response-ops/rule_params @elastic/response-ops
src/platform/packages/shared/response-ops/rule_params @elastic/response-ops
examples/response_stream @elastic/ml-ui
src/platform/packages/shared/kbn-rison @elastic/kibana-operations
x-pack/platform/packages/private/rollup @elastic/kibana-management
Expand Down Expand Up @@ -786,7 +786,7 @@ examples/screenshot_mode_example @elastic/appex-sharedux
src/platform/plugins/shared/screenshot_mode @elastic/appex-sharedux
x-pack/examples/screenshotting_example @elastic/appex-sharedux
x-pack/platform/plugins/shared/screenshotting @elastic/kibana-reporting-services
packages/kbn-screenshotting-server @elastic/appex-sharedux
src/platform/packages/private/kbn-screenshotting-server @elastic/appex-sharedux
x-pack/solutions/search/packages/kbn-search-api-keys-components @elastic/search-kibana
x-pack/solutions/search/packages/kbn-search-api-keys-server @elastic/search-kibana
src/platform/packages/shared/kbn-search-api-panels @elastic/search-kibana
Expand Down
4 changes: 2 additions & 2 deletions .i18nrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"files": "src/platform/plugins/shared/files",
"filesManagement": "src/platform/plugins/private/files_management",
"flot": "packages/kbn-flot-charts/lib",
"generateCsv": "packages/kbn-generate-csv",
"generateCsv": "src/platform/packages/private/kbn-generate-csv",
"grouping": "src/platform/packages/shared/kbn-grouping/src",
"alertsGrouping": "x-pack/solutions/observability/packages/kbn-alerts-grouping",
"guidedOnboarding": "src/platform/plugins/shared/guided_onboarding",
Expand Down Expand Up @@ -104,7 +104,7 @@
"reactPackages": "packages/react",
"esqlEditor": "src/platform/packages/private/kbn-esql-editor",
"esqlUtils": "src/platform/packages/shared/kbn-esql-utils",
"reporting": "packages/kbn-reporting",
"reporting": "src/platform/packages/private/kbn-reporting",
"savedObjects": "src/platform/plugins/shared/saved_objects",
"savedObjectsFinder": "src/platform/plugins/shared/saved_objects_finder",
"savedObjectsManagement": "src/platform/plugins/shared/saved_objects_management",
Expand Down
2 changes: 1 addition & 1 deletion docs/settings/reporting-settings.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ The maximum {byte-units}[byte size] of a CSV file before being truncated. This s
exports from causing performance and storage issues. Can be specified as a number of bytes. Defaults to `250mb`.

`xpack.reporting.csv.scroll.size`::
Number of documents retrieved from {es} for each scroll iteration during a CSV export. Defaults to `500`.
Number of documents retrieved from {es} for each scroll iteration during a CSV export. The maximum value is `10000`. Defaults to `500`.
[NOTE]
============
You may need to lower this setting if the default number of documents creates a strain on network resources.
Expand Down
5 changes: 4 additions & 1 deletion examples/eso_model_version_example/server/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,10 @@ export interface EsoModelVersionExamplePluginsStart {
encryptedSavedObjects: EncryptedSavedObjectsPluginStart;
}

export class EsoModelVersionExample implements Plugin<void, void> {
export class EsoModelVersionExample
implements
Plugin<void, void, EsoModelVersionExamplePluginSetup, EsoModelVersionExamplePluginsStart>
{
public setup(
core: CoreSetup<EsoModelVersionExamplePluginsStart>,
plugins: EsoModelVersionExamplePluginSetup
Expand Down
30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,7 @@
"@kbn/functional-with-es-ssl-cases-test-plugin": "link:x-pack/test/functional_with_es_ssl/plugins/cases",
"@kbn/gen-ai-streaming-response-example-plugin": "link:x-pack/examples/gen_ai_streaming_response_example",
"@kbn/generate-console-definitions": "link:packages/kbn-generate-console-definitions",
"@kbn/generate-csv": "link:packages/kbn-generate-csv",
"@kbn/generate-csv": "link:src/platform/packages/private/kbn-generate-csv",
"@kbn/global-search-bar-plugin": "link:x-pack/platform/plugins/private/global_search_bar",
"@kbn/global-search-plugin": "link:x-pack/platform/plugins/shared/global_search",
"@kbn/global-search-providers-plugin": "link:x-pack/platform/plugins/private/global_search_providers",
Expand Down Expand Up @@ -745,24 +745,24 @@
"@kbn/rendering-plugin": "link:test/plugin_functional/plugins/rendering_plugin",
"@kbn/repo-info": "link:src/platform/packages/shared/kbn-repo-info",
"@kbn/repo-packages": "link:src/platform/packages/private/kbn-repo-packages",
"@kbn/reporting-common": "link:packages/kbn-reporting/common",
"@kbn/reporting-csv-share-panel": "link:packages/kbn-reporting/get_csv_panel_actions",
"@kbn/reporting-export-types-csv": "link:packages/kbn-reporting/export_types/csv",
"@kbn/reporting-export-types-csv-common": "link:packages/kbn-reporting/export_types/csv_common",
"@kbn/reporting-export-types-pdf": "link:packages/kbn-reporting/export_types/pdf",
"@kbn/reporting-export-types-pdf-common": "link:packages/kbn-reporting/export_types/pdf_common",
"@kbn/reporting-export-types-png": "link:packages/kbn-reporting/export_types/png",
"@kbn/reporting-export-types-png-common": "link:packages/kbn-reporting/export_types/png_common",
"@kbn/reporting-mocks-server": "link:packages/kbn-reporting/mocks_server",
"@kbn/reporting-common": "link:src/platform/packages/private/kbn-reporting/common",
"@kbn/reporting-csv-share-panel": "link:src/platform/packages/private/kbn-reporting/get_csv_panel_actions",
"@kbn/reporting-export-types-csv": "link:src/platform/packages/private/kbn-reporting/export_types/csv",
"@kbn/reporting-export-types-csv-common": "link:src/platform/packages/private/kbn-reporting/export_types/csv_common",
"@kbn/reporting-export-types-pdf": "link:src/platform/packages/private/kbn-reporting/export_types/pdf",
"@kbn/reporting-export-types-pdf-common": "link:src/platform/packages/private/kbn-reporting/export_types/pdf_common",
"@kbn/reporting-export-types-png": "link:src/platform/packages/private/kbn-reporting/export_types/png",
"@kbn/reporting-export-types-png-common": "link:src/platform/packages/private/kbn-reporting/export_types/png_common",
"@kbn/reporting-mocks-server": "link:src/platform/packages/private/kbn-reporting/mocks_server",
"@kbn/reporting-plugin": "link:x-pack/platform/plugins/private/reporting",
"@kbn/reporting-public": "link:packages/kbn-reporting/public",
"@kbn/reporting-server": "link:packages/kbn-reporting/server",
"@kbn/reporting-public": "link:src/platform/packages/private/kbn-reporting/public",
"@kbn/reporting-server": "link:src/platform/packages/private/kbn-reporting/server",
"@kbn/resizable-layout": "link:src/platform/packages/shared/kbn-resizable-layout",
"@kbn/resizable-layout-examples-plugin": "link:examples/resizable_layout_examples",
"@kbn/resolver-test-plugin": "link:x-pack/test/plugin_functional/plugins/resolver_test",
"@kbn/response-ops-feature-flag-service": "link:packages/response-ops/feature_flag_service",
"@kbn/response-ops-rule-form": "link:packages/response-ops/rule_form",
"@kbn/response-ops-rule-params": "link:src/platform/packages/private/response-ops/rule_params",
"@kbn/response-ops-rule-params": "link:src/platform/packages/shared/response-ops/rule_params",
"@kbn/response-stream-plugin": "link:examples/response_stream",
"@kbn/rison": "link:src/platform/packages/shared/kbn-rison",
"@kbn/rollup": "link:x-pack/platform/packages/private/rollup",
Expand Down Expand Up @@ -795,7 +795,7 @@
"@kbn/screenshot-mode-plugin": "link:src/platform/plugins/shared/screenshot_mode",
"@kbn/screenshotting-example-plugin": "link:x-pack/examples/screenshotting_example",
"@kbn/screenshotting-plugin": "link:x-pack/platform/plugins/shared/screenshotting",
"@kbn/screenshotting-server": "link:packages/kbn-screenshotting-server",
"@kbn/screenshotting-server": "link:src/platform/packages/private/kbn-screenshotting-server",
"@kbn/search-api-keys-components": "link:x-pack/solutions/search/packages/kbn-search-api-keys-components",
"@kbn/search-api-keys-server": "link:x-pack/solutions/search/packages/kbn-search-api-keys-server",
"@kbn/search-api-panels": "link:src/platform/packages/shared/kbn-search-api-panels",
Expand Down Expand Up @@ -1590,7 +1590,7 @@
"@types/fetch-mock": "^7.3.1",
"@types/file-saver": "^2.0.0",
"@types/flot": "^0.0.31",
"@types/fnv-plus": "^1.3.0",
"@types/fnv-plus": "^1.3.2",
"@types/geojson": "^7946.0.10",
"@types/getos": "^3.0.0",
"@types/gulp": "^4.0.6",
Expand Down
7 changes: 6 additions & 1 deletion packages/kbn-es/src/utils/build_snapshot.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,12 @@ export async function buildSnapshot({
export function archiveForPlatform(platform: NodeJS.Platform, license: string) {
switch (platform) {
case 'darwin':
return { format: 'tar', ext: 'tar.gz', task: 'darwin-tar', platform: 'darwin' };
return {
format: 'tar',
ext: 'tar.gz',
task: os.arch() === 'arm64' ? 'darwin-aarch64-tar' : 'darwin-tar',
platform: 'darwin',
};
case 'win32':
return { format: 'zip', ext: 'zip', task: 'windows-zip', platform: 'windows' };
case 'linux':
Expand Down
14 changes: 0 additions & 14 deletions packages/kbn-reporting/mocks_server/jest.config.js

This file was deleted.

19 changes: 0 additions & 19 deletions packages/kbn-reporting/mocks_server/tsconfig.json

This file was deleted.

14 changes: 0 additions & 14 deletions packages/kbn-screenshotting-server/jest.config.js

This file was deleted.

2 changes: 1 addition & 1 deletion src/core/packages/lifecycle/browser/src/core_setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import type { CoreStart } from './core_start';
* navigation in the generated docs until there's a fix for
* https://github.com/Microsoft/web-build-tools/issues/1237
*/
export interface CoreSetup<TPluginsStart extends object = object, TStart = unknown> {
export interface CoreSetup<TPluginsStart extends Record<string, any> = {}, TStart = unknown> {
/** {@link AnalyticsServiceSetup} */
analytics: AnalyticsServiceSetup;
/** {@link ApplicationSetup} */
Expand Down
2 changes: 1 addition & 1 deletion src/core/packages/lifecycle/server/src/core_setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ import type { CoreStart } from './core_start';
* consuming {@link Plugin}'s `TStart` type. Used by `getStartServices`.
* @public
*/
export interface CoreSetup<TPluginsStart extends object = object, TStart = unknown> {
export interface CoreSetup<TPluginsStart extends Record<string, any> = {}, TStart = unknown> {
/** {@link AnalyticsServiceSetup} */
analytics: AnalyticsServiceSetup;
/** {@link CapabilitiesSetup} */
Expand Down
4 changes: 2 additions & 2 deletions src/core/packages/plugins/browser/src/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import type { CoreStart, CoreSetup } from '@kbn/core-lifecycle-browser';
export interface Plugin<
TSetup = void,
TStart = void,
TPluginsSetup extends object = object,
TPluginsStart extends object = object
TPluginsSetup extends Record<string, any> = never,
TPluginsStart extends Record<string, any> = never
> {
setup(core: CoreSetup<TPluginsStart, TStart>, plugins: TPluginsSetup): TSetup;

Expand Down
8 changes: 4 additions & 4 deletions src/core/packages/plugins/browser/src/plugin_initializer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import type { Plugin } from './plugin';
* @public
*/
export type PluginInitializer<
TSetup,
TStart,
TPluginsSetup extends object = object,
TPluginsStart extends object = object
TSetup = void,
TStart = void,
TPluginsSetup extends Record<string, any> = never,
TPluginsStart extends Record<string, any> = never
> = (core: PluginInitializerContext) => Plugin<TSetup, TStart, TPluginsSetup, TPluginsStart>;

/**
Expand Down
4 changes: 2 additions & 2 deletions src/core/packages/plugins/server-internal/src/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ export class PluginWrapper<
* is the contract returned by the dependency's `setup` function.
*/
public setup(
setupContext: CoreSetup<TPluginsStart> | CorePreboot,
setupContext: CoreSetup<TPluginsStart, TStart> | CorePreboot,
plugins: TPluginsSetup
): TSetup | Promise<TSetup> {
if (!this.instance) {
Expand All @@ -109,7 +109,7 @@ export class PluginWrapper<
return this.instance.setup(setupContext as CorePreboot, plugins);
}

return this.instance.setup(setupContext as CoreSetup, plugins);
return this.instance.setup(setupContext as CoreSetup<TPluginsStart, TStart>, plugins);
}

/**
Expand Down
14 changes: 7 additions & 7 deletions src/core/packages/plugins/server/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -291,10 +291,10 @@ export interface PrebootPlugin<TSetup = void, TPluginsSetup extends object = obj
export interface Plugin<
TSetup = void,
TStart = void,
TPluginsSetup extends object = object,
TPluginsStart extends object = object
TPluginsSetup extends Record<string, any> = {},
TPluginsStart extends Record<string, any> = {}
> {
setup(core: CoreSetup, plugins: TPluginsSetup): TSetup;
setup(core: CoreSetup<TPluginsStart, TStart>, plugins: TPluginsSetup): TSetup;

start(core: CoreStart, plugins: TPluginsStart): TStart;

Expand Down Expand Up @@ -451,10 +451,10 @@ export interface PluginInitializerContext<ConfigSchema = unknown> {
* @public
*/
export type PluginInitializer<
TSetup,
TStart,
TPluginsSetup extends object = object,
TPluginsStart extends object = object
TSetup = void,
TStart = void,
TPluginsSetup extends Record<string, any> = never,
TPluginsStart extends Record<string, any> = never
> = (
core: PluginInitializerContext
) => Promise<
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@

module.exports = {
preset: '@kbn/test/jest_node',
rootDir: '../..',
roots: ['<rootDir>/packages/kbn-generate-csv/'],
rootDir: '../../../../..',
roots: ['<rootDir>/src/platform/packages/private/kbn-generate-csv/'],
};
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"extends": "../../../../../tsconfig.base.json",
"compilerOptions": {
"outDir": "target/types",
"types": [
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@

module.exports = {
preset: '@kbn/test',
rootDir: '../../..',
roots: ['<rootDir>/packages/kbn-reporting/get_csv_panel_actions'],
rootDir: '../../../../../..',
roots: ['<rootDir>/src/platform/packages/private/kbn-reporting/common'],
};
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../../tsconfig.base.json",
"extends": "../../../../../../tsconfig.base.json",
"compilerOptions": {
"outDir": "target/types",
"types": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export interface ReportOutput extends TaskRunResult {
}

/**
* @see also {@link packages/kbn-reporting/common/types.ts}
* @see also {@link src/platform/packages/private/kbn-reporting/common/types.ts}
*/
export type CsvPagingStrategy = 'pit' | 'scroll';

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@

module.exports = {
preset: '@kbn/test/jest_node',
rootDir: '../../../..',
roots: ['<rootDir>/packages/kbn-reporting/export_types/png'],
rootDir: '../../../../../../..',
roots: ['<rootDir>/src/platform/packages/private/kbn-reporting/export_types/csv'],
};
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../../../tsconfig.base.json",
"extends": "../../../../../../../tsconfig.base.json",
"compilerOptions": {
"outDir": "target/types",
"types": [
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the "Elastic License
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
* Public License v 1"; you may not use this file except in compliance with, at
* your election, the "Elastic License 2.0", the "GNU Affero General Public
* License v3.0 only", or the "Server Side Public License, v 1".
*/

module.exports = {
preset: '@kbn/test',
rootDir: '../../../../../../..',
roots: ['<rootDir>/src/platform/packages/private/kbn-reporting/export_types/csv_common'],
};
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../../../tsconfig.base.json",
"extends": "../../../../../../../tsconfig.base.json",
"compilerOptions": {
"outDir": "target/types",
"types": [
Expand Down
Loading

0 comments on commit 6e74612

Please sign in to comment.