Skip to content

Commit 2c07b5c

Browse files
kibanamachinekibanamachine
authored
Merge branch 'master' into bug/time-filter-update
2 parents 6ce33b3 + 2287376 commit 2c07b5c

3,064 files changed

Lines changed: 116384 additions & 74162 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.

‎.browserslistrc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ last 2 Chrome versions
44
last 2 Safari versions
55
> 0.25%
66
not ie 11
7+
not op_mini all
8+
not samsung 4
79

810
[dev]
911
last 1 chrome versions

‎.eslintignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
/x-pack/build
1414
node_modules
1515
target
16+
snapshots.js
1617

1718
!/.eslintrc.js
1819

@@ -22,7 +23,6 @@ target
2223
/src/plugins/data/common/es_query/kuery/ast/_generated_/**
2324
/src/plugins/vis_type_timelion/public/_generated_/**
2425
/x-pack/legacy/plugins/**/__tests__/fixtures/**
25-
/x-pack/plugins/apm/e2e/**/snapshots.js
2626
/x-pack/plugins/apm/e2e/tmp/*
2727
/x-pack/plugins/canvas/canvas_plugin
2828
/x-pack/plugins/canvas/shareable_runtime/build

‎.eslintrc.js‎

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,7 @@ module.exports = {
447447
{
448448
devDependencies: false,
449449
peerDependencies: true,
450+
packageDir: '.',
450451
},
451452
],
452453
},
@@ -478,6 +479,7 @@ module.exports = {
478479
{
479480
devDependencies: true,
480481
peerDependencies: true,
482+
packageDir: '.',
481483
},
482484
],
483485
},
@@ -732,22 +734,6 @@ module.exports = {
732734
},
733735
},
734736

735-
/**
736-
* ML overrides
737-
*/
738-
{
739-
files: ['x-pack/plugins/ml/**/*.js'],
740-
rules: {
741-
'no-shadow': 'error',
742-
'import/no-extraneous-dependencies': [
743-
'error',
744-
{
745-
packageDir: './x-pack',
746-
},
747-
],
748-
},
749-
},
750-
751737
/**
752738
* Security Solution overrides
753739
*/
@@ -1149,16 +1135,11 @@ module.exports = {
11491135
{
11501136
devDependencies: true,
11511137
peerDependencies: true,
1138+
packageDir: '.',
11521139
},
11531140
],
11541141
},
11551142
},
1156-
{
1157-
files: ['x-pack/plugins/canvas/storybook/**'],
1158-
rules: {
1159-
'import/no-extraneous-dependencies': 0,
1160-
},
1161-
},
11621143
{
11631144
files: ['x-pack/plugins/canvas/canvas_plugin_src/**/*.js'],
11641145
globals: { canvas: true, $: true },
@@ -1237,5 +1218,21 @@ module.exports = {
12371218
],
12381219
},
12391220
},
1221+
1222+
/**
1223+
* Single package.json rules, it tells eslint to ignore the child package.json files
1224+
* and look for dependencies declarations in the single and root level package.json
1225+
*/
1226+
{
1227+
files: ['**/*.{js,mjs,ts,tsx}'],
1228+
rules: {
1229+
'import/no-extraneous-dependencies': [
1230+
'error',
1231+
{
1232+
packageDir: '.',
1233+
},
1234+
],
1235+
},
1236+
},
12401237
],
12411238
};

‎.github/CODEOWNERS‎

Lines changed: 19 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
#CC# /src/legacy/core_plugins/vis_type_vislib/ @elastic/kibana-app
4040
#CC# /src/legacy/server/url_shortening/ @elastic/kibana-app
4141
#CC# /src/legacy/ui/public/state_management @elastic/kibana-app
42-
#CC# /src/plugins/index_pattern_management/public @elastic/kibana-app
4342

4443
# App Architecture
4544
/examples/bfetch_explorer/ @elastic/kibana-app-arch
@@ -61,7 +60,7 @@
6160
/src/plugins/expressions/ @elastic/kibana-app-arch
6261
/src/plugins/inspector/ @elastic/kibana-app-arch
6362
/src/plugins/kibana_react/ @elastic/kibana-app-arch
64-
/src/plugins/kibana_react/public/code_editor @elastic/kibana-canvas
63+
/src/plugins/kibana_react/public/code_editor @elastic/kibana-presentation
6564
/src/plugins/kibana_utils/ @elastic/kibana-app-arch
6665
/src/plugins/navigation/ @elastic/kibana-app-arch
6766
/src/plugins/share/ @elastic/kibana-app-arch
@@ -70,23 +69,10 @@
7069
/x-pack/plugins/data_enhanced/ @elastic/kibana-app-arch
7170
/x-pack/plugins/embeddable_enhanced/ @elastic/kibana-app-arch
7271
/x-pack/plugins/ui_actions_enhanced/ @elastic/kibana-app-arch
73-
#CC# /src/legacy/core_plugins/kibana/public/management/ @elastic/kibana-app-arch
74-
#CC# /src/legacy/core_plugins/kibana/server/routes/api/management/ @elastic/kibana-app-arch
75-
#CC# /src/legacy/core_plugins/embeddable_api/ @elastic/kibana-app-arch
76-
#CC# /src/legacy/core_plugins/interpreter/ @elastic/kibana-app-arch
77-
#CC# /src/legacy/core_plugins/kibana_react/ @elastic/kibana-app-arch
78-
#CC# /src/legacy/core_plugins/status_page/public @elastic/kibana-app-arch
79-
#CC# /src/legacy/server/index_patterns/ @elastic/kibana-app-arch
80-
#CC# /src/legacy/ui/public/field_editor @elastic/kibana-app-arch
81-
#CC# /src/legacy/ui/public/management @elastic/kibana-app-arch
82-
#CC# /src/plugins/advanced_settings/ @elastic/kibana-app-arch
8372
#CC# /src/plugins/bfetch/ @elastic/kibana-app-arch
84-
#CC# /src/plugins/charts/ @elastic/kibana-app-arch
85-
#CC# /src/plugins/index_pattern_management/public/service @elastic/kibana-app-arch
73+
#CC# /src/plugins/index_pattern_management/ @elastic/kibana-app-arch
8674
#CC# /src/plugins/inspector/ @elastic/kibana-app-arch
87-
#CC# /src/plugins/saved_objects/ @elastic/kibana-app-arch
8875
#CC# /src/plugins/share/ @elastic/kibana-app-arch
89-
#CC# /src/plugins/vis_default_editor @elastic/kibana-app-arch
9076
#CC# /x-pack/plugins/advanced_ui_actions/ @elastic/kibana-app-arch
9177
#CC# /x-pack/plugins/drilldowns/ @elastic/kibana-app-arch
9278
#CC# /packages/kbn-interpreter/ @elastic/kibana-app-arch
@@ -118,19 +104,19 @@
118104
/x-pack/legacy/plugins/beats_management/ @elastic/beats
119105
#CC# /x-pack/plugins/beats_management/ @elastic/beats
120106

121-
# Canvas
122-
/src/plugins/dashboard/ @elastic/kibana-canvas
123-
/src/plugins/input_control_vis/ @elastic/kibana-canvas
124-
/src/plugins/vis_type_markdown/ @elastic/kibana-canvas
125-
/x-pack/plugins/canvas/ @elastic/kibana-canvas
126-
/x-pack/plugins/dashboard_enhanced/ @elastic/kibana-canvas
127-
/x-pack/test/functional/apps/canvas/ @elastic/kibana-canvas
128-
#CC# /src/legacy/core_plugins/kibana/public/dashboard/ @elastic/kibana-canvas
129-
#CC# /src/legacy/core_plugins/input_control_vis @elastic/kibana-canvas
130-
#CC# /src/plugins/kibana_react/public/code_editor/ @elastic/kibana-canvas
131-
#CC# /x-pack/legacy/plugins/canvas/ @elastic/kibana-canvas
132-
#CC# /x-pack/plugins/dashboard_mode @elastic/kibana-canvas
133-
#CC# /x-pack/legacy/plugins/dashboard_mode/ @elastic/kibana-canvas
107+
# Presentation
108+
/src/plugins/dashboard/ @elastic/kibana-presentation
109+
/src/plugins/input_control_vis/ @elastic/kibana-presentation
110+
/src/plugins/vis_type_markdown/ @elastic/kibana-presentation
111+
/x-pack/plugins/canvas/ @elastic/kibana-presentation
112+
/x-pack/plugins/dashboard_enhanced/ @elastic/kibana-presentation
113+
/x-pack/test/functional/apps/canvas/ @elastic/kibana-presentation
114+
#CC# /src/legacy/core_plugins/kibana/public/dashboard/ @elastic/kibana-presentation
115+
#CC# /src/legacy/core_plugins/input_control_vis @elastic/kibana-presentation
116+
#CC# /src/plugins/kibana_react/public/code_editor/ @elastic/kibana-presentation
117+
#CC# /x-pack/legacy/plugins/canvas/ @elastic/kibana-presentation
118+
#CC# /x-pack/plugins/dashboard_mode @elastic/kibana-presentation
119+
#CC# /x-pack/legacy/plugins/dashboard_mode/ @elastic/kibana-presentation
134120

135121
# Core UI
136122
# Exclude tutorials folder for now because they are not owned by Kibana app and most will move out soon
@@ -171,8 +157,6 @@
171157
/x-pack/test/functional/apps/maps/ @elastic/kibana-gis
172158
/x-pack/test/functional/es_archives/maps/ @elastic/kibana-gis
173159
/x-pack/test/visual_regression/tests/maps/index.js @elastic/kibana-gis
174-
#CC# /src/legacy/core_plugins/region_map @elastic/kibana-gis
175-
#CC# /src/legacy/core_plugins/tile_map @elastic/kibana-gis
176160
#CC# /src/plugins/maps_legacy/ @elastic/kibana-gis
177161
#CC# /x-pack/plugins/file_upload @elastic/kibana-gis
178162
#CC# /x-pack/plugins/maps_legacy_licensing @elastic/kibana-gis
@@ -212,12 +196,15 @@
212196

213197
# Platform
214198
/src/core/ @elastic/kibana-platform
199+
/src/plugins/saved_objects_tagging_oss @elastic/kibana-platform
215200
/config/kibana.yml @elastic/kibana-platform
216201
/x-pack/plugins/features/ @elastic/kibana-platform
217202
/x-pack/plugins/licensing/ @elastic/kibana-platform
218203
/x-pack/plugins/global_search/ @elastic/kibana-platform
219204
/x-pack/plugins/cloud/ @elastic/kibana-platform
205+
/x-pack/plugins/saved_objects_tagging/ @elastic/kibana-platform
220206
/x-pack/test/saved_objects_field_count/ @elastic/kibana-platform
207+
/x-pack/test/saved_object_tagging/ @elastic/kibana-platform
221208
/packages/kbn-config-schema/ @elastic/kibana-platform
222209
/packages/kbn-std/ @elastic/kibana-platform
223210
/src/legacy/server/config/ @elastic/kibana-platform
@@ -245,6 +232,7 @@
245232
#CC# /src/legacy/ui/public/documentation_links @elastic/kibana-platform
246233
#CC# /src/legacy/ui/public/autoload @elastic/kibana-platform
247234
#CC# /src/plugins/legacy_export/ @elastic/kibana-platform
235+
#CC# /src/plugins/saved_objects/ @elastic/kibana-platform
248236
#CC# /src/plugins/status_page/ @elastic/kibana-platform
249237
#CC# /src/plugins/testbed/server/ @elastic/kibana-platform
250238
#CC# /x-pack/legacy/plugins/xpack_main/server/ @elastic/kibana-platform

‎.github/ISSUE_TEMPLATE/v8_breaking_change.md‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,16 @@ assignees: ''
77

88
---
99

10+
<!--
11+
****************************************
12+
******* LABEL CHANGES NECESSARY ********
13+
****************************************
14+
15+
Please add a "NeededFor:${TeamName}" label to denote the team that is
16+
requesting the breaking change to be surfaced in the Upgrade Assistant.
17+
18+
-->
19+
1020
## Change description
1121

1222
**Which release will ship the breaking change?**
@@ -17,21 +27,24 @@ assignees: ''
1727

1828
**How many users will be affected?**
1929

20-
<!-- e.g., Based on telemetry data, roughly 75% of our users will need to make changes to x -->
21-
<!-- e.g., A majority of users will need to make changes to x. -->
30+
<!-- e.g. Based on telemetry data, roughly 75% of our users will need to make changes to x. -->
31+
<!-- e.g. A majority of users will need to make changes to x. -->
2232

2333
**What can users do to address the change manually?**
2434

25-
<!-- If applicable, describe the manual workaround -->
35+
<!-- If applicable, describe the manual migration steps and/or link to available docs. -->
2636

2737
**How could we make migration easier with the Upgrade Assistant?**
2838

39+
<!-- This can be as basic as notifying the user about the deprecation and linking to some
40+
migration docs, or as advanced as a dedicated UI for fixing the problem. -->
41+
2942
**Are there any edge cases?**
3043

3144
## Test Data
3245

33-
Provide test data. We can’t build a solution without data to test it against.
46+
<!-- Provide test data. We can’t build a solution without data to test it against. -->
3447

3548
## Cross links
3649

37-
Cross-link to relevant [Elasticsearch breaking changes](https://www.elastic.co/guide/en/elasticsearch/reference/master/breaking-changes-8.0.html).
50+
<!-- Provide context. Cross-link to relevant [Elasticsearch breaking changes](https://www.elastic.co/guide/en/elasticsearch/reference/master/breaking-changes-8.0.html), PRs that introduced the breaking change, or other related issues. -->

‎.github/workflows/pr-project-assigner.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ jobs:
1818

1919
# { "label": "Team:AppArch", "projectNumber": 37, "columnName": "Review in progress" },
2020
# { "label": "Feature:Lens", "projectNumber": 32, "columnName": "In progress" },
21-
# { "label": "Team:Canvas", "projectNumber": 38, "columnName": "Review in progress" }
21+
# { "label": "Feature:Canvas", "projectNumber": 38, "columnName": "Review in progress" }

‎.github/workflows/project-assigner.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
uses: elastic/github-actions/project-assigner@v2.0.0
1212
id: project_assigner
1313
with:
14-
issue-mappings: '[{"label": "Team:AppArch", "projectNumber": 37, "columnName": "To triage"}, {"label": "Feature:Lens", "projectNumber": 32, "columnName": "Long-term goals"}, {"label": "Team:Canvas", "projectNumber": 38, "columnName": "Inbox"}]'
14+
issue-mappings: '[{"label": "Team:AppArch", "projectNumber": 37, "columnName": "To triage"}, {"label": "Feature:Lens", "projectNumber": 32, "columnName": "Long-term goals"}, {"label": "Feature:Canvas", "projectNumber": 38, "columnName": "Inbox"}, {"label": "Feature:Dashboard", "projectNumber": 68, "columnName": "Inbox"}, {"label": "Feature:Drilldowns", "projectNumber": 68, "columnName": "Inbox"}]'
1515
ghToken: ${{ secrets.PROJECT_ASSIGNER_TOKEN }}
1616

1717

‎.gitignore‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,21 @@ target
1818
.idea
1919
*.iml
2020
*.log
21+
22+
# Ignore certain functional test runner artifacts
2123
/test/*/failure_debug
2224
/test/*/screenshots/diff
2325
/test/*/screenshots/failure
2426
/test/*/screenshots/session
2527
/test/*/screenshots/visual_regression_gallery.html
28+
29+
# Ignore the same artifacts in x-pack
30+
/x-pack/test/*/failure_debug
31+
/x-pack/test/*/screenshots/diff
32+
/x-pack/test/*/screenshots/failure
33+
/x-pack/test/*/screenshots/session
34+
/x-pack/test/*/screenshots/visual_regression_gallery.html
35+
2636
/html_docs
2737
.eslintcache
2838
/plugins/
@@ -56,6 +66,8 @@ npm-debug.log*
5666
# apm plugin
5767
/x-pack/plugins/apm/tsconfig.json
5868
apm.tsconfig.json
69+
## @cypress/snapshot from apm plugin
70+
snapshots.js
5971

6072
# release notes script output
6173
report.csv

‎.yarnrc‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎NOTICE.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ This module was heavily inspired by the externals plugin that ships with webpack
2626
MIT License http://www.opensource.org/licenses/mit-license.php
2727
Author Tobias Koppers @sokra
2828

29+
---
30+
This product has relied on ASTExplorer that is licensed under MIT.
31+
2932
---
3033
This product includes code that is based on Ace editor, which was available
3134
under a "BSD" license.

0 commit comments

Comments
 (0)