Skip to content

Commit 09c920f

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into task-manager/run-now
2 parents 2a6ea1f + a80366b commit 09c920f

705 files changed

Lines changed: 13996 additions & 9777 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.

‎.eslintrc.js‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,7 @@ module.exports = {
337337
'!src/core/server/index.ts',
338338
'!src/core/server/mocks.ts',
339339
'!src/core/server/types.ts',
340+
'!src/core/server/test_utils.ts',
340341
// for absolute imports until fixed in
341342
// https://github.com/elastic/kibana/issues/36096
342343
'!src/core/server/types',
@@ -350,6 +351,21 @@ module.exports = {
350351
],
351352
allowSameFolder: true,
352353
},
354+
{
355+
target: ['src/core/**/*'],
356+
from: ['x-pack/**/*'],
357+
errorMessage: 'OSS cannot import x-pack files.',
358+
},
359+
{
360+
target: ['src/core/**/*'],
361+
from: [
362+
'plugins/**/*',
363+
'src/plugins/**/*',
364+
'src/legacy/core_plugins/**/*',
365+
'src/legacy/ui/**/*',
366+
],
367+
errorMessage: 'The core cannot depend on any plugins.',
368+
},
353369
{
354370
from: ['src/legacy/ui/**/*', 'ui/**/*'],
355371
target: [

‎.github/CODEOWNERS‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,21 @@
1313
/src/plugins/kibana_react/ @elastic/kibana-app-arch
1414
/src/plugins/kibana_utils/ @elastic/kibana-app-arch
1515
/src/plugins/navigation/ @elastic/kibana-app-arch
16+
/src/plugins/share/ @elastic/kibana-app-arch
1617
/src/plugins/ui_actions/ @elastic/kibana-app-arch
1718
/src/plugins/visualizations/ @elastic/kibana-app-arch
1819
/x-pack/plugins/advanced_ui_actions/ @elastic/kibana-app-arch
20+
/src/legacy/core_plugins/data/ @elastic/kibana-app-arch
21+
/src/legacy/core_plugins/embeddable_api/ @elastic/kibana-app-arch
22+
/src/legacy/core_plugins/interpreter/ @elastic/kibana-app-arch
23+
/src/legacy/core_plugins/kibana_react/ @elastic/kibana-app-arch
24+
/src/legacy/core_plugins/kibana/public/management/ @elastic/kibana-app-arch
25+
/src/legacy/core_plugins/kibana/server/field_formats/ @elastic/kibana-app-arch
26+
/src/legacy/core_plugins/kibana/server/routes/api/management/ @elastic/kibana-app-arch
27+
/src/legacy/core_plugins/kibana/server/routes/api/suggestions/ @elastic/kibana-app-arch
28+
/src/legacy/core_plugins/visualizations/ @elastic/kibana-app-arch
29+
/src/legacy/server/index_patterns/ @elastic/kibana-app-arch
30+
/src/legacy/server/url_shortening/ @elastic/kibana-app-arch
1931

2032
# APM
2133
/x-pack/legacy/plugins/apm/ @elastic/apm-ui

‎Jenkinsfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
1212
'kibana-intake-agent': kibanaPipeline.legacyJobRunner('kibana-intake'),
1313
'x-pack-intake-agent': kibanaPipeline.legacyJobRunner('x-pack-intake'),
1414
'kibana-oss-agent': kibanaPipeline.withWorkers('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
15+
'oss-firefoxSmoke': kibanaPipeline.getPostBuildWorker('firefoxSmoke', { runbld('./test/scripts/jenkins_firefox_smoke.sh', 'Execute kibana-firefoxSmoke') }),
1516
'oss-ciGroup1': kibanaPipeline.getOssCiGroupWorker(1),
1617
'oss-ciGroup2': kibanaPipeline.getOssCiGroupWorker(2),
1718
'oss-ciGroup3': kibanaPipeline.getOssCiGroupWorker(3),
@@ -24,11 +25,11 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
2425
'oss-ciGroup10': kibanaPipeline.getOssCiGroupWorker(10),
2526
'oss-ciGroup11': kibanaPipeline.getOssCiGroupWorker(11),
2627
'oss-ciGroup12': kibanaPipeline.getOssCiGroupWorker(12),
27-
'oss-firefoxSmoke': kibanaPipeline.getPostBuildWorker('firefoxSmoke', { runbld('./test/scripts/jenkins_firefox_smoke.sh', 'Execute kibana-firefoxSmoke') }),
2828
'oss-accessibility': kibanaPipeline.getPostBuildWorker('accessibility', { runbld('./test/scripts/jenkins_accessibility.sh', 'Execute kibana-accessibility') }),
29-
'oss-visualRegression': kibanaPipeline.getPostBuildWorker('visualRegression', { runbld('./test/scripts/jenkins_visual_regression.sh', 'Execute kibana-visualRegression') }),
29+
// 'oss-visualRegression': kibanaPipeline.getPostBuildWorker('visualRegression', { runbld('./test/scripts/jenkins_visual_regression.sh', 'Execute kibana-visualRegression') }),
3030
]),
3131
'kibana-xpack-agent': kibanaPipeline.withWorkers('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
32+
'xpack-firefoxSmoke': kibanaPipeline.getPostBuildWorker('xpack-firefoxSmoke', { runbld('./test/scripts/jenkins_xpack_firefox_smoke.sh', 'Execute xpack-firefoxSmoke') }),
3233
'xpack-ciGroup1': kibanaPipeline.getXpackCiGroupWorker(1),
3334
'xpack-ciGroup2': kibanaPipeline.getXpackCiGroupWorker(2),
3435
'xpack-ciGroup3': kibanaPipeline.getXpackCiGroupWorker(3),
@@ -39,9 +40,8 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
3940
'xpack-ciGroup8': kibanaPipeline.getXpackCiGroupWorker(8),
4041
'xpack-ciGroup9': kibanaPipeline.getXpackCiGroupWorker(9),
4142
'xpack-ciGroup10': kibanaPipeline.getXpackCiGroupWorker(10),
42-
'xpack-firefoxSmoke': kibanaPipeline.getPostBuildWorker('xpack-firefoxSmoke', { runbld('./test/scripts/jenkins_xpack_firefox_smoke.sh', 'Execute xpack-firefoxSmoke') }),
4343
'xpack-accessibility': kibanaPipeline.getPostBuildWorker('xpack-accessibility', { runbld('./test/scripts/jenkins_xpack_accessibility.sh', 'Execute xpack-accessibility') }),
44-
'xpack-visualRegression': kibanaPipeline.getPostBuildWorker('xpack-visualRegression', { runbld('./test/scripts/jenkins_xpack_visual_regression.sh', 'Execute xpack-visualRegression') }),
44+
// 'xpack-visualRegression': kibanaPipeline.getPostBuildWorker('xpack-visualRegression', { runbld('./test/scripts/jenkins_xpack_visual_regression.sh', 'Execute xpack-visualRegression') }),
4545
]),
4646
])
4747
}

‎config/kibana.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151

5252
# Optional settings that provide the paths to the PEM-format SSL certificate and key files.
5353
# These files are used to verify the identity of Kibana to Elasticsearch and are required when
54-
# xpack.ssl.verification_mode in Elasticsearch is set to either certificate or full.
54+
# xpack.security.http.ssl.client_authentication in Elasticsearch is set to required.
5555
#elasticsearch.ssl.certificate: /path/to/your/client.crt
5656
#elasticsearch.ssl.key: /path/to/your/client.key
5757

‎docs/development/core/public/kibana-plugin-public.appmountcontext.core.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ core: {
1717
i18n: I18nStart;
1818
notifications: NotificationsStart;
1919
overlays: OverlayStart;
20-
uiSettings: UiSettingsClientContract;
20+
uiSettings: IUiSettingsClient;
2121
injectedMetadata: {
2222
getInjectedVar: (name: string, defaultValue?: any) => unknown;
2323
};

‎docs/development/core/public/kibana-plugin-public.appmountcontext.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ export interface AppMountContext
1616

1717
| Property | Type | Description |
1818
| --- | --- | --- |
19-
| [core](./kibana-plugin-public.appmountcontext.core.md) | <code>{</code><br/><code> application: Pick&lt;ApplicationStart, 'capabilities' &#124; 'navigateToApp'&gt;;</code><br/><code> chrome: ChromeStart;</code><br/><code> docLinks: DocLinksStart;</code><br/><code> http: HttpStart;</code><br/><code> i18n: I18nStart;</code><br/><code> notifications: NotificationsStart;</code><br/><code> overlays: OverlayStart;</code><br/><code> uiSettings: UiSettingsClientContract;</code><br/><code> injectedMetadata: {</code><br/><code> getInjectedVar: (name: string, defaultValue?: any) =&gt; unknown;</code><br/><code> };</code><br/><code> }</code> | Core service APIs available to mounted applications. |
19+
| [core](./kibana-plugin-public.appmountcontext.core.md) | <code>{</code><br/><code> application: Pick&lt;ApplicationStart, 'capabilities' &#124; 'navigateToApp'&gt;;</code><br/><code> chrome: ChromeStart;</code><br/><code> docLinks: DocLinksStart;</code><br/><code> http: HttpStart;</code><br/><code> i18n: I18nStart;</code><br/><code> notifications: NotificationsStart;</code><br/><code> overlays: OverlayStart;</code><br/><code> uiSettings: IUiSettingsClient;</code><br/><code> injectedMetadata: {</code><br/><code> getInjectedVar: (name: string, defaultValue?: any) =&gt; unknown;</code><br/><code> };</code><br/><code> }</code> | Core service APIs available to mounted applications. |
2020

‎docs/development/core/public/kibana-plugin-public.contextsetup.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Say we're creating a plugin for rendering visualizations that allows new renderi
8585
export interface VizRenderContext {
8686
core: {
8787
i18n: I18nStart;
88-
uiSettings: UISettingsClientContract;
88+
uiSettings: IUiSettingsClient;
8989
}
9090
[contextName: string]: unknown;
9191
}

‎docs/development/core/public/kibana-plugin-public.coresetup.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ export interface CoreSetup
2222
| [http](./kibana-plugin-public.coresetup.http.md) | <code>HttpSetup</code> | [HttpSetup](./kibana-plugin-public.httpsetup.md) |
2323
| [injectedMetadata](./kibana-plugin-public.coresetup.injectedmetadata.md) | <code>{</code><br/><code> getInjectedVar: (name: string, defaultValue?: any) =&gt; unknown;</code><br/><code> }</code> | exposed temporarily until https://github.com/elastic/kibana/issues/41990 done use \*only\* to retrieve config values. There is no way to set injected values in the new platform. Use the legacy platform API instead. |
2424
| [notifications](./kibana-plugin-public.coresetup.notifications.md) | <code>NotificationsSetup</code> | [NotificationsSetup](./kibana-plugin-public.notificationssetup.md) |
25-
| [uiSettings](./kibana-plugin-public.coresetup.uisettings.md) | <code>UiSettingsClientContract</code> | [UiSettingsClient](./kibana-plugin-public.uisettingsclient.md) |
25+
| [uiSettings](./kibana-plugin-public.coresetup.uisettings.md) | <code>IUiSettingsClient</code> | [IUiSettingsClient](./kibana-plugin-public.iuisettingsclient.md) |
2626

‎docs/development/core/public/kibana-plugin-public.coresetup.uisettings.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
## CoreSetup.uiSettings property
66

7-
[UiSettingsClient](./kibana-plugin-public.uisettingsclient.md)
7+
[IUiSettingsClient](./kibana-plugin-public.iuisettingsclient.md)
88

99
<b>Signature:</b>
1010

1111
```typescript
12-
uiSettings: UiSettingsClientContract;
12+
uiSettings: IUiSettingsClient;
1313
```

‎docs/development/core/public/kibana-plugin-public.corestart.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ export interface CoreStart
2525
| [notifications](./kibana-plugin-public.corestart.notifications.md) | <code>NotificationsStart</code> | [NotificationsStart](./kibana-plugin-public.notificationsstart.md) |
2626
| [overlays](./kibana-plugin-public.corestart.overlays.md) | <code>OverlayStart</code> | [OverlayStart](./kibana-plugin-public.overlaystart.md) |
2727
| [savedObjects](./kibana-plugin-public.corestart.savedobjects.md) | <code>SavedObjectsStart</code> | [SavedObjectsStart](./kibana-plugin-public.savedobjectsstart.md) |
28-
| [uiSettings](./kibana-plugin-public.corestart.uisettings.md) | <code>UiSettingsClientContract</code> | [UiSettingsClient](./kibana-plugin-public.uisettingsclient.md) |
28+
| [uiSettings](./kibana-plugin-public.corestart.uisettings.md) | <code>IUiSettingsClient</code> | [IUiSettingsClient](./kibana-plugin-public.iuisettingsclient.md) |
2929

0 commit comments

Comments
 (0)