Skip to content

Commit fa41b85

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into lens/subtype-switching
2 parents 657e430 + 2371ee5 commit fa41b85

2,355 files changed

Lines changed: 93004 additions & 29456 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.

‎.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
}

‎.eslintrc.js‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,6 @@ module.exports = {
6969
'jsx-a11y/no-onchange': 'off',
7070
},
7171
},
72-
{
73-
files: ['src/legacy/core_plugins/data/**/*.{js,ts,tsx}'],
74-
rules: {
75-
'react-hooks/exhaustive-deps': 'off',
76-
},
77-
},
7872
{
7973
files: ['src/legacy/core_plugins/expressions/**/*.{js,ts,tsx}'],
8074
rules: {

‎.github/CODEOWNERS‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@
131131
/src/legacy/server/saved_objects/ @elastic/kibana-platform
132132
/src/legacy/server/status/ @elastic/kibana-platform
133133
/src/plugins/status_page/ @elastic/kibana-platform
134+
/src/plugins/saved_objects_management/ @elastic/kibana-platform
134135
/src/dev/run_check_published_api_changes.ts @elastic/kibana-platform
135136

136137
# Security
@@ -149,8 +150,11 @@
149150
# Pulse
150151
/packages/kbn-analytics/ @elastic/pulse
151152
/src/legacy/core_plugins/ui_metric/ @elastic/pulse
153+
/src/plugins/telemetry/ @elastic/pulse
154+
/src/plugins/telemetry_collection_manager/ @elastic/pulse
155+
/src/plugins/telemetry_management_section/ @elastic/pulse
152156
/src/plugins/usage_collection/ @elastic/pulse
153-
/x-pack/legacy/plugins/telemetry/ @elastic/pulse
157+
/x-pack/plugins/telemetry_collection_xpack/ @elastic/pulse
154158

155159
# Kibana Alerting Services
156160
/x-pack/legacy/plugins/alerting/ @elastic/kibana-alerting-services
@@ -181,6 +185,7 @@
181185
/x-pack/plugins/remote_clusters/ @elastic/es-ui
182186
/x-pack/legacy/plugins/rollup/ @elastic/es-ui
183187
/x-pack/plugins/searchprofiler/ @elastic/es-ui
188+
/x-pack/plugins/painless_lab/ @elastic/es-ui
184189
/x-pack/legacy/plugins/snapshot_restore/ @elastic/es-ui
185190
/x-pack/legacy/plugins/upgrade_assistant/ @elastic/es-ui
186191
/x-pack/plugins/upgrade_assistant/ @elastic/es-ui

‎.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

‎.i18nrc.json‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@
33
"common.ui": "src/legacy/ui",
44
"console": "src/plugins/console",
55
"core": "src/core",
6+
"discover": "src/plugins/discover",
67
"dashboard": "src/plugins/dashboard",
7-
"data": [
8-
"src/legacy/core_plugins/data",
9-
"src/plugins/data"
10-
],
8+
"data": "src/plugins/data",
119
"embeddableApi": "src/plugins/embeddable",
1210
"embeddableExamples": "examples/embeddable_examples",
1311
"share": "src/plugins/share",
@@ -38,8 +36,8 @@
3836
"server": "src/legacy/server",
3937
"statusPage": "src/legacy/core_plugins/status_page",
4038
"telemetry": [
41-
"src/legacy/core_plugins/telemetry",
42-
"src/plugins/telemetry"
39+
"src/plugins/telemetry",
40+
"src/plugins/telemetry_management_section"
4341
],
4442
"tileMap": "src/legacy/core_plugins/tile_map",
4543
"timelion": ["src/legacy/core_plugins/timelion", "src/legacy/core_plugins/vis_type_timelion", "src/plugins/timelion"],

‎Jenkinsfile‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,12 @@ kibanaPipeline(timeoutMinutes: 135, checkPrChanges: true) {
4040
'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
4141
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
4242
'xpack-accessibility': kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh'),
43-
'xpack-siemCypress': kibanaPipeline.functionalTestProcess('xpack-siemCypress', './test/scripts/jenkins_siem_cypress.sh'),
43+
'xpack-siemCypress': { processNumber ->
44+
whenChanged(['x-pack/legacy/plugins/siem/', 'x-pack/test/siem_cypress/']) {
45+
kibanaPipeline.functionalTestProcess('xpack-siemCypress', './test/scripts/jenkins_siem_cypress.sh')(processNumber)
46+
}
47+
},
48+
4449
// 'xpack-visualRegression': kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh'),
4550
]),
4651
])

‎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

0 commit comments

Comments
 (0)