Skip to content

Commit f713a95

Browse files
Merge branch 'master' into chore/eslint-plugin-react-perf
2 parents 0663542 + 27a4fe2 commit f713a95

File tree

3,544 files changed

+57444
-37190
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,544 files changed

+57444
-37190
lines changed

.ci/Jenkinsfile_coverage

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
1616
withEnv([
1717
'NODE_ENV=test' // Needed for jest tests only
1818
]) {
19-
kibanaPipeline.legacyJobRunner('kibana-intake')()
19+
kibanaPipeline.intakeWorker('kibana-intake', './test/scripts/jenkins_unit.sh')()
2020
}
2121
},
2222
'x-pack-intake-agent': {
2323
withEnv([
2424
'NODE_ENV=test' // Needed for jest tests only
2525
]) {
26-
kibanaPipeline.legacyJobRunner('x-pack-intake')()
26+
kibanaPipeline.intakeWorker('x-pack-intake', './test/scripts/jenkins_xpack.sh')()
2727
}
2828
},
2929
'kibana-oss-agent': kibanaPipeline.withWorkers('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
@@ -40,16 +40,11 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
4040
'oss-ciGroup11': kibanaPipeline.getOssCiGroupWorker(11),
4141
'oss-ciGroup12': kibanaPipeline.getOssCiGroupWorker(12),
4242
]),
43-
'kibana-xpack-agent-1': kibanaPipeline.withWorkers('kibana-xpack-tests-1', { kibanaPipeline.buildXpack() }, [
43+
'kibana-xpack-agent': kibanaPipeline.withWorkers('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
4444
'xpack-ciGroup1': kibanaPipeline.getXpackCiGroupWorker(1),
4545
'xpack-ciGroup2': kibanaPipeline.getXpackCiGroupWorker(2),
46-
]),
47-
'kibana-xpack-agent-2': kibanaPipeline.withWorkers('kibana-xpack-tests-2', { kibanaPipeline.buildXpack() }, [
4846
'xpack-ciGroup3': kibanaPipeline.getXpackCiGroupWorker(3),
4947
'xpack-ciGroup4': kibanaPipeline.getXpackCiGroupWorker(4),
50-
]),
51-
52-
'kibana-xpack-agent-3': kibanaPipeline.withWorkers('kibana-xpack-tests-3', { kibanaPipeline.buildXpack() }, [
5348
'xpack-ciGroup5': kibanaPipeline.getXpackCiGroupWorker(5),
5449
'xpack-ciGroup6': kibanaPipeline.getXpackCiGroupWorker(6),
5550
'xpack-ciGroup7': kibanaPipeline.getXpackCiGroupWorker(7),
@@ -75,9 +70,7 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
7570
echo extracting kibana-oss-tests
7671
tar -xzf /tmp/downloaded_coverage/coverage/kibana-oss-tests/kibana-coverage.tar.gz -C /tmp/extracted_coverage
7772
echo extracting kibana-xpack-tests
78-
for i in {1..3}; do
79-
tar -xzf /tmp/downloaded_coverage/coverage/kibana-xpack-tests-${i}/kibana-coverage.tar.gz -C /tmp/extracted_coverage
80-
done
73+
tar -xzf /tmp/downloaded_coverage/coverage/kibana-xpack-tests/kibana-coverage.tar.gz -C /tmp/extracted_coverage
8174
# replace path in json files to have valid html report
8275
pwd=$(pwd)
8376
du -sh /tmp/extracted_coverage/target/kibana-coverage/

.ci/es-snapshots/Jenkinsfile_verify_es

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ timeout(time: 120, unit: 'MINUTES') {
2626
withEnv(["ES_SNAPSHOT_MANIFEST=${SNAPSHOT_MANIFEST}"]) {
2727
parallel([
2828
// TODO we just need to run integration tests from intake?
29-
'kibana-intake-agent': kibanaPipeline.legacyJobRunner('kibana-intake'),
30-
'x-pack-intake-agent': kibanaPipeline.legacyJobRunner('x-pack-intake'),
29+
'kibana-intake-agent': kibanaPipeline.intakeWorker('kibana-intake', './test/scripts/jenkins_unit.sh'),
30+
'x-pack-intake-agent': kibanaPipeline.intakeWorker('x-pack-intake', './test/scripts/jenkins_xpack.sh'),
3131
'kibana-oss-agent': kibanaPipeline.withWorkers('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
3232
'oss-ciGroup1': kibanaPipeline.getOssCiGroupWorker(1),
3333
'oss-ciGroup2': kibanaPipeline.getOssCiGroupWorker(2),

.ci/jobs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# This file is needed by functionalTests:ensureAllTestsInCiGroup for the list of ciGroups. That must be changed before this file can be removed
2+
13
JOB:
24
- kibana-intake
35
- x-pack-intake

.ci/run.sh

Lines changed: 0 additions & 50 deletions
This file was deleted.

.eslintrc.js

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,14 @@ module.exports = {
8888
'react-hooks/exhaustive-deps': 'off',
8989
},
9090
},
91+
{
92+
files: [
93+
'src/legacy/core_plugins/vis_default_editor/public/components/controls/**/*.{ts,tsx}',
94+
],
95+
rules: {
96+
'react-hooks/exhaustive-deps': 'off',
97+
},
98+
},
9199
{
92100
files: ['src/legacy/ui/public/vis/**/*.{js,ts,tsx}'],
93101
rules: {
@@ -244,15 +252,15 @@ module.exports = {
244252
{
245253
target: [
246254
'(src|x-pack)/plugins/**/*',
247-
'!(src|x-pack)/plugins/*/server/**/*',
255+
'!(src|x-pack)/plugins/**/server/**/*',
248256

249257
'src/legacy/core_plugins/**/*',
250-
'!src/legacy/core_plugins/*/server/**/*',
251-
'!src/legacy/core_plugins/*/index.{js,ts,tsx}',
258+
'!src/legacy/core_plugins/**/server/**/*',
259+
'!src/legacy/core_plugins/**/index.{js,ts,tsx}',
252260

253261
'x-pack/legacy/plugins/**/*',
254-
'!x-pack/legacy/plugins/*/server/**/*',
255-
'!x-pack/legacy/plugins/*/index.{js,ts,tsx}',
262+
'!x-pack/legacy/plugins/**/server/**/*',
263+
'!x-pack/legacy/plugins/**/index.{js,ts,tsx}',
256264

257265
'examples/**/*',
258266
'!examples/**/server/**/*',

.github/CODEOWNERS

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,17 @@
1212
/src/legacy/core_plugins/kibana/public/discover/ @elastic/kibana-app
1313
/src/legacy/core_plugins/kibana/public/visualize/ @elastic/kibana-app
1414
/src/legacy/core_plugins/kibana/public/local_application_service/ @elastic/kibana-app
15-
/src/legacy/core_plugins/kibana/public/home/ @elastic/kibana-app
1615
/src/legacy/core_plugins/kibana/public/dev_tools/ @elastic/kibana-app
1716
/src/legacy/core_plugins/metrics/ @elastic/kibana-app
1817
/src/legacy/core_plugins/vis_type_vislib/ @elastic/kibana-app
1918
# Exclude tutorials folder for now because they are not owned by Kibana app and most will move out soon
2019
/src/plugins/home/public @elastic/kibana-app
2120
/src/plugins/home/server/*.ts @elastic/kibana-app
2221
/src/plugins/home/server/services/ @elastic/kibana-app
22+
# Exclude tutorial resources folder for now because they are not owned by Kibana app and most will move out soon
23+
/src/legacy/core_plugins/kibana/public/home/*.ts @elastic/kibana-app
24+
/src/legacy/core_plugins/kibana/public/home/*.scss @elastic/kibana-app
25+
/src/legacy/core_plugins/kibana/public/home/np_ready/ @elastic/kibana-app
2326
/src/plugins/kibana_legacy/ @elastic/kibana-app
2427
/src/plugins/timelion/ @elastic/kibana-app
2528
/src/plugins/dev_tools/ @elastic/kibana-app
@@ -87,6 +90,7 @@
8790
/src/dev/ @elastic/kibana-operations
8891
/src/setup_node_env/ @elastic/kibana-operations
8992
/src/optimize/ @elastic/kibana-operations
93+
/src/es_archiver/ @elastic/kibana-operations
9094
/packages/*eslint*/ @elastic/kibana-operations
9195
/packages/*babel*/ @elastic/kibana-operations
9296
/packages/kbn-dev-utils*/ @elastic/kibana-operations
@@ -112,6 +116,7 @@
112116
/src/legacy/server/logging/ @elastic/kibana-platform
113117
/src/legacy/server/saved_objects/ @elastic/kibana-platform
114118
/src/legacy/server/status/ @elastic/kibana-platform
119+
/src/dev/run_check_core_api_changes.ts @elastic/kibana-platform
115120

116121
# Security
117122
/src/core/server/csp/ @elastic/kibana-security @elastic/kibana-platform
@@ -148,9 +153,9 @@
148153
**/*.scss @elastic/kibana-design
149154

150155
# Elasticsearch UI
151-
/src/legacy/core_plugins/console/ @elastic/es-ui
156+
/src/plugins/console/ @elastic/es-ui
152157
/src/plugins/es_ui_shared/ @elastic/es-ui
153-
/x-pack/legacy/plugins/console_extensions/ @elastic/es-ui
158+
/x-pack/plugins/console_extensions/ @elastic/es-ui
154159
/x-pack/legacy/plugins/cross_cluster_replication/ @elastic/es-ui
155160
/x-pack/legacy/plugins/index_lifecycle_management/ @elastic/es-ui
156161
/x-pack/legacy/plugins/index_management/ @elastic/es-ui

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
name: Assign a PR to project based on label
99
steps:
1010
- name: Assign to project
11-
uses: elastic/github-actions/project-assigner@v1.0.0
11+
uses: elastic/github-actions/project-assigner@v1.0.1
1212
id: project_assigner
1313
with:
1414
issue-mappings: |

.github/workflows/project-assigner.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
name: Assign issue or PR to project based on label
99
steps:
1010
- name: Assign to project
11-
uses: elastic/github-actions/project-assigner@v1.0.0
11+
uses: elastic/github-actions/project-assigner@v1.0.1
1212
id: project_assigner
1313
with:
1414
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}]'

.i18nrc.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"paths": {
33
"common.ui": "src/legacy/ui",
4-
"console": "src/legacy/core_plugins/console",
4+
"console": "src/plugins/console",
55
"core": "src/core",
66
"dashboardEmbeddableContainer": "src/plugins/dashboard_embeddable_container",
77
"data": [
@@ -12,6 +12,7 @@
1212
"embeddableExamples": "examples/embeddable_examples",
1313
"share": "src/plugins/share",
1414
"home": "src/plugins/home",
15+
"charts": "src/plugins/charts",
1516
"esUi": "src/plugins/es_ui_shared",
1617
"devTools": "src/plugins/dev_tools",
1718
"expressions": "src/plugins/expressions",
@@ -34,11 +35,12 @@
3435
"tileMap": "src/legacy/core_plugins/tile_map",
3536
"timelion": ["src/legacy/core_plugins/timelion", "src/legacy/core_plugins/vis_type_timelion", "src/plugins/timelion"],
3637
"uiActions": "src/plugins/ui_actions",
38+
"visDefaultEditor": "src/legacy/core_plugins/vis_default_editor",
3739
"visTypeMarkdown": "src/legacy/core_plugins/vis_type_markdown",
3840
"visTypeMetric": "src/legacy/core_plugins/vis_type_metric",
3941
"visTypeTable": "src/legacy/core_plugins/vis_type_table",
4042
"visTypeTagCloud": "src/legacy/core_plugins/vis_type_tagcloud",
41-
"visTypeTimeseries": "src/legacy/core_plugins/vis_type_timeseries",
43+
"visTypeTimeseries": ["src/legacy/core_plugins/vis_type_timeseries", "src/plugins/vis_type_timeseries"],
4244
"visTypeVega": "src/legacy/core_plugins/vis_type_vega",
4345
"visTypeVislib": "src/legacy/core_plugins/vis_type_vislib",
4446
"visualizations": [

CONTRIBUTING.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,16 @@ yarn kbn bootstrap
174174

175175
(You can also run `yarn kbn` to see the other available commands. For more info about this tool, see https://github.com/elastic/kibana/tree/master/packages/kbn-pm.)
176176

177+
When switching branches which use different versions of npm packages you may need to run;
178+
```bash
179+
yarn kbn clean
180+
```
181+
182+
If you have failures during `yarn kbn bootstrap` you may have some corrupted packages in your yarn cache which you can clean with;
183+
```bash
184+
yarn cache clean
185+
```
186+
177187
#### Increase node.js heap size
178188

179189
Kibana is a big project and for some commands it can happen that the process hits the default heap limit and crashes with an out-of-memory error. If you run into this problem, you can increase maximum heap size by setting the `--max_old_space_size` option on the command line. To set the limit for all commands, simply add the following line to your shell config: `export NODE_OPTIONS="--max_old_space_size=2048"`.
@@ -193,7 +203,7 @@ yarn es snapshot
193203
##### Keeping data between snapshots
194204

195205
If you want to keep the data inside your Elasticsearch between usages of this command,
196-
you should use the following command, to keep your data folder outside the downloaded snapshot
206+
you should use the following command, to keep your data folder outside the downloaded snapshot
197207
folder:
198208

199209
```bash
@@ -290,6 +300,7 @@ Follow the [cross-cluster search](https://www.elastic.co/guide/en/kibana/current
290300

291301
### Running Kibana
292302

303+
Change to your local Kibana directory.
293304
Start the development server.
294305

295306
```bash

0 commit comments

Comments
 (0)