-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '8.8' into backport/8.8/pr-155938
- Loading branch information
Showing
29 changed files
with
664 additions
and
86 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,2 @@ | ||
| uiSettings.overrides.defaultRoute: /app/observability/overview | ||
| xpack.infra.logs.app_target: discover |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
25
packages/core/root/core-root-server-internal/src/bootstrap.test.mocks.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| /* | ||
| * 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 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 or the Server | ||
| * Side Public License, v 1. | ||
| */ | ||
|
|
||
| import { Env } from '@kbn/config'; | ||
| import { rawConfigServiceMock, configServiceMock } from '@kbn/config-mocks'; | ||
|
|
||
| export const mockConfigService = configServiceMock.create(); | ||
| export const mockRawConfigService = rawConfigServiceMock.create(); | ||
| export const mockRawConfigServiceConstructor = jest.fn(() => mockRawConfigService); | ||
| jest.doMock('@kbn/config', () => ({ | ||
| ConfigService: jest.fn(() => mockConfigService), | ||
| Env, | ||
| RawConfigService: jest.fn(mockRawConfigServiceConstructor), | ||
| })); | ||
|
|
||
| jest.doMock('./root', () => ({ | ||
| Root: jest.fn(() => ({ | ||
| shutdown: jest.fn(), | ||
| })), | ||
| })); |
61 changes: 61 additions & 0 deletions
61
packages/core/root/core-root-server-internal/src/bootstrap.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| /* | ||
| * 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 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 or the Server | ||
| * Side Public License, v 1. | ||
| */ | ||
|
|
||
| import { of } from 'rxjs'; | ||
| import type { CliArgs } from '@kbn/config'; | ||
|
|
||
| import { mockRawConfigService, mockRawConfigServiceConstructor } from './bootstrap.test.mocks'; | ||
|
|
||
| jest.mock('@kbn/core-logging-server-internal'); | ||
|
|
||
| import { bootstrap } from './bootstrap'; | ||
|
|
||
| const bootstrapCfg = { | ||
| configs: ['config/kibana.yml'], | ||
| cliArgs: {} as unknown as CliArgs, | ||
| applyConfigOverrides: () => ({}), | ||
| }; | ||
|
|
||
| describe('bootstrap', () => { | ||
| describe('serverless', () => { | ||
| beforeEach(() => { | ||
| jest.clearAllMocks(); | ||
| }); | ||
|
|
||
| test('should load additional serverless files for a valid project', async () => { | ||
| mockRawConfigService.getConfig$.mockReturnValue(of({ serverless: 'es' })); | ||
| await bootstrap(bootstrapCfg); | ||
| expect(mockRawConfigServiceConstructor).toHaveBeenCalledTimes(2); | ||
| expect(mockRawConfigServiceConstructor).toHaveBeenNthCalledWith( | ||
| 1, | ||
| bootstrapCfg.configs, | ||
| bootstrapCfg.applyConfigOverrides | ||
| ); | ||
| expect(mockRawConfigServiceConstructor).toHaveBeenNthCalledWith( | ||
| 2, | ||
| [ | ||
| expect.stringContaining('config/serverless.yml'), | ||
| expect.stringContaining('config/serverless.es.yml'), | ||
| ...bootstrapCfg.configs, | ||
| ], | ||
| bootstrapCfg.applyConfigOverrides | ||
| ); | ||
| }); | ||
|
|
||
| test('should skip loading the serverless files for an invalid project', async () => { | ||
| mockRawConfigService.getConfig$.mockReturnValue(of({ serverless: 'not-valid' })); | ||
| await bootstrap(bootstrapCfg); | ||
| expect(mockRawConfigServiceConstructor).toHaveBeenCalledTimes(1); | ||
| expect(mockRawConfigServiceConstructor).toHaveBeenNthCalledWith( | ||
| 1, | ||
| bootstrapCfg.configs, | ||
| bootstrapCfg.applyConfigOverrides | ||
| ); | ||
| }); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 34 additions & 0 deletions
34
packages/core/root/core-root-server-internal/src/root/serverless_config.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| /* | ||
| * 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 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 or the Server | ||
| * Side Public License, v 1. | ||
| */ | ||
|
|
||
| import { schema, TypeOf, Type } from '@kbn/config-schema'; | ||
| import { ServiceConfigDescriptor } from '@kbn/core-base-server-internal'; | ||
|
|
||
| // Config validation for how to run Kibana in Serverless mode. | ||
| // Clients need to specify the project type to run in. | ||
| // Going for a simple `serverless` string because it serves as | ||
| // a direct replacement to the legacy --serverless CLI flag. | ||
| // If we even decide to extend this further, and converting it into an object, | ||
| // BWC can be ensured by adding the object definition as another alternative to `schema.oneOf`. | ||
|
|
||
| export const VALID_SERVERLESS_PROJECT_TYPES = ['es', 'oblt', 'security']; | ||
|
|
||
| const serverlessConfigSchema = schema.maybe( | ||
| schema.oneOf( | ||
| VALID_SERVERLESS_PROJECT_TYPES.map((projectName) => schema.literal(projectName)) as [ | ||
| Type<typeof VALID_SERVERLESS_PROJECT_TYPES[number]> // This cast is needed because it's different to Type<T>[] :sight: | ||
| ] | ||
| ) | ||
| ); | ||
|
|
||
| export type ServerlessConfigType = TypeOf<typeof serverlessConfigSchema>; | ||
|
|
||
| export const serverlessConfig: ServiceConfigDescriptor<ServerlessConfigType> = { | ||
| path: 'serverless', | ||
| schema: serverlessConfigSchema, | ||
| }; |
Oops, something went wrong.