Skip to content

Commit 2f99e97

Browse files
mshustovmshustov
committed
Merge branch 'master' into use-lazy-react-component-so-management
2 parents 0d7bdb0 + 36b4864 commit 2f99e97

File tree

4,654 files changed

+118948
-99878
lines changed

Some content is hidden

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

4,654 files changed

+118948
-99878
lines changed

‎.eslintignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ bower_components
1010
/html_docs
1111
/src/plugins/data/common/es_query/kuery/ast/_generated_/**
1212
/src/plugins/vis_type_timelion/public/_generated_/**
13-
src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data
1413
/src/legacy/ui/public/flot-charts
1514
/test/fixtures/scenarios
1615
/src/legacy/core_plugins/console/public/webpackShims

‎.eslintrc.js‎

Lines changed: 43 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ module.exports = {
9696
},
9797
},
9898
{
99-
files: ['x-pack/legacy/plugins/cross_cluster_replication/**/*.{js,ts,tsx}'],
99+
files: ['x-pack/plugins/cross_cluster_replication/**/*.{js,ts,tsx}'],
100100
rules: {
101101
'jsx-a11y/click-events-have-key-events': 'off',
102102
},
@@ -185,31 +185,43 @@ module.exports = {
185185
zones: [
186186
{
187187
target: [
188-
'src/legacy/**/*',
189-
'x-pack/**/*',
190-
'!x-pack/**/*.test.*',
191-
'!x-pack/test/**/*',
188+
'(src|x-pack)/legacy/**/*',
192189
'(src|x-pack)/plugins/**/(public|server)/**/*',
193-
'src/core/(public|server)/**/*',
194190
'examples/**/*',
195191
],
196192
from: [
197193
'src/core/public/**/*',
198-
'!src/core/public/index.ts',
199-
'!src/core/public/mocks.ts',
200-
'!src/core/public/*.test.mocks.ts',
194+
'!src/core/public/index.ts', // relative import
195+
'!src/core/public/mocks{,.ts}',
196+
'!src/core/server/types{,.ts}',
201197
'!src/core/public/utils/**/*',
198+
'!src/core/public/*.test.mocks{,.ts}',
202199

203200
'src/core/server/**/*',
204-
'!src/core/server/index.ts',
205-
'!src/core/server/mocks.ts',
206-
'!src/core/server/types.ts',
207-
'!src/core/server/test_utils.ts',
201+
'!src/core/server/index.ts', // relative import
202+
'!src/core/server/mocks{,.ts}',
203+
'!src/core/server/types{,.ts}',
204+
'!src/core/server/test_utils',
208205
// for absolute imports until fixed in
209206
// https://github.com/elastic/kibana/issues/36096
210-
'!src/core/server/types',
211-
'!src/core/server/*.test.mocks.ts',
212-
207+
'!src/core/server/*.test.mocks{,.ts}',
208+
],
209+
allowSameFolder: true,
210+
errorMessage:
211+
'Plugins may only import from top-level public and server modules in core.',
212+
},
213+
{
214+
target: [
215+
'(src|x-pack)/legacy/**/*',
216+
'(src|x-pack)/plugins/**/(public|server)/**/*',
217+
'examples/**/*',
218+
'!(src|x-pack)/**/*.test.*',
219+
'!(x-pack/)?test/**/*',
220+
// next folder contains legacy browser tests which can't be migrated to jest
221+
// which import np files
222+
'!src/legacy/core_plugins/kibana/public/__tests__/**/*',
223+
],
224+
from: [
213225
'(src|x-pack)/plugins/**/(public|server)/**/*',
214226
'!(src|x-pack)/plugins/**/(public|server)/(index|mocks).{js,ts,tsx}',
215227
],
@@ -553,7 +565,7 @@ module.exports = {
553565
*/
554566
{
555567
// front end typescript and javascript files only
556-
files: ['x-pack/legacy/plugins/siem/public/**/*.{js,ts,tsx}'],
568+
files: ['x-pack/plugins/siem/public/**/*.{js,ts,tsx}'],
557569
rules: {
558570
'import/no-nodejs-modules': 'error',
559571
'no-restricted-imports': [
@@ -602,7 +614,7 @@ module.exports = {
602614
// {
603615
// // will introduced after the other warns are fixed
604616
// // typescript and javascript for front end react performance
605-
// files: ['x-pack/legacy/plugins/siem/public/**/!(*.test).{js,ts,tsx}'],
617+
// files: ['x-pack/plugins/siem/public/**/!(*.test).{js,ts,tsx}'],
606618
// plugins: ['react-perf'],
607619
// rules: {
608620
// // 'react-perf/jsx-no-new-object-as-prop': 'error',
@@ -730,6 +742,19 @@ module.exports = {
730742
},
731743
},
732744

745+
/**
746+
* Alerting Services overrides
747+
*/
748+
{
749+
// typescript only for front and back end
750+
files: [
751+
'x-pack/{,legacy/}plugins/{alerting,alerting_builtins,actions,task_manager,event_log}/**/*.{ts,tsx}',
752+
],
753+
rules: {
754+
'@typescript-eslint/no-explicit-any': 'error',
755+
},
756+
},
757+
733758
/**
734759
* Lens overrides
735760
*/

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@
1111
/src/legacy/core_plugins/kibana/public/discover/ @elastic/kibana-app
1212
/src/legacy/core_plugins/kibana/public/local_application_service/ @elastic/kibana-app
1313
/src/legacy/core_plugins/kibana/public/dev_tools/ @elastic/kibana-app
14-
/src/legacy/core_plugins/vis_type_vislib/ @elastic/kibana-app
14+
/src/plugins/vis_type_vislib/ @elastic/kibana-app
1515
/src/plugins/vis_type_xy/ @elastic/kibana-app
1616
/src/plugins/vis_type_table/ @elastic/kibana-app
1717
/src/plugins/kibana_legacy/ @elastic/kibana-app
1818
/src/plugins/vis_type_timelion/ @elastic/kibana-app
1919
/src/plugins/dashboard/ @elastic/kibana-app
2020
/src/plugins/discover/ @elastic/kibana-app
21+
/src/plugins/input_control_vis/ @elastic/kibana-app
2122
/src/plugins/visualize/ @elastic/kibana-app
2223
/src/plugins/vis_type_timeseries/ @elastic/kibana-app
2324
/src/plugins/vis_type_metric/ @elastic/kibana-app

‎.github/paths-labeller.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
- "Feature:ExpressionLanguage":
99
- "src/plugins/expressions/**/*.*"
1010
- "src/plugins/bfetch/**/*.*"
11+
- "Team:apm"
12+
- "x-pack/plugins/apm/**/*.*"
13+
- "x-pack/legacy/plugins/apm/**/*.*"
1114
- "Team:uptime":
1215
- "x-pack/plugins/uptime/**/*.*"
1316
- "x-pack/legacy/plugins/uptime/**/*.*"

‎.i18nrc.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"esUi": "src/plugins/es_ui_shared",
1515
"devTools": "src/plugins/dev_tools",
1616
"expressions": "src/plugins/expressions",
17-
"inputControl": "src/legacy/core_plugins/input_control_vis",
17+
"inputControl": "src/plugins/input_control_vis",
1818
"inspector": "src/plugins/inspector",
1919
"inspectorViews": "src/legacy/core_plugins/inspector_views",
2020
"interpreter": "src/legacy/core_plugins/interpreter",
@@ -49,11 +49,11 @@
4949
"visTypeMarkdown": "src/plugins/vis_type_markdown",
5050
"visTypeMetric": "src/plugins/vis_type_metric",
5151
"visTypeTable": "src/plugins/vis_type_table",
52-
"visTypeTagCloud": "src/legacy/core_plugins/vis_type_tagcloud",
53-
"visTypeTimeseries": ["src/legacy/core_plugins/vis_type_timeseries", "src/plugins/vis_type_timeseries"],
54-
"visTypeVega": "src/legacy/core_plugins/vis_type_vega",
55-
"visTypeVislib": "src/legacy/core_plugins/vis_type_vislib",
56-
"visTypeXy": "src/legacy/core_plugins/vis_type_xy",
52+
"visTypeTagCloud": "src/plugins/vis_type_tagcloud",
53+
"visTypeTimeseries": "src/plugins/vis_type_timeseries",
54+
"visTypeVega": "src/plugins/vis_type_vega",
55+
"visTypeVislib": "src/plugins/vis_type_vislib",
56+
"visTypeXy": "src/plugins/vis_type_xy",
5757
"visualizations": "src/plugins/visualizations",
5858
"visualize": "src/plugins/visualize"
5959
},

‎.sass-lint.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ files:
22
include:
33
- 'src/legacy/core_plugins/metrics/**/*.s+(a|c)ss'
44
- 'src/legacy/core_plugins/timelion/**/*.s+(a|c)ss'
5-
- 'src/legacy/core_plugins/vis_type_vislib/**/*.s+(a|c)ss'
6-
- 'src/legacy/core_plugins/vis_type_xy/**/*.s+(a|c)ss'
7-
- 'x-pack/legacy/plugins/rollup/**/*.s+(a|c)ss'
5+
- 'src/plugins/vis_type_vislib/**/*.s+(a|c)ss'
6+
- 'src/plugins/vis_type_xy/**/*.s+(a|c)ss'
87
- 'x-pack/legacy/plugins/security/**/*.s+(a|c)ss'
98
- 'x-pack/legacy/plugins/canvas/**/*.s+(a|c)ss'
109
- 'x-pack/plugins/triggers_actions_ui/**/*.s+(a|c)ss'
1110
- 'x-pack/plugins/lens/**/*.s+(a|c)ss'
11+
- 'x-pack/plugins/cross_cluster_replication/**/*.s+(a|c)ss'
1212
- 'x-pack/legacy/plugins/maps/**/*.s+(a|c)ss'
1313
- 'x-pack/plugins/maps/**/*.s+(a|c)ss'
1414
ignore:

‎Jenkinsfile‎

Lines changed: 49 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -4,54 +4,56 @@ library 'kibana-pipeline-library'
44
kibanaLibrary.load()
55

66
kibanaPipeline(timeoutMinutes: 135, checkPrChanges: true) {
7-
githubPr.withDefaultPrComments {
8-
catchError {
9-
retryable.enable()
10-
parallel([
11-
'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'),
12-
'x-pack-intake-agent': workers.intake('x-pack-intake', './test/scripts/jenkins_xpack.sh'),
13-
'kibana-oss-agent': workers.functional('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
14-
// 'oss-firefoxSmoke': kibanaPipeline.functionalTestProcess('kibana-firefoxSmoke', './test/scripts/jenkins_firefox_smoke.sh'),
15-
'oss-ciGroup1': kibanaPipeline.ossCiGroupProcess(1),
16-
'oss-ciGroup2': kibanaPipeline.ossCiGroupProcess(2),
17-
'oss-ciGroup3': kibanaPipeline.ossCiGroupProcess(3),
18-
'oss-ciGroup4': kibanaPipeline.ossCiGroupProcess(4),
19-
'oss-ciGroup5': kibanaPipeline.ossCiGroupProcess(5),
20-
'oss-ciGroup6': kibanaPipeline.ossCiGroupProcess(6),
21-
'oss-ciGroup7': kibanaPipeline.ossCiGroupProcess(7),
22-
'oss-ciGroup8': kibanaPipeline.ossCiGroupProcess(8),
23-
'oss-ciGroup9': kibanaPipeline.ossCiGroupProcess(9),
24-
'oss-ciGroup10': kibanaPipeline.ossCiGroupProcess(10),
25-
'oss-ciGroup11': kibanaPipeline.ossCiGroupProcess(11),
26-
'oss-ciGroup12': kibanaPipeline.ossCiGroupProcess(12),
27-
'oss-accessibility': kibanaPipeline.functionalTestProcess('kibana-accessibility', './test/scripts/jenkins_accessibility.sh'),
28-
// 'oss-visualRegression': kibanaPipeline.functionalTestProcess('visualRegression', './test/scripts/jenkins_visual_regression.sh'),
29-
]),
30-
'kibana-xpack-agent': workers.functional('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
31-
// 'xpack-firefoxSmoke': kibanaPipeline.functionalTestProcess('xpack-firefoxSmoke', './test/scripts/jenkins_xpack_firefox_smoke.sh'),
32-
'xpack-ciGroup1': kibanaPipeline.xpackCiGroupProcess(1),
33-
'xpack-ciGroup2': kibanaPipeline.xpackCiGroupProcess(2),
34-
'xpack-ciGroup3': kibanaPipeline.xpackCiGroupProcess(3),
35-
'xpack-ciGroup4': kibanaPipeline.xpackCiGroupProcess(4),
36-
'xpack-ciGroup5': kibanaPipeline.xpackCiGroupProcess(5),
37-
'xpack-ciGroup6': kibanaPipeline.xpackCiGroupProcess(6),
38-
'xpack-ciGroup7': kibanaPipeline.xpackCiGroupProcess(7),
39-
'xpack-ciGroup8': kibanaPipeline.xpackCiGroupProcess(8),
40-
'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
41-
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
42-
'xpack-accessibility': kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh'),
43-
'xpack-siemCypress': { processNumber ->
44-
whenChanged(['x-pack/plugins/siem/', 'x-pack/legacy/plugins/siem/', 'x-pack/test/siem_cypress/']) {
45-
kibanaPipeline.functionalTestProcess('xpack-siemCypress', './test/scripts/jenkins_siem_cypress.sh')(processNumber)
46-
}
47-
},
7+
ciStats.trackBuild {
8+
githubPr.withDefaultPrComments {
9+
catchError {
10+
retryable.enable()
11+
parallel([
12+
'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'),
13+
'x-pack-intake-agent': workers.intake('x-pack-intake', './test/scripts/jenkins_xpack.sh'),
14+
'kibana-oss-agent': workers.functional('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
15+
'oss-firefoxSmoke': kibanaPipeline.functionalTestProcess('kibana-firefoxSmoke', './test/scripts/jenkins_firefox_smoke.sh'),
16+
'oss-ciGroup1': kibanaPipeline.ossCiGroupProcess(1),
17+
'oss-ciGroup2': kibanaPipeline.ossCiGroupProcess(2),
18+
'oss-ciGroup3': kibanaPipeline.ossCiGroupProcess(3),
19+
'oss-ciGroup4': kibanaPipeline.ossCiGroupProcess(4),
20+
'oss-ciGroup5': kibanaPipeline.ossCiGroupProcess(5),
21+
'oss-ciGroup6': kibanaPipeline.ossCiGroupProcess(6),
22+
'oss-ciGroup7': kibanaPipeline.ossCiGroupProcess(7),
23+
'oss-ciGroup8': kibanaPipeline.ossCiGroupProcess(8),
24+
'oss-ciGroup9': kibanaPipeline.ossCiGroupProcess(9),
25+
'oss-ciGroup10': kibanaPipeline.ossCiGroupProcess(10),
26+
'oss-ciGroup11': kibanaPipeline.ossCiGroupProcess(11),
27+
'oss-ciGroup12': kibanaPipeline.ossCiGroupProcess(12),
28+
'oss-accessibility': kibanaPipeline.functionalTestProcess('kibana-accessibility', './test/scripts/jenkins_accessibility.sh'),
29+
// 'oss-visualRegression': kibanaPipeline.functionalTestProcess('visualRegression', './test/scripts/jenkins_visual_regression.sh'),
30+
]),
31+
'kibana-xpack-agent': workers.functional('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
32+
'xpack-firefoxSmoke': kibanaPipeline.functionalTestProcess('xpack-firefoxSmoke', './test/scripts/jenkins_xpack_firefox_smoke.sh'),
33+
'xpack-ciGroup1': kibanaPipeline.xpackCiGroupProcess(1),
34+
'xpack-ciGroup2': kibanaPipeline.xpackCiGroupProcess(2),
35+
'xpack-ciGroup3': kibanaPipeline.xpackCiGroupProcess(3),
36+
'xpack-ciGroup4': kibanaPipeline.xpackCiGroupProcess(4),
37+
'xpack-ciGroup5': kibanaPipeline.xpackCiGroupProcess(5),
38+
'xpack-ciGroup6': kibanaPipeline.xpackCiGroupProcess(6),
39+
'xpack-ciGroup7': kibanaPipeline.xpackCiGroupProcess(7),
40+
'xpack-ciGroup8': kibanaPipeline.xpackCiGroupProcess(8),
41+
'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
42+
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
43+
'xpack-accessibility': kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh'),
44+
'xpack-siemCypress': { processNumber ->
45+
whenChanged(['x-pack/plugins/siem/', 'x-pack/test/siem_cypress/']) {
46+
kibanaPipeline.functionalTestProcess('xpack-siemCypress', './test/scripts/jenkins_siem_cypress.sh')(processNumber)
47+
}
48+
},
4849

49-
// 'xpack-visualRegression': kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh'),
50-
]),
51-
])
50+
// 'xpack-visualRegression': kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh'),
51+
]),
52+
])
53+
}
5254
}
53-
}
5455

55-
retryable.printFlakyFailures()
56-
kibanaPipeline.sendMail()
56+
retryable.printFlakyFailures()
57+
kibanaPipeline.sendMail()
58+
}
5759
}

‎docs/developer/core-development.asciidoc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
* <<development-elasticsearch>>
88
* <<development-unit-tests>>
99
* <<development-functional-tests>>
10+
* <<development-es-snapshots>>
1011

1112
include::core/development-basepath.asciidoc[]
1213

@@ -19,3 +20,5 @@ include::core/development-elasticsearch.asciidoc[]
1920
include::core/development-unit-tests.asciidoc[]
2021

2122
include::core/development-functional-tests.asciidoc[]
23+
24+
include::core/development-es-snapshots.asciidoc[]

0 commit comments

Comments
 (0)