Skip to content

Commit 9449adb

Browse files
nickofthymenickofthyme
committed
Merge branch 'master' into kpm/charts-plugin
2 parents 7159711 + 06aeb81 commit 9449adb

218 files changed

Lines changed: 3248 additions & 1534 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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,8 @@ module.exports = {
262262
'src/core/server/**/*',
263263
'(src|x-pack)/plugins/*/server/**/*',
264264
'examples/**/server/**/*',
265+
// TODO: Remove the 'joi' eslint rule once IE11 support is dropped
266+
'joi',
265267
],
266268
errorMessage:
267269
'Server modules cannot be imported into client modules or shared modules.',

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
/x-pack/test/functional/apps/apm/ @elastic/apm-ui
5353
/src/legacy/core_plugins/apm_oss/ @elastic/apm-ui
5454
/src/plugins/apm_oss/ @elastic/apm-ui
55+
/src/apm.js @watson
5556

5657
# Beats
5758
/x-pack/legacy/plugins/beats_management/ @elastic/beats

‎docs/development/core/server/kibana-plugin-server.coresetup.getstartservices.md‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2-
3-
[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [CoreSetup](./kibana-plugin-server.coresetup.md) &gt; [getStartServices](./kibana-plugin-server.coresetup.getstartservices.md)
4-
5-
## CoreSetup.getStartServices() method
6-
7-
Allows plugins to get access to APIs available in start inside async handlers. Promise will not resolve until Core and plugin dependencies have completed `start`<!-- -->. This should only be used inside handlers registered during `setup` that will only be executed after `start` lifecycle.
8-
9-
<b>Signature:</b>
10-
11-
```typescript
12-
getStartServices(): Promise<[CoreStart, TPluginsStart]>;
13-
```
14-
<b>Returns:</b>
15-
16-
`Promise<[CoreStart, TPluginsStart]>`
17-
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [CoreSetup](./kibana-plugin-server.coresetup.md) &gt; [getStartServices](./kibana-plugin-server.coresetup.getstartservices.md)
4+
5+
## CoreSetup.getStartServices() method
6+
7+
Allows plugins to get access to APIs available in start inside async handlers. Promise will not resolve until Core and plugin dependencies have completed `start`<!-- -->. This should only be used inside handlers registered during `setup` that will only be executed after `start` lifecycle.
8+
9+
<b>Signature:</b>
10+
11+
```typescript
12+
getStartServices(): Promise<[CoreStart, TPluginsStart]>;
13+
```
14+
<b>Returns:</b>
15+
16+
`Promise<[CoreStart, TPluginsStart]>`
17+

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

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
1-
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2-
3-
[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [CoreSetup](./kibana-plugin-server.coresetup.md)
4-
5-
## CoreSetup interface
6-
7-
Context passed to the plugins `setup` method.
8-
9-
<b>Signature:</b>
10-
11-
```typescript
12-
export interface CoreSetup<TPluginsStart extends object = object>
13-
```
14-
15-
## Properties
16-
17-
| Property | Type | Description |
18-
| --- | --- | --- |
19-
| [capabilities](./kibana-plugin-server.coresetup.capabilities.md) | <code>CapabilitiesSetup</code> | [CapabilitiesSetup](./kibana-plugin-server.capabilitiessetup.md) |
20-
| [context](./kibana-plugin-server.coresetup.context.md) | <code>ContextSetup</code> | [ContextSetup](./kibana-plugin-server.contextsetup.md) |
21-
| [elasticsearch](./kibana-plugin-server.coresetup.elasticsearch.md) | <code>ElasticsearchServiceSetup</code> | [ElasticsearchServiceSetup](./kibana-plugin-server.elasticsearchservicesetup.md) |
22-
| [http](./kibana-plugin-server.coresetup.http.md) | <code>HttpServiceSetup</code> | [HttpServiceSetup](./kibana-plugin-server.httpservicesetup.md) |
23-
| [savedObjects](./kibana-plugin-server.coresetup.savedobjects.md) | <code>SavedObjectsServiceSetup</code> | [SavedObjectsServiceSetup](./kibana-plugin-server.savedobjectsservicesetup.md) |
24-
| [uiSettings](./kibana-plugin-server.coresetup.uisettings.md) | <code>UiSettingsServiceSetup</code> | [UiSettingsServiceSetup](./kibana-plugin-server.uisettingsservicesetup.md) |
25-
| [uuid](./kibana-plugin-server.coresetup.uuid.md) | <code>UuidServiceSetup</code> | [UuidServiceSetup](./kibana-plugin-server.uuidservicesetup.md) |
26-
27-
## Methods
28-
29-
| Method | Description |
30-
| --- | --- |
31-
| [getStartServices()](./kibana-plugin-server.coresetup.getstartservices.md) | Allows plugins to get access to APIs available in start inside async handlers. Promise will not resolve until Core and plugin dependencies have completed <code>start</code>. This should only be used inside handlers registered during <code>setup</code> that will only be executed after <code>start</code> lifecycle. |
32-
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [CoreSetup](./kibana-plugin-server.coresetup.md)
4+
5+
## CoreSetup interface
6+
7+
Context passed to the plugins `setup` method.
8+
9+
<b>Signature:</b>
10+
11+
```typescript
12+
export interface CoreSetup<TPluginsStart extends object = object>
13+
```
14+
15+
## Properties
16+
17+
| Property | Type | Description |
18+
| --- | --- | --- |
19+
| [capabilities](./kibana-plugin-server.coresetup.capabilities.md) | <code>CapabilitiesSetup</code> | [CapabilitiesSetup](./kibana-plugin-server.capabilitiessetup.md) |
20+
| [context](./kibana-plugin-server.coresetup.context.md) | <code>ContextSetup</code> | [ContextSetup](./kibana-plugin-server.contextsetup.md) |
21+
| [elasticsearch](./kibana-plugin-server.coresetup.elasticsearch.md) | <code>ElasticsearchServiceSetup</code> | [ElasticsearchServiceSetup](./kibana-plugin-server.elasticsearchservicesetup.md) |
22+
| [http](./kibana-plugin-server.coresetup.http.md) | <code>HttpServiceSetup</code> | [HttpServiceSetup](./kibana-plugin-server.httpservicesetup.md) |
23+
| [savedObjects](./kibana-plugin-server.coresetup.savedobjects.md) | <code>SavedObjectsServiceSetup</code> | [SavedObjectsServiceSetup](./kibana-plugin-server.savedobjectsservicesetup.md) |
24+
| [uiSettings](./kibana-plugin-server.coresetup.uisettings.md) | <code>UiSettingsServiceSetup</code> | [UiSettingsServiceSetup](./kibana-plugin-server.uisettingsservicesetup.md) |
25+
| [uuid](./kibana-plugin-server.coresetup.uuid.md) | <code>UuidServiceSetup</code> | [UuidServiceSetup](./kibana-plugin-server.uuidservicesetup.md) |
26+
27+
## Methods
28+
29+
| Method | Description |
30+
| --- | --- |
31+
| [getStartServices()](./kibana-plugin-server.coresetup.getstartservices.md) | Allows plugins to get access to APIs available in start inside async handlers. Promise will not resolve until Core and plugin dependencies have completed <code>start</code>. This should only be used inside handlers registered during <code>setup</code> that will only be executed after <code>start</code> lifecycle. |
32+

docs/development/core/server/kibana-plugin-server.cspconfig.ruleschangedfromdefault.md renamed to docs/development/core/server/kibana-plugin-server.cspconfig.default.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
22

3-
[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [CspConfig](./kibana-plugin-server.cspconfig.md) &gt; [rulesChangedFromDefault](./kibana-plugin-server.cspconfig.ruleschangedfromdefault.md)
3+
[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [CspConfig](./kibana-plugin-server.cspconfig.md) &gt; [DEFAULT](./kibana-plugin-server.cspconfig.default.md)
44

5-
## CspConfig.rulesChangedFromDefault property
5+
## CspConfig.DEFAULT property
66

77
<b>Signature:</b>
88

99
```typescript
10-
readonly rulesChangedFromDefault: boolean;
10+
static readonly DEFAULT: CspConfig;
1111
```

‎docs/development/core/server/kibana-plugin-server.cspconfig.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ The constructor for this class is marked as internal. Third-party code should no
2020
2121
| Property | Modifiers | Type | Description |
2222
| --- | --- | --- | --- |
23+
| [DEFAULT](./kibana-plugin-server.cspconfig.default.md) | <code>static</code> | <code>CspConfig</code> | |
2324
| [header](./kibana-plugin-server.cspconfig.header.md) | | <code>string</code> | |
2425
| [rules](./kibana-plugin-server.cspconfig.rules.md) | | <code>string[]</code> | |
25-
| [rulesChangedFromDefault](./kibana-plugin-server.cspconfig.ruleschangedfromdefault.md) | | <code>boolean</code> | |
2626
| [strict](./kibana-plugin-server.cspconfig.strict.md) | | <code>boolean</code> | |
2727
| [warnLegacyBrowsers](./kibana-plugin-server.cspconfig.warnlegacybrowsers.md) | | <code>boolean</code> | |
2828

‎docs/development/core/server/kibana-plugin-server.icspconfig.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ export interface ICspConfig
1818
| --- | --- | --- |
1919
| [header](./kibana-plugin-server.icspconfig.header.md) | <code>string</code> | The CSP rules in a formatted directives string for use in a <code>Content-Security-Policy</code> header. |
2020
| [rules](./kibana-plugin-server.icspconfig.rules.md) | <code>string[]</code> | The CSP rules used for Kibana. |
21-
| [rulesChangedFromDefault](./kibana-plugin-server.icspconfig.ruleschangedfromdefault.md) | <code>boolean</code> | Flag indicating that the configuraion changes the csp rules from the defaults |
2221
| [strict](./kibana-plugin-server.icspconfig.strict.md) | <code>boolean</code> | Specify whether browsers that do not support CSP should be able to use Kibana. Use <code>true</code> to block and <code>false</code> to allow. |
2322
| [warnLegacyBrowsers](./kibana-plugin-server.icspconfig.warnlegacybrowsers.md) | <code>boolean</code> | Specify whether users with legacy browsers should be warned about their lack of Kibana security compliance. |
2423

‎docs/development/core/server/kibana-plugin-server.icspconfig.ruleschangedfromdefault.md‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎packages/kbn-dev-utils/src/kbn_client/kbn_client_status.ts‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ interface Status {
3232
interface ApiResponseStatus {
3333
name: string;
3434
uuid: string;
35-
running_from_source?: true;
3635
version: {
3736
number: string;
3837
build_hash: string;
@@ -59,11 +58,6 @@ export class KbnClientStatus {
5958
});
6059
}
6160

62-
public async isDistributable() {
63-
const status = await this.get();
64-
return !status.running_from_source;
65-
}
66-
6761
/**
6862
* Get the overall/merged state
6963
*/

‎packages/kbn-pm/dist/index.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43639,10 +43639,6 @@ class KbnClientStatus {
4363943639
path: 'api/status',
4364043640
});
4364143641
}
43642-
async isDistributable() {
43643-
const status = await this.get();
43644-
return !status.running_from_source;
43645-
}
4364643642
/**
4364743643
* Get the overall/merged state
4364843644
*/

0 commit comments

Comments
 (0)