Skip to content

Commit 97be402

Browse files
Merge branch 'master' into migrate_top_nav_test_plugin_to_np
2 parents 1cdadac + 1abd2c3 commit 97be402

File tree

1,453 files changed

+48283
-24058
lines changed

Some content is hidden

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

1,453 files changed

+48283
-24058
lines changed

.backportrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"upstream": "elastic/kibana",
3-
"branches": [{ "name": "7.x", "checked": true }, "7.6", "7.5", "7.4", "7.3", "7.2", "7.1", "7.0", "6.8", "6.7", "6.6", "6.5", "6.4", "6.3", "6.2", "6.1", "6.0", "5.6"],
3+
"branches": [{ "name": "7.x", "checked": true }, "7.7", "7.6", "7.5", "7.4", "7.3", "7.2", "7.1", "7.0", "6.8", "6.7", "6.6", "6.5", "6.4", "6.3", "6.2", "6.1", "6.0", "5.6"],
44
"labels": ["backport"]
55
}

.github/CODEOWNERS

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
# For more info, see https://help.github.com/articles/about-codeowners/
44

55
# App
6-
/x-pack/legacy/plugins/dashboard_enhanced/ @elastic/kibana-app
76
/x-pack/legacy/plugins/lens/ @elastic/kibana-app
87
/x-pack/legacy/plugins/graph/ @elastic/kibana-app
98
/src/legacy/server/url_shortening/ @elastic/kibana-app
@@ -150,8 +149,11 @@
150149
# Pulse
151150
/packages/kbn-analytics/ @elastic/pulse
152151
/src/legacy/core_plugins/ui_metric/ @elastic/pulse
152+
/src/plugins/telemetry/ @elastic/pulse
153+
/src/plugins/telemetry_collection_manager/ @elastic/pulse
154+
/src/plugins/telemetry_management_section/ @elastic/pulse
153155
/src/plugins/usage_collection/ @elastic/pulse
154-
/x-pack/legacy/plugins/telemetry/ @elastic/pulse
156+
/x-pack/plugins/telemetry_collection_xpack/ @elastic/pulse
155157

156158
# Kibana Alerting Services
157159
/x-pack/legacy/plugins/alerting/ @elastic/kibana-alerting-services

.github/paths-labeller.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
11
---
2+
- "Team:AppArch":
3+
- "src/plugins/bfetch/**/*.*"
4+
- "src/plugins/dashboard_embeddable_container/**/*.*"
5+
- "src/plugins/data/**/*.*"
6+
- "src/plugins/embeddable/**/*.*"
7+
- "src/plugins/expressions/**/*.*"
8+
- "src/plugins/inspector/**/*.*"
9+
- "src/plugins/ui_actions/**/*.*"
10+
- "src/plugins/visualizations/**/*.*"
11+
- "Feature:Embedding":
12+
- "src/plugins/embeddable/**/*.*"
13+
- "src/plugins/dashboard_embeddable_container/**/*.*"
214
- "Feature:Drilldowns":
315
- "x-pack/plugins/drilldowns/**/*.*"
16+
- "x-pack/plugins/dashboard_enhanced/public/services/drilldowns/**/*.*"
17+
- "Feature:ExpressionLanguage":
18+
- "src/plugins/expressions/**/*.*"
19+
- "src/plugins/bfetch/**/*.*"

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,6 @@ package-lock.json
4444
*.sublime-*
4545
npm-debug.log*
4646
.tern-project
47+
x-pack/legacy/plugins/apm/tsconfig.json
48+
apm.tsconfig.json
49+
/x-pack/legacy/plugins/apm/e2e/snapshots.js

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ mount: AppMount<HistoryLocationState> | AppMountDeprecated<HistoryLocationState>
1414

1515
## Remarks
1616

17-
When function has two arguments, it will be called with a [context](./kibana-plugin-core-public.appmountcontext.md) as the first argument. This behavior is \*\*deprecated\*\*, and consumers should instead use [CoreSetup.getStartServices()](./kibana-plugin-core-public.coresetup.getstartservices.md)<!-- -->.
17+
When function has two arguments, it will be called with a [context](./kibana-plugin-core-public.appmountcontext.md) as the first argument. This behavior is \*\*deprecated\*\*, and consumers should instead use [CoreSetup.getStartServices](./kibana-plugin-core-public.coresetup.getstartservices.md)<!-- -->.
1818

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ export interface ApplicationSetup
1717
| --- | --- |
1818
| [register(app)](./kibana-plugin-core-public.applicationsetup.register.md) | Register an mountable application to the system. |
1919
| [registerAppUpdater(appUpdater$)](./kibana-plugin-core-public.applicationsetup.registerappupdater.md) | Register an application updater that can be used to change the [AppUpdatableFields](./kibana-plugin-core-public.appupdatablefields.md) fields of all applications at runtime.<!-- -->This is meant to be used by plugins that needs to updates the whole list of applications. To only updates a specific application, use the <code>updater$</code> property of the registered application instead. |
20-
| [registerMountContext(contextName, provider)](./kibana-plugin-core-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-core-public.coresetup.getstartservices.md)<!-- -->. |
20+
| [registerMountContext(contextName, provider)](./kibana-plugin-core-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-core-public.coresetup.getstartservices.md)<!-- -->. |
2121

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
>
99
>
1010
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-core-public.coresetup.getstartservices.md)<!-- -->.
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-core-public.coresetup.getstartservices.md)<!-- -->.
1212

1313
<b>Signature:</b>
1414

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ export interface ApplicationStart
2424
| --- | --- |
2525
| [getUrlForApp(appId, options)](./kibana-plugin-core-public.applicationstart.geturlforapp.md) | Returns an URL to a given app, including the global base path. By default, the URL is relative (/basePath/app/my-app). Use the <code>absolute</code> option to generate an absolute url (http://host:port/basePath/app/my-app)<!-- -->Note that when generating absolute urls, the protocol, host and port are determined from the browser location. |
2626
| [navigateToApp(appId, options)](./kibana-plugin-core-public.applicationstart.navigatetoapp.md) | Navigate to a given app |
27-
| [registerMountContext(contextName, provider)](./kibana-plugin-core-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-core-public.coresetup.getstartservices.md)<!-- -->. |
27+
| [registerMountContext(contextName, provider)](./kibana-plugin-core-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-core-public.coresetup.getstartservices.md)<!-- -->. |
2828

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
>
99
>
1010
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-core-public.coresetup.getstartservices.md)<!-- -->.
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-core-public.coresetup.getstartservices.md)<!-- -->.
1212

1313
<b>Signature:</b>
1414

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
>
99
>
1010
11-
The context object received when applications are mounted to the DOM. Deprecated, use [CoreSetup.getStartServices()](./kibana-plugin-core-public.coresetup.getstartservices.md)<!-- -->.
11+
The context object received when applications are mounted to the DOM. Deprecated, use [CoreSetup.getStartServices](./kibana-plugin-core-public.coresetup.getstartservices.md)<!-- -->.
1212

1313
<b>Signature:</b>
1414

0 commit comments

Comments
 (0)