Skip to content

Commit a3cb024

Browse files
committed
Merge branch 'master' into 2020_09_04-upgrade-ech-19-0-0
2 parents d4ae3bd + 7bf7174 commit a3cb024

File tree

890 files changed

+17345
-5054
lines changed

Some content is hidden

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

890 files changed

+17345
-5054
lines changed

.backportrc.json

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,30 @@
11
{
22
"upstream": "elastic/kibana",
3-
"branches": [{ "name": "7.x", "checked": true }, "7.7", "7.6", "7.5", "7.4", "7.3", "7.2", "7.1", "7.0", "6.8", "6.7", "6.6", "6.5", "6.4", "6.3", "6.2", "6.1", "6.0", "5.6"],
4-
"labels": ["backport"]
3+
"targetBranchChoices": [
4+
{ "name": "master", "checked": true },
5+
{ "name": "7.x", "checked": true },
6+
"7.7",
7+
"7.6",
8+
"7.5",
9+
"7.4",
10+
"7.3",
11+
"7.2",
12+
"7.1",
13+
"7.0",
14+
"6.8",
15+
"6.7",
16+
"6.6",
17+
"6.5",
18+
"6.4",
19+
"6.3",
20+
"6.2",
21+
"6.1",
22+
"6.0",
23+
"5.6"
24+
],
25+
"targetPRLabels": ["backport"],
26+
"branchLabelMapping": {
27+
"^v7.8.0$": "7.x",
28+
"^v(\\d+).(\\d+).\\d+$": "$1.$2"
29+
}
530
}

.ci/es-snapshots/Jenkinsfile_verify_es

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ def SNAPSHOT_MANIFEST = "https://storage.googleapis.com/kibana-ci-es-snapshots-d
2121

2222
kibanaPipeline(timeoutMinutes: 120) {
2323
catchErrors {
24+
retryable.enable(2)
2425
withEnv(["ES_SNAPSHOT_MANIFEST=${SNAPSHOT_MANIFEST}"]) {
2526
parallel([
2627
'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'),

.github/CODEOWNERS

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,28 @@
33
# For more info, see https://help.github.com/articles/about-codeowners/
44

55
# App
6+
/x-pack/plugins/dashboard_enhanced/ @elastic/kibana-app
67
/x-pack/plugins/lens/ @elastic/kibana-app
78
/x-pack/plugins/graph/ @elastic/kibana-app
89
/src/legacy/server/url_shortening/ @elastic/kibana-app
910
/src/legacy/server/sample_data/ @elastic/kibana-app
10-
/src/legacy/core_plugins/kibana/public/dashboard/ @elastic/kibana-app
11-
/src/legacy/core_plugins/kibana/public/discover/ @elastic/kibana-app
1211
/src/legacy/core_plugins/kibana/public/local_application_service/ @elastic/kibana-app
1312
/src/legacy/core_plugins/kibana/public/dev_tools/ @elastic/kibana-app
14-
/src/plugins/vis_type_vislib/ @elastic/kibana-app
15-
/src/plugins/vis_type_xy/ @elastic/kibana-app
16-
/src/plugins/vis_type_table/ @elastic/kibana-app
17-
/src/plugins/kibana_legacy/ @elastic/kibana-app
18-
/src/plugins/vis_type_timelion/ @elastic/kibana-app
1913
/src/plugins/dashboard/ @elastic/kibana-app
2014
/src/plugins/discover/ @elastic/kibana-app
2115
/src/plugins/input_control_vis/ @elastic/kibana-app
22-
/src/plugins/visualize/ @elastic/kibana-app
23-
/src/plugins/vis_type_timeseries/ @elastic/kibana-app
24-
/src/plugins/vis_type_metric/ @elastic/kibana-app
16+
/src/plugins/kibana_legacy/ @elastic/kibana-app
17+
/src/plugins/vis_default_editor/ @elastic/kibana-app
2518
/src/plugins/vis_type_markdown/ @elastic/kibana-app
19+
/src/plugins/vis_type_metric/ @elastic/kibana-app
20+
/src/plugins/vis_type_table/ @elastic/kibana-app
21+
/src/plugins/vis_type_tagcloud/ @elastic/kibana-app
22+
/src/plugins/vis_type_timelion/ @elastic/kibana-app
23+
/src/plugins/vis_type_timeseries/ @elastic/kibana-app
24+
/src/plugins/vis_type_vega/ @elastic/kibana-app
25+
/src/plugins/vis_type_vislib/ @elastic/kibana-app
26+
/src/plugins/vis_type_xy/ @elastic/kibana-app
27+
/src/plugins/visualize/ @elastic/kibana-app
2628

2729
# Core UI
2830
# Exclude tutorials folder for now because they are not owned by Kibana app and most will move out soon

.i18nrc.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"data": "src/plugins/data",
99
"embeddableApi": "src/plugins/embeddable",
1010
"embeddableExamples": "examples/embeddable_examples",
11+
"uiActionsExamples": "examples/ui_action_examples",
1112
"share": "src/plugins/share",
1213
"home": "src/plugins/home",
1314
"charts": "src/plugins/charts",

0 commit comments

Comments
 (0)