Skip to content

Commit 9550b1e

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into search_profiler
2 parents f575404 + e5abec1 commit 9550b1e

13,968 files changed

Lines changed: 411827 additions & 330793 deletions

File tree

Some content is hidden

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

‎.backportrc.json‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,31 @@
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.8",
7+
"7.7",
8+
"7.6",
9+
"7.5",
10+
"7.4",
11+
"7.3",
12+
"7.2",
13+
"7.1",
14+
"7.0",
15+
"6.8",
16+
"6.7",
17+
"6.6",
18+
"6.5",
19+
"6.4",
20+
"6.3",
21+
"6.2",
22+
"6.1",
23+
"6.0",
24+
"5.6"
25+
],
26+
"targetPRLabels": ["backport"],
27+
"branchLabelMapping": {
28+
"^v7.8.0$": "7.x",
29+
"^v(\\d+).(\\d+).\\d+$": "$1.$2"
30+
}
531
}

‎.ci/Jenkinsfile_coverage‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
library 'kibana-pipeline-library'
44
kibanaLibrary.load() // load from the Jenkins instance
55

6-
kibanaPipeline(timeoutMinutes: 180) {
6+
kibanaPipeline(timeoutMinutes: 240) {
77
catchErrors {
88
withEnv([
99
'CODE_COVERAGE=1', // Needed for multiple ci scripts, such as remote.ts, test/scripts/*.sh, schema.js, etc.

‎.ci/end2end.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pipeline {
1313
BASE_DIR = 'src/github.com/elastic/kibana'
1414
HOME = "${env.WORKSPACE}"
1515
APM_ITS = 'apm-integration-testing'
16-
CYPRESS_DIR = 'x-pack/legacy/plugins/apm/e2e'
16+
CYPRESS_DIR = 'x-pack/plugins/apm/e2e'
1717
PIPELINE_LOG_LEVEL = 'DEBUG'
1818
}
1919
options {
@@ -39,7 +39,7 @@ pipeline {
3939
shallow: false, reference: "/var/lib/jenkins/.git-references/kibana.git")
4040
script {
4141
dir("${BASE_DIR}"){
42-
def regexps =[ "^x-pack/legacy/plugins/apm/.*" ]
42+
def regexps =[ "^x-pack/plugins/apm/.*" ]
4343
env.APM_UPDATED = isGitRegionMatch(patterns: regexps)
4444
}
4545
}

‎.ci/es-snapshots/Jenkinsfile_verify_es‎

Lines changed: 40 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -19,42 +19,48 @@ currentBuild.description = "ES: ${SNAPSHOT_VERSION}<br />Kibana: ${params.branch
1919

2020
def SNAPSHOT_MANIFEST = "https://storage.googleapis.com/kibana-ci-es-snapshots-daily/${SNAPSHOT_VERSION}/archives/${SNAPSHOT_ID}/manifest.json"
2121

22-
kibanaPipeline(timeoutMinutes: 120) {
22+
kibanaPipeline(timeoutMinutes: 150) {
2323
catchErrors {
24-
withEnv(["ES_SNAPSHOT_MANIFEST=${SNAPSHOT_MANIFEST}"]) {
25-
parallel([
26-
'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'),
27-
'x-pack-intake-agent': workers.intake('x-pack-intake', './test/scripts/jenkins_xpack.sh'),
28-
'kibana-oss-agent': workers.functional('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
29-
'oss-ciGroup1': kibanaPipeline.ossCiGroupProcess(1),
30-
'oss-ciGroup2': kibanaPipeline.ossCiGroupProcess(2),
31-
'oss-ciGroup3': kibanaPipeline.ossCiGroupProcess(3),
32-
'oss-ciGroup4': kibanaPipeline.ossCiGroupProcess(4),
33-
'oss-ciGroup5': kibanaPipeline.ossCiGroupProcess(5),
34-
'oss-ciGroup6': kibanaPipeline.ossCiGroupProcess(6),
35-
'oss-ciGroup7': kibanaPipeline.ossCiGroupProcess(7),
36-
'oss-ciGroup8': kibanaPipeline.ossCiGroupProcess(8),
37-
'oss-ciGroup9': kibanaPipeline.ossCiGroupProcess(9),
38-
'oss-ciGroup10': kibanaPipeline.ossCiGroupProcess(10),
39-
'oss-ciGroup11': kibanaPipeline.ossCiGroupProcess(11),
40-
'oss-ciGroup12': kibanaPipeline.ossCiGroupProcess(12),
41-
]),
42-
'kibana-xpack-agent': workers.functional('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
43-
'xpack-ciGroup1': kibanaPipeline.xpackCiGroupProcess(1),
44-
'xpack-ciGroup2': kibanaPipeline.xpackCiGroupProcess(2),
45-
'xpack-ciGroup3': kibanaPipeline.xpackCiGroupProcess(3),
46-
'xpack-ciGroup4': kibanaPipeline.xpackCiGroupProcess(4),
47-
'xpack-ciGroup5': kibanaPipeline.xpackCiGroupProcess(5),
48-
'xpack-ciGroup6': kibanaPipeline.xpackCiGroupProcess(6),
49-
'xpack-ciGroup7': kibanaPipeline.xpackCiGroupProcess(7),
50-
'xpack-ciGroup8': kibanaPipeline.xpackCiGroupProcess(8),
51-
'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
52-
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
53-
]),
54-
])
55-
}
24+
slackNotifications.onFailure(
25+
title: ":broken_heart: *<${env.BUILD_URL}|[${SNAPSHOT_VERSION}] ES Snapshot Verification Failure>*",
26+
message: ":broken_heart: [${SNAPSHOT_VERSION}] ES Snapshot Verification Failure",
27+
) {
28+
retryable.enable(2)
29+
withEnv(["ES_SNAPSHOT_MANIFEST=${SNAPSHOT_MANIFEST}"]) {
30+
parallel([
31+
'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'),
32+
'x-pack-intake-agent': workers.intake('x-pack-intake', './test/scripts/jenkins_xpack.sh'),
33+
'kibana-oss-agent': workers.functional('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
34+
'oss-ciGroup1': kibanaPipeline.ossCiGroupProcess(1),
35+
'oss-ciGroup2': kibanaPipeline.ossCiGroupProcess(2),
36+
'oss-ciGroup3': kibanaPipeline.ossCiGroupProcess(3),
37+
'oss-ciGroup4': kibanaPipeline.ossCiGroupProcess(4),
38+
'oss-ciGroup5': kibanaPipeline.ossCiGroupProcess(5),
39+
'oss-ciGroup6': kibanaPipeline.ossCiGroupProcess(6),
40+
'oss-ciGroup7': kibanaPipeline.ossCiGroupProcess(7),
41+
'oss-ciGroup8': kibanaPipeline.ossCiGroupProcess(8),
42+
'oss-ciGroup9': kibanaPipeline.ossCiGroupProcess(9),
43+
'oss-ciGroup10': kibanaPipeline.ossCiGroupProcess(10),
44+
'oss-ciGroup11': kibanaPipeline.ossCiGroupProcess(11),
45+
'oss-ciGroup12': kibanaPipeline.ossCiGroupProcess(12),
46+
]),
47+
'kibana-xpack-agent': workers.functional('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
48+
'xpack-ciGroup1': kibanaPipeline.xpackCiGroupProcess(1),
49+
'xpack-ciGroup2': kibanaPipeline.xpackCiGroupProcess(2),
50+
'xpack-ciGroup3': kibanaPipeline.xpackCiGroupProcess(3),
51+
'xpack-ciGroup4': kibanaPipeline.xpackCiGroupProcess(4),
52+
'xpack-ciGroup5': kibanaPipeline.xpackCiGroupProcess(5),
53+
'xpack-ciGroup6': kibanaPipeline.xpackCiGroupProcess(6),
54+
'xpack-ciGroup7': kibanaPipeline.xpackCiGroupProcess(7),
55+
'xpack-ciGroup8': kibanaPipeline.xpackCiGroupProcess(8),
56+
'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
57+
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
58+
]),
59+
])
60+
}
5661

57-
promoteSnapshot(SNAPSHOT_VERSION, SNAPSHOT_ID)
62+
promoteSnapshot(SNAPSHOT_VERSION, SNAPSHOT_ID)
63+
}
5864
}
5965

6066
kibanaPipeline.sendMail()

‎.eslintignore‎

Lines changed: 38 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,49 @@
1-
node_modules
2-
bower_components
3-
/data
4-
/optimize
5-
/build
6-
/target
1+
**/*.js.snap
2+
**/graphql/types.ts
73
/.es
8-
/plugins
4+
/build
95
/built_assets
6+
/data
107
/html_docs
11-
/src/plugins/data/common/es_query/kuery/ast/_generated_/**
12-
/src/legacy/core_plugins/vis_type_timelion/public/_generated_/**
13-
src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data
14-
/src/legacy/ui/public/flot-charts
8+
/optimize
9+
/plugins
1510
/test/fixtures/scenarios
16-
/src/legacy/core_plugins/console/public/webpackShims
11+
/x-pack/build
12+
node_modules
13+
target
14+
15+
!/.eslintrc.js
16+
17+
# plugin overrides
18+
/src/core/lib/kbn_internal_native_observable
1719
/src/legacy/core_plugins/console/public/tests/webpackShims
20+
/src/legacy/core_plugins/console/public/webpackShims
21+
/src/legacy/plugin_discovery/plugin_pack/__tests__/fixtures/plugins/broken
22+
/src/legacy/ui/public/flot-charts
1823
/src/legacy/ui/public/utils/decode_geo_hash.js
19-
/src/legacy/core_plugins/vis_type_timelion/public/webpackShims/jquery.flot.*
20-
/src/core/lib/kbn_internal_native_observable
21-
/packages/*/target
24+
/src/plugins/data/common/es_query/kuery/ast/_generated_/**
25+
/src/plugins/vis_type_timelion/public/_generated_/**
26+
/src/plugins/vis_type_timelion/public/webpackShims/jquery.flot.*
27+
/x-pack/legacy/plugins/**/__tests__/fixtures/**
28+
/x-pack/plugins/apm/e2e/cypress/**/snapshots.js
29+
/x-pack/plugins/canvas/canvas_plugin
30+
/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts
31+
/x-pack/plugins/canvas/shareable_runtime/build
32+
/x-pack/plugins/canvas/storybook
33+
/x-pack/plugins/monitoring/public/lib/jquery_flot
34+
/x-pack/legacy/plugins/infra/common/graphql/types.ts
35+
/x-pack/legacy/plugins/infra/public/graphql/types.ts
36+
/x-pack/legacy/plugins/infra/server/graphql/types.ts
37+
/x-pack/legacy/plugins/maps/public/vendor/**
38+
39+
# package overrides
2240
/packages/eslint-config-kibana
23-
/packages/kbn-pm/dist
41+
/packages/kbn-interpreter/src/common/lib/grammar.js
2442
/packages/kbn-plugin-generator/sao_template/template
43+
/packages/kbn-pm/dist
44+
/packages/kbn-test/src/functional_test_runner/__tests__/fixtures/
45+
/packages/kbn-test/src/functional_test_runner/lib/config/__tests__/fixtures/
2546
/packages/kbn-ui-framework/dist
2647
/packages/kbn-ui-framework/doc_site/build
2748
/packages/kbn-ui-framework/generator-kui/*/templates/
28-
/packages/kbn-test/src/functional_test_runner/__tests__/fixtures/
29-
/packages/kbn-test/src/functional_test_runner/lib/config/__tests__/fixtures/
30-
/x-pack/legacy/plugins/maps/public/vendor/**
31-
/x-pack/coverage
32-
/x-pack/build
33-
/x-pack/legacy/plugins/**/__tests__/fixtures/**
34-
/packages/kbn-interpreter/src/common/lib/grammar.js
35-
/x-pack/legacy/plugins/canvas/canvas_plugin
36-
/x-pack/legacy/plugins/canvas/shareable_runtime/build
37-
/x-pack/legacy/plugins/canvas/storybook
38-
/x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts
39-
/x-pack/legacy/plugins/infra/common/graphql/types.ts
40-
/x-pack/legacy/plugins/infra/public/graphql/types.ts
41-
/x-pack/legacy/plugins/infra/server/graphql/types.ts
42-
/x-pack/legacy/plugins/apm/e2e/cypress/**/snapshots.js
43-
/src/legacy/plugin_discovery/plugin_pack/__tests__/fixtures/plugins/broken
44-
**/graphql/types.ts
45-
**/*.js.snap
46-
!/.eslintrc.js
49+

0 commit comments

Comments
 (0)