Skip to content

Commit cf9323d

Browse files
Merge branch 'master' into kertal-pr-2020-11-03-discover-unskip-doc-table-functionals
2 parents 691ad30 + b44a0e5 commit cf9323d

File tree

3,761 files changed

+139665
-93958
lines changed

Some content is hidden

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

3,761 files changed

+139665
-93958
lines changed

.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: 23 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
},
@@ -638,6 +640,10 @@ module.exports = {
638640
name: 'lodash/fp/assocPath',
639641
message: 'Please use @elastic/safer-lodash-set instead',
640642
},
643+
{
644+
name: 'react-use',
645+
message: 'Please use react-use/lib/{method} instead.',
646+
},
641647
],
642648
},
643649
],
@@ -732,22 +738,6 @@ module.exports = {
732738
},
733739
},
734740

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-
751741
/**
752742
* Security Solution overrides
753743
*/
@@ -1149,16 +1139,11 @@ module.exports = {
11491139
{
11501140
devDependencies: true,
11511141
peerDependencies: true,
1142+
packageDir: '.',
11521143
},
11531144
],
11541145
},
11551146
},
1156-
{
1157-
files: ['x-pack/plugins/canvas/storybook/**'],
1158-
rules: {
1159-
'import/no-extraneous-dependencies': 0,
1160-
},
1161-
},
11621147
{
11631148
files: ['x-pack/plugins/canvas/canvas_plugin_src/**/*.js'],
11641149
globals: { canvas: true, $: true },
@@ -1237,5 +1222,21 @@ module.exports = {
12371222
],
12381223
},
12391224
},
1225+
1226+
/**
1227+
* Single package.json rules, it tells eslint to ignore the child package.json files
1228+
* and look for dependencies declarations in the single and root level package.json
1229+
*/
1230+
{
1231+
files: ['**/*.{js,mjs,ts,tsx}'],
1232+
rules: {
1233+
'import/no-extraneous-dependencies': [
1234+
'error',
1235+
{
1236+
packageDir: '.',
1237+
},
1238+
],
1239+
},
1240+
},
12401241
],
12411242
};

.github/CODEOWNERS

Lines changed: 31 additions & 96 deletions
Large diffs are not rendered by default.

.github/ISSUE_TEMPLATE/v8_breaking_change.md

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ assignees: ''
1313
****************************************
1414
1515
Please add a "NeededFor:${TeamName}" label to denote the team that is
16-
requesting the breaking change is surfaced in the Upgrade Assistant.
16+
requesting the breaking change to be surfaced in the Upgrade Assistant.
1717
1818
-->
1919

@@ -27,21 +27,26 @@ requesting the breaking change is surfaced in the Upgrade Assistant.
2727

2828
**How many users will be affected?**
2929

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. -->
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. -->
32+
33+
**How can we programmatically determine whether the cluster is affected by this breaking change?**
3234

3335
**What can users do to address the change manually?**
3436

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

3739
**How could we make migration easier with the Upgrade Assistant?**
3840

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

4146
## Test Data
4247

43-
Provide test data. We can’t build a solution without data to test it against.
48+
<!-- Provide test data. We can’t build a solution without data to test it against. -->
4449

4550
## Cross links
4651

47-
Cross-link to relevant [Elasticsearch breaking changes](https://www.elastic.co/guide/en/elasticsearch/reference/master/breaking-changes-8.0.html).
52+
<!-- 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/paths-labeller.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
- "Team:apm":
1212
- "x-pack/plugins/apm/**/*.*"
1313
- "Team:Ingest Management":
14-
- "x-pack/plugins/ingest_manager/**/*.*"
14+
- "x-pack/plugins/fleet/**/*.*"
1515
- "x-pack/test/api_integration/apis/fleet/**/*.*"
1616
- "x-pack/test/epm_api_integration/**/*.*"
1717
- "Team:uptime":

.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

.i18nrc.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@
5959
"visTypeVislib": "src/plugins/vis_type_vislib",
6060
"visTypeXy": "src/plugins/vis_type_xy",
6161
"visualizations": "src/plugins/visualizations",
62+
"lensOss": "src/plugins/lens_oss",
63+
"mapsOss": "src/plugins/maps_oss",
6264
"visualize": "src/plugins/visualize",
6365
"apmOss": "src/plugins/apm_oss",
6466
"usageCollection": "src/plugins/usage_collection"

.sass-lint.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ files:
66
- 'src/plugins/vis_type_vislib/**/*.s+(a|c)ss'
77
- 'src/plugins/vis_type_vega/**/*.s+(a|c)ss'
88
- 'src/plugins/vis_type_xy/**/*.s+(a|c)ss'
9+
- 'src/plugins/visualizations/public/wizard/**/*.s+(a|c)ss'
910
- 'x-pack/plugins/canvas/**/*.s+(a|c)ss'
1011
- 'x-pack/plugins/triggers_actions_ui/**/*.s+(a|c)ss'
1112
- 'x-pack/plugins/lens/**/*.s+(a|c)ss'

0 commit comments

Comments
 (0)