Skip to content

Commit d103b80

Browse files
Merge branch 'master' into reporting/fix-csv-search
2 parents c341b98 + d9554ff commit d103b80

File tree

7,771 files changed

+193102
-140475
lines changed

Some content is hidden

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

7,771 files changed

+193102
-140475
lines changed

.eslintrc.js

Lines changed: 44 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -197,46 +197,6 @@ module.exports = {
197197
},
198198
},
199199

200-
/**
201-
* Prettier
202-
*/
203-
{
204-
files: [
205-
'.eslintrc.js',
206-
'packages/kbn-utility-types/**/*',
207-
'packages/kbn-eslint-plugin-eslint/**/*',
208-
'packages/kbn-config-schema/**/*',
209-
'packages/kbn-pm/**/*',
210-
'packages/kbn-es/**/*',
211-
'packages/elastic-datemath/**/*',
212-
'packages/kbn-i18n/**/*',
213-
'packages/kbn-dev-utils/**/*',
214-
'packages/kbn-plugin-helpers/**/*',
215-
'packages/kbn-plugin-generator/**/*',
216-
'packages/kbn-test-subj-selector/**/*',
217-
'packages/kbn-test/**/*',
218-
'packages/kbn-eslint-import-resolver-kibana/**/*',
219-
'src/legacy/server/saved_objects/**/*',
220-
'x-pack/legacy/plugins/apm/**/*',
221-
'x-pack/legacy/plugins/canvas/**/*',
222-
'**/*.{ts,tsx}',
223-
'src/legacy/core_plugins/metrics/**/*.js',
224-
],
225-
plugins: ['prettier'],
226-
rules: Object.assign(
227-
{
228-
'prettier/prettier': [
229-
'error',
230-
{
231-
endOfLine: 'auto',
232-
},
233-
],
234-
},
235-
require('eslint-config-prettier').rules,
236-
require('eslint-config-prettier/react').rules
237-
),
238-
},
239-
240200
/**
241201
* Files that require Apache 2.0 headers, settings
242202
* are overridden below for files that require Elastic
@@ -297,7 +257,8 @@ module.exports = {
297257
'src/legacy/**/*',
298258
'x-pack/**/*',
299259
'!x-pack/**/*.test.*',
300-
'src/plugins/**/(public|server)/**/*',
260+
'!x-pack/test/**/*',
261+
'(src|x-pack)/plugins/**/(public|server)/**/*',
301262
'src/core/(public|server)/**/*',
302263
],
303264
from: [
@@ -317,16 +278,35 @@ module.exports = {
317278
'!src/core/server/types',
318279
'!src/core/server/*.test.mocks.ts',
319280

320-
'src/plugins/**/public/**/*',
321-
'!src/plugins/**/public/index.{js,ts,tsx}',
322-
323-
'src/plugins/**/server/**/*',
324-
'!src/plugins/**/server/index.{js,ts,tsx}',
281+
'(src|x-pack)/plugins/**/(public|server)/**/*',
282+
'!(src|x-pack)/plugins/**/(public|server)/(index|mocks).{js,ts,tsx}',
325283
],
326284
allowSameFolder: true,
285+
errorMessage: 'Plugins may only import from top-level public and server modules.',
327286
},
328287
{
329-
target: ['src/core/**/*'],
288+
target: [
289+
'(src|x-pack)/plugins/**/*',
290+
'!(src|x-pack)/plugins/*/server/**/*',
291+
292+
'src/legacy/core_plugins/**/*',
293+
'!src/legacy/core_plugins/*/server/**/*',
294+
'!src/legacy/core_plugins/*/index.{js,ts,tsx}',
295+
296+
'x-pack/legacy/plugins/**/*',
297+
'!x-pack/legacy/plugins/*/server/**/*',
298+
'!x-pack/legacy/plugins/*/index.{js,ts,tsx}',
299+
],
300+
from: [
301+
'src/core/server',
302+
'src/core/server/**/*',
303+
'(src|x-pack)/plugins/*/server/**/*',
304+
],
305+
errorMessage:
306+
'Server modules cannot be imported into client modules or shared modules.',
307+
},
308+
{
309+
target: ['src/**/*'],
330310
from: ['x-pack/**/*'],
331311
errorMessage: 'OSS cannot import x-pack files.',
332312
},
@@ -340,6 +320,11 @@ module.exports = {
340320
],
341321
errorMessage: 'The core cannot depend on any plugins.',
342322
},
323+
{
324+
target: ['(src|x-pack)/plugins/*/public/**/*'],
325+
from: ['ui/**/*', 'uiExports/**/*'],
326+
errorMessage: 'Plugins cannot import legacy UI code.',
327+
},
343328
{
344329
from: ['src/legacy/ui/**/*', 'ui/**/*'],
345330
target: [
@@ -700,8 +685,6 @@ module.exports = {
700685
'accessor-pairs': 'error',
701686
'array-callback-return': 'error',
702687
'no-array-constructor': 'error',
703-
// This will be turned on after bug fixes are mostly completed
704-
// 'arrow-body-style': ['warn', 'as-needed'],
705688
complexity: 'warn',
706689
// This will be turned on after bug fixes are mostly completed
707690
// 'consistent-return': 'warn',
@@ -731,7 +714,6 @@ module.exports = {
731714
'no-extra-bind': 'error',
732715
'no-extra-boolean-cast': 'error',
733716
'no-extra-label': 'error',
734-
'no-floating-decimal': 'error',
735717
'no-func-assign': 'error',
736718
'no-implicit-globals': 'error',
737719
'no-implied-eval': 'error',
@@ -772,8 +754,6 @@ module.exports = {
772754
'prefer-spread': 'error',
773755
// This style will be turned on after most bugs are fixed
774756
// 'prefer-template': 'warn',
775-
// This style will be turned on after most bugs are fixed
776-
// quotes: ['warn', 'single', { avoidEscape: true }],
777757
'react/boolean-prop-naming': 'error',
778758
'react/button-has-type': 'error',
779759
'react/forbid-dom-props': 'error',
@@ -809,13 +789,10 @@ module.exports = {
809789
'react/jsx-sort-default-props': 'error',
810790
// might be introduced after the other warns are fixed
811791
// 'react/jsx-sort-props': 'error',
812-
'react/jsx-tag-spacing': 'error',
813792
// might be introduced after the other warns are fixed
814793
'react-hooks/exhaustive-deps': 'off',
815794
'require-atomic-updates': 'error',
816-
'rest-spread-spacing': ['error', 'never'],
817795
'symbol-description': 'error',
818-
'template-curly-spacing': 'error',
819796
'vars-on-top': 'error',
820797
},
821798
},
@@ -850,8 +827,6 @@ module.exports = {
850827
{
851828
files: ['x-pack/legacy/plugins/monitoring/**/*.js'],
852829
rules: {
853-
'block-spacing': ['error', 'always'],
854-
curly: ['error', 'all'],
855830
'no-unused-vars': ['error', { args: 'all', argsIgnorePattern: '^_' }],
856831
'no-else-return': 'error',
857832
},
@@ -868,7 +843,6 @@ module.exports = {
868843
files: ['x-pack/legacy/plugins/canvas/**/*.js'],
869844
rules: {
870845
radix: 'error',
871-
curly: ['error', 'all'],
872846

873847
// module importing
874848
'import/order': [
@@ -886,7 +860,6 @@ module.exports = {
886860
'react/self-closing-comp': 'error',
887861
'react/sort-comp': 'error',
888862
'react/jsx-boolean-value': 'error',
889-
'react/jsx-wrap-multilines': 'error',
890863
'react/no-unescaped-entities': ['error', { forbid: ['>', '}'] }],
891864
'react/forbid-elements': [
892865
'error',
@@ -963,5 +936,17 @@ module.exports = {
963936
'import/no-default-export': 'error',
964937
},
965938
},
939+
940+
/**
941+
* Prettier disables all conflicting rules, listing as last override so it takes precedence
942+
*/
943+
{
944+
files: ['**/*'],
945+
rules: {
946+
...require('eslint-config-prettier').rules,
947+
...require('eslint-config-prettier/react').rules,
948+
...require('eslint-config-prettier/@typescript-eslint').rules,
949+
},
950+
},
966951
],
967952
};

.github/CODEOWNERS

Lines changed: 34 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,16 @@
88
/src/plugins/share/ @elastic/kibana-app
99
/src/legacy/server/url_shortening/ @elastic/kibana-app
1010
/src/legacy/server/sample_data/ @elastic/kibana-app
11+
/src/legacy/core_plugins/kibana/public/dashboard/ @elastic/kibana-app
12+
/src/legacy/core_plugins/kibana/public/discover/ @elastic/kibana-app
13+
/src/legacy/core_plugins/kibana/public/visualize/ @elastic/kibana-app
14+
/src/legacy/core_plugins/kibana/public/local_application_service/ @elastic/kibana-app
15+
/src/legacy/core_plugins/kibana/public/home/ @elastic/kibana-app
16+
/src/legacy/core_plugins/kibana/public/dev_tools/ @elastic/kibana-app
17+
/src/plugins/home/ @elastic/kibana-app
18+
/src/plugins/kibana_legacy/ @elastic/kibana-app
19+
/src/plugins/timelion/ @elastic/kibana-app
20+
/src/plugins/dev_tools/ @elastic/kibana-app
1121

1222
# App Architecture
1323
/src/plugins/data/ @elastic/kibana-app-arch
@@ -57,6 +67,13 @@
5767
/x-pack/test/functional/services/transform_ui/ @elastic/ml-ui
5868
/x-pack/test/functional/services/transform.ts @elastic/ml-ui
5969

70+
# Maps
71+
/x-pack/legacy/plugins/maps/ @elastic/kibana-gis
72+
/x-pack/test/api_integration/apis/maps/ @elastic/kibana-gis
73+
/x-pack/test/functional/apps/maps/ @elastic/kibana-gis
74+
/x-pack/test/functional/es_archives/maps/ @elastic/kibana-gis
75+
/x-pack/test/visual_regression/tests/maps/index.js @elastic/kibana-gis
76+
6077
# Operations
6178
/src/dev/ @elastic/kibana-operations
6279
/src/setup_node_env/ @elastic/kibana-operations
@@ -80,32 +97,38 @@
8097
/x-pack/plugins/licensing/ @elastic/kibana-platform
8198
/packages/kbn-config-schema/ @elastic/kibana-platform
8299
/src/legacy/server/config/ @elastic/kibana-platform
83-
/src/legacy/server/csp/ @elastic/kibana-platform
84100
/src/legacy/server/http/ @elastic/kibana-platform
85101
/src/legacy/server/i18n/ @elastic/kibana-platform
86102
/src/legacy/server/logging/ @elastic/kibana-platform
87103
/src/legacy/server/saved_objects/ @elastic/kibana-platform
88104
/src/legacy/server/status/ @elastic/kibana-platform
89105

90106
# Security
107+
/src/core/server/csp/ @elastic/kibana-security @elastic/kibana-platform
91108
/x-pack/legacy/plugins/security/ @elastic/kibana-security
92109
/x-pack/legacy/plugins/spaces/ @elastic/kibana-security
93110
/x-pack/plugins/spaces/ @elastic/kibana-security
94111
/x-pack/legacy/plugins/encrypted_saved_objects/ @elastic/kibana-security
95112
/x-pack/plugins/encrypted_saved_objects/ @elastic/kibana-security
96-
/src/legacy/server/csp/ @elastic/kibana-security
97113
/x-pack/plugins/security/ @elastic/kibana-security
98114
/x-pack/test/api_integration/apis/security/ @elastic/kibana-security
99115

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
116+
# Kibana Localization
117+
/src/dev/i18n @elastic/kibana-localization
118+
119+
# Pulse
120+
/packages/kbn-analytics/ @elastic/pulse
121+
/src/legacy/core_plugins/ui_metric/ @elastic/pulse
122+
/src/plugins/usage_collection/ @elastic/pulse
123+
/x-pack/legacy/plugins/telemetry @elastic/pulse
124+
125+
# Kibana Alerting Services
126+
/x-pack/legacy/plugins/alerting @elastic/kibana-alerting-services
127+
/x-pack/legacy/plugins/actions @elastic/kibana-alerting-services
128+
/x-pack/legacy/plugins/task_manager @elastic/kibana-alerting-services
129+
/x-pack/test/alerting_api_integration @elastic/kibana-alerting-services
130+
/x-pack/test/plugin_api_integration/plugins/task_manager @elastic/kibana-alerting-services
131+
/x-pack/test/plugin_api_integration/test_suites/task_manager @elastic/kibana-alerting-services
109132

110133
# Design
111134
**/*.scss @elastic/kibana-design

.github/labeler.yml

Lines changed: 0 additions & 13 deletions
This file was deleted.
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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: |
15+
[
16+
{ "label": "Team:AppArch", "projectName": "kibana-app-arch", "columnId": 6173897 },
17+
{ "label": "Feature:Lens", "projectName": "Lens", "columnId": 6219362 },
18+
{ "label": "Team:Platform", "projectName": "kibana-platform", "columnId": 5514360 },
19+
{"label": "Team:Canvas", "projectName": "canvas", "columnId": 6187580}
20+
]
21+
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}, {"label": "Feature:Lens", "projectName": "Lens", "columnId": 6219363}, {"label": "Team:Canvas", "projectName": "canvas", "columnId": 6187593}]'
15+
ghToken: ${{ secrets.GITHUB_TOKEN }}
16+
17+

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ disabledPlugins
2929
webpackstats.json
3030
/config/*
3131
!/config/kibana.yml
32-
!/config/apm.js
3332
coverage
3433
selenium
3534
.babel_register_cache.json

.i18nrc.json

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,14 @@
44
"console": "src/legacy/core_plugins/console",
55
"core": "src/core",
66
"dashboardEmbeddableContainer": "src/plugins/dashboard_embeddable_container",
7-
"data": ["src/legacy/core_plugins/data", "src/plugins/data"],
7+
"data": [
8+
"src/legacy/core_plugins/data",
9+
"src/plugins/data"
10+
],
811
"embeddableApi": "src/plugins/embeddable",
12+
"embeddableExamples": "examples/embeddable_examples",
913
"share": "src/plugins/share",
14+
"home": "src/plugins/home",
1015
"esUi": "src/plugins/es_ui_shared",
1116
"devTools": "src/plugins/dev_tools",
1217
"expressions": "src/plugins/expressions",
@@ -17,11 +22,11 @@
1722
"kbn": "src/legacy/core_plugins/kibana",
1823
"kbnDocViews": "src/legacy/core_plugins/kbn_doc_views",
1924
"kbnVislibVisTypes": "src/legacy/core_plugins/kbn_vislib_vis_types",
20-
"management": "src/legacy/core_plugins/management",
25+
"management": ["src/legacy/core_plugins/management", "src/plugins/management"],
2126
"kibana_react": "src/legacy/core_plugins/kibana_react",
2227
"kibana-react": "src/plugins/kibana_react",
2328
"kibana_utils": "src/plugins/kibana_utils",
24-
"navigation": "src/legacy/core_plugins/navigation",
29+
"navigation": "src/plugins/navigation",
2530
"newsfeed": "src/plugins/newsfeed",
2631
"regionMap": "src/legacy/core_plugins/region_map",
2732
"server": "src/legacy/server",
@@ -36,8 +41,13 @@
3641
"visTypeTagCloud": "src/legacy/core_plugins/vis_type_tagcloud",
3742
"visTypeTimeseries": "src/legacy/core_plugins/vis_type_timeseries",
3843
"visTypeVega": "src/legacy/core_plugins/vis_type_vega",
39-
"visualizations": ["src/plugins/visualizations", "src/legacy/core_plugins/visualizations"]
44+
"visualizations": [
45+
"src/plugins/visualizations",
46+
"src/legacy/core_plugins/visualizations"
47+
]
4048
},
41-
"exclude": ["src/legacy/ui/ui_render/ui_render_mixin.js"],
49+
"exclude": [
50+
"src/legacy/ui/ui_render/ui_render_mixin.js"
51+
],
4252
"translations": []
43-
}
53+
}

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.15.2
1+
10.18.0

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.15.2
1+
10.18.0

0 commit comments

Comments
 (0)