Skip to content

Commit 6f1ba5f

Browse files
author
Aaron Caldwell
committed
Merge remote-tracking branch 'upstream/master' into np-update-license-request
2 parents d0b09d9 + 6c1f248 commit 6f1ba5f

File tree

580 files changed

+15241
-4006
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

580 files changed

+15241
-4006
lines changed

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ module.exports = {
326326
allowSameFolder: true,
327327
},
328328
{
329-
target: ['src/core/**/*'],
329+
target: ['src/**/*'],
330330
from: ['x-pack/**/*'],
331331
errorMessage: 'OSS cannot import x-pack files.',
332332
},

.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

.github/labeler.yml

Lines changed: 0 additions & 13 deletions
This file was deleted.
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
on:
2+
pull_request:
3+
types: [labeled, unlabeled]
4+
5+
jobs:
6+
assign_to_project:
7+
runs-on: ubuntu-latest
8+
name: Assign a PR to project based on label
9+
steps:
10+
- name: Assign to project
11+
uses: elastic/github-actions/[email protected]
12+
id: project_assigner
13+
with:
14+
issue-mappings: '[{"label": "Team:AppAch", "projectName": "kibana-app-arch", "columnId": 6173897}]'
15+
ghToken: ${{ secrets.GITHUB_TOKEN }}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
on:
2+
issues:
3+
types: [labeled, unlabeled]
4+
5+
jobs:
6+
assign_to_project:
7+
runs-on: ubuntu-latest
8+
name: Assign issue or PR to project based on label
9+
steps:
10+
- name: Assign to project
11+
uses: elastic/github-actions/[email protected]
12+
id: project_assigner
13+
with:
14+
issue-mappings: '[{"label": "Team:AppArch", "projectName": "kibana-app-arch", "columnId": 6173895}]'
15+
ghToken: ${{ secrets.GITHUB_TOKEN }}
16+
17+

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

0 commit comments

Comments
 (0)