Skip to content

Commit 15c63fe

Browse files
author
Liza K
committed
Merge remote-tracking branch 'upstream/master' into newplatform/data-plugin/move-search-bar
2 parents 4740eae + 4765ed0 commit 15c63fe

311 files changed

Lines changed: 8716 additions & 2047 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.

‎.github/CODEOWNERS‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,19 @@
9797
/x-pack/plugins/security/ @elastic/kibana-security
9898
/x-pack/test/api_integration/apis/security/ @elastic/kibana-security
9999

100-
# Kibana Stack Services
101-
/src/dev/i18n @elastic/kibana-stack-services
102-
/packages/kbn-analytics/ @elastic/kibana-stack-services
103-
/src/legacy/core_plugins/ui_metric/ @elastic/kibana-stack-services
104-
/src/plugins/usage_collection/ @elastic/kibana-stack-services
105-
/x-pack/legacy/plugins/telemetry @elastic/kibana-stack-services
106-
/x-pack/legacy/plugins/alerting @elastic/kibana-stack-services
107-
/x-pack/legacy/plugins/actions @elastic/kibana-stack-services
108-
/x-pack/legacy/plugins/task_manager @elastic/kibana-stack-services
100+
# Kibana Localization
101+
/src/dev/i18n @elastic/kibana-localization
102+
103+
# Pulse
104+
/packages/kbn-analytics/ @elastic/pulse
105+
/src/legacy/core_plugins/ui_metric/ @elastic/pulse
106+
/src/plugins/usage_collection/ @elastic/pulse
107+
/x-pack/legacy/plugins/telemetry @elastic/pulse
108+
109+
# Kibana Alerting Services
110+
/x-pack/legacy/plugins/alerting @elastic/kibana-alerting-services
111+
/x-pack/legacy/plugins/actions @elastic/kibana-alerting-services
112+
/x-pack/legacy/plugins/task_manager @elastic/kibana-alerting-services
109113

110114
# Design
111115
**/*.scss @elastic/kibana-design

‎config/apm.js‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,22 @@ const { join } = require('path');
4242
const { execSync } = require('child_process');
4343
const merge = require('lodash.merge');
4444

45-
module.exports = merge({
46-
active: false,
47-
serverUrl: 'https://f1542b814f674090afd914960583265f.apm.us-central1.gcp.cloud.es.io:443',
48-
// The secretToken below is intended to be hardcoded in this file even though
49-
// it makes it public. This is not a security/privacy issue. Normally we'd
50-
// instead disable the need for a secretToken in the APM Server config where
51-
// the data is transmitted to, but due to how it's being hosted, it's easier,
52-
// for now, to simply leave it in.
53-
secretToken: 'R0Gjg46pE9K9wGestd',
54-
globalLabels: {},
55-
centralConfig: false,
56-
logUncaughtExceptions: true
57-
}, devConfig());
45+
module.exports = merge(
46+
{
47+
active: false,
48+
serverUrl: 'https://f1542b814f674090afd914960583265f.apm.us-central1.gcp.cloud.es.io:443',
49+
// The secretToken below is intended to be hardcoded in this file even though
50+
// it makes it public. This is not a security/privacy issue. Normally we'd
51+
// instead disable the need for a secretToken in the APM Server config where
52+
// the data is transmitted to, but due to how it's being hosted, it's easier,
53+
// for now, to simply leave it in.
54+
secretToken: 'R0Gjg46pE9K9wGestd',
55+
globalLabels: {},
56+
centralConfig: false,
57+
logUncaughtExceptions: true,
58+
},
59+
devConfig()
60+
);
5861

5962
const rev = gitRev();
6063
if (rev !== null) module.exports.globalLabels.git_rev = rev;
@@ -66,7 +69,10 @@ try {
6669

6770
function gitRev() {
6871
try {
69-
return execSync('git rev-parse --short HEAD', { encoding: 'utf-8' }).trim();
72+
return execSync('git rev-parse --short HEAD', {
73+
encoding: 'utf-8',
74+
stdio: ['ignore', 'pipe', 'ignore'],
75+
}).trim();
7076
} catch (e) {
7177
return null;
7278
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ export interface App extends AppBase
1717
| Property | Type | Description |
1818
| --- | --- | --- |
1919
| [chromeless](./kibana-plugin-public.app.chromeless.md) | <code>boolean</code> | Hide the UI chrome when the application is mounted. Defaults to <code>false</code>. Takes precedence over chrome service visibility settings. |
20-
| [mount](./kibana-plugin-public.app.mount.md) | <code>(context: AppMountContext, params: AppMountParameters) =&gt; AppUnmount &#124; Promise&lt;AppUnmount&gt;</code> | A mount function called when the user navigates to this app's route. |
20+
| [mount](./kibana-plugin-public.app.mount.md) | <code>AppMount &#124; AppMountDeprecated</code> | A mount function called when the user navigates to this app's route. May have signature of [AppMount](./kibana-plugin-public.appmount.md) or [AppMountDeprecated](./kibana-plugin-public.appmountdeprecated.md)<!-- -->. |
2121

‎docs/development/core/public/kibana-plugin-public.app.mount.md‎

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

55
## App.mount property
66

7-
A mount function called when the user navigates to this app's route.
7+
A mount function called when the user navigates to this app's route. May have signature of [AppMount](./kibana-plugin-public.appmount.md) or [AppMountDeprecated](./kibana-plugin-public.appmountdeprecated.md)<!-- -->.
88

99
<b>Signature:</b>
1010

1111
```typescript
12-
mount: (context: AppMountContext, params: AppMountParameters) => AppUnmount | Promise<AppUnmount>;
12+
mount: AppMount | AppMountDeprecated;
1313
```
14+
15+
## Remarks
16+
17+
When function has two arguments, it will be called with a [context](./kibana-plugin-public.appmountcontext.md) as the first argument. This behavior is \*\*deprecated\*\*, and consumers should instead use [CoreSetup.getStartServices()](./kibana-plugin-public.coresetup.getstartservices.md)<!-- -->.
18+

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ export interface ApplicationSetup
1616
| Method | Description |
1717
| --- | --- |
1818
| [register(app)](./kibana-plugin-public.applicationsetup.register.md) | Register an mountable application to the system. |
19-
| [registerMountContext(contextName, provider)](./kibana-plugin-public.applicationsetup.registermountcontext.md) | Register a context provider for application mounting. Will only be available to applications that depend on the plugin that registered this context. |
19+
| [registerMountContext(contextName, provider)](./kibana-plugin-public.applicationsetup.registermountcontext.md) | Register a context provider for application mounting. Will only be available to applications that depend on the plugin that registered this context. Deprecated, use [CoreSetup.getStartServices()](./kibana-plugin-public.coresetup.getstartservices.md)<!-- -->. |
2020

‎docs/development/core/public/kibana-plugin-public.applicationsetup.registermountcontext.md‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,24 @@
44

55
## ApplicationSetup.registerMountContext() method
66

7-
Register a context provider for application mounting. Will only be available to applications that depend on the plugin that registered this context.
7+
> Warning: This API is now obsolete.
8+
>
9+
>
10+
11+
Register a context provider for application mounting. Will only be available to applications that depend on the plugin that registered this context. Deprecated, use [CoreSetup.getStartServices()](./kibana-plugin-public.coresetup.getstartservices.md)<!-- -->.
812

913
<b>Signature:</b>
1014

1115
```typescript
12-
registerMountContext<T extends keyof AppMountContext>(contextName: T, provider: IContextProvider<App['mount'], T>): void;
16+
registerMountContext<T extends keyof AppMountContext>(contextName: T, provider: IContextProvider<AppMountDeprecated, T>): void;
1317
```
1418
1519
## Parameters
1620
1721
| Parameter | Type | Description |
1822
| --- | --- | --- |
1923
| contextName | <code>T</code> | The key of [AppMountContext](./kibana-plugin-public.appmountcontext.md) this provider's return value should be attached to. |
20-
| provider | <code>IContextProvider&lt;App['mount'], T&gt;</code> | A [IContextProvider](./kibana-plugin-public.icontextprovider.md) function |
24+
| provider | <code>IContextProvider&lt;AppMountDeprecated, T&gt;</code> | A [IContextProvider](./kibana-plugin-public.icontextprovider.md) function |
2125
2226
<b>Returns:</b>
2327

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ export interface ApplicationStart
2323
| --- | --- |
2424
| [getUrlForApp(appId, options)](./kibana-plugin-public.applicationstart.geturlforapp.md) | Returns a relative URL to a given app, including the global base path. |
2525
| [navigateToApp(appId, options)](./kibana-plugin-public.applicationstart.navigatetoapp.md) | Navigiate to a given app |
26-
| [registerMountContext(contextName, provider)](./kibana-plugin-public.applicationstart.registermountcontext.md) | Register a context provider for application mounting. Will only be available to applications that depend on the plugin that registered this context. |
26+
| [registerMountContext(contextName, provider)](./kibana-plugin-public.applicationstart.registermountcontext.md) | Register a context provider for application mounting. Will only be available to applications that depend on the plugin that registered this context. Deprecated, use [CoreSetup.getStartServices()](./kibana-plugin-public.coresetup.getstartservices.md)<!-- -->. |
2727

‎docs/development/core/public/kibana-plugin-public.applicationstart.registermountcontext.md‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,24 @@
44

55
## ApplicationStart.registerMountContext() method
66

7-
Register a context provider for application mounting. Will only be available to applications that depend on the plugin that registered this context.
7+
> Warning: This API is now obsolete.
8+
>
9+
>
10+
11+
Register a context provider for application mounting. Will only be available to applications that depend on the plugin that registered this context. Deprecated, use [CoreSetup.getStartServices()](./kibana-plugin-public.coresetup.getstartservices.md)<!-- -->.
812

913
<b>Signature:</b>
1014

1115
```typescript
12-
registerMountContext<T extends keyof AppMountContext>(contextName: T, provider: IContextProvider<App['mount'], T>): void;
16+
registerMountContext<T extends keyof AppMountContext>(contextName: T, provider: IContextProvider<AppMountDeprecated, T>): void;
1317
```
1418
1519
## Parameters
1620
1721
| Parameter | Type | Description |
1822
| --- | --- | --- |
1923
| contextName | <code>T</code> | The key of [AppMountContext](./kibana-plugin-public.appmountcontext.md) this provider's return value should be attached to. |
20-
| provider | <code>IContextProvider&lt;App['mount'], T&gt;</code> | A [IContextProvider](./kibana-plugin-public.icontextprovider.md) function |
24+
| provider | <code>IContextProvider&lt;AppMountDeprecated, T&gt;</code> | A [IContextProvider](./kibana-plugin-public.icontextprovider.md) function |
2125
2226
<b>Returns:</b>
2327

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [AppMount](./kibana-plugin-public.appmount.md)
4+
5+
## AppMount type
6+
7+
A mount function called when the user navigates to this app's route.
8+
9+
<b>Signature:</b>
10+
11+
```typescript
12+
export declare type AppMount = (params: AppMountParameters) => AppUnmount | Promise<AppUnmount>;
13+
```

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@
44

55
## AppMountContext interface
66

7-
The context object received when applications are mounted to the DOM.
7+
> Warning: This API is now obsolete.
8+
>
9+
>
10+
11+
The context object received when applications are mounted to the DOM. Deprecated, use [CoreSetup.getStartServices()](./kibana-plugin-public.coresetup.getstartservices.md)<!-- -->.
812

913
<b>Signature:</b>
1014

0 commit comments

Comments
 (0)