Skip to content

Commit 16a10b7

Browse files
Merge branch 'master' into eui_palette_picker
2 parents c01799e + e1253ed commit 16a10b7

File tree

3,834 files changed

+145034
-47832
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,834 files changed

+145034
-47832
lines changed

.ci/Jenkinsfile_visual_baseline

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,6 @@ kibanaPipeline(timeoutMinutes: 120) {
2121
}
2222

2323
kibanaPipeline.sendMail()
24+
slackNotifications.onFailure()
2425
}
2526
}

.ci/end2end.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ pipeline {
1414
HOME = "${env.WORKSPACE}"
1515
E2E_DIR = 'x-pack/plugins/apm/e2e'
1616
PIPELINE_LOG_LEVEL = 'DEBUG'
17+
KBN_OPTIMIZER_THEMES = 'v7light'
1718
}
1819
options {
1920
timeout(time: 1, unit: 'HOURS')

.ci/es-snapshots/Jenkinsfile_build_es

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def PROMOTE_WITHOUT_VERIFY = !!params.PROMOTE_WITHOUT_VERIFICATION
2525
timeout(time: 120, unit: 'MINUTES') {
2626
timestamps {
2727
ansiColor('xterm') {
28-
node(workers.label('s')) {
28+
node(workers.label('l')) {
2929
catchErrors {
3030
def VERSION
3131
def SNAPSHOT_ID
@@ -154,9 +154,10 @@ def buildArchives(destination) {
154154
"NODE_NAME=",
155155
]) {
156156
sh """
157-
./gradlew -p distribution/archives assemble --parallel
157+
./gradlew -Dbuild.docker=true assemble --parallel
158158
mkdir -p ${destination}
159-
find distribution/archives -type f \\( -name 'elasticsearch-*-*-*-*.tar.gz' -o -name 'elasticsearch-*-*-*-*.zip' \\) -not -path *no-jdk* -exec cp {} ${destination} \\;
159+
find distribution -type f \\( -name 'elasticsearch-*-*-*-*.tar.gz' -o -name 'elasticsearch-*-*-*-*.zip' \\) -not -path *no-jdk* -not -path *build-context* -exec cp {} ${destination} \\;
160+
docker images "docker.elastic.co/elasticsearch/elasticsearch" --format "{{.Tag}}" | xargs -n1 bash -c 'docker save docker.elastic.co/elasticsearch/elasticsearch:\${0} | gzip > ${destination}/elasticsearch-\${0}-docker-image.tar.gz'
160161
"""
161162
}
162163
}

.ci/packer_cache_for_branch.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ echo "Creating bootstrap_cache archive"
4646
# archive cacheable directories
4747
mkdir -p "$HOME/.kibana/bootstrap_cache"
4848
tar -cf "$HOME/.kibana/bootstrap_cache/$branch.tar" \
49-
x-pack/plugins/reporting/.chromium \
49+
.chromium \
5050
.es \
5151
.chromedriver \
5252
.geckodriver;

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
**/*.js.snap
22
**/graphql/types.ts
33
/.es
4+
/.chromium
45
/build
56
/built_assets
67
/config/apm.dev.js

.eslintrc.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -906,6 +906,18 @@ module.exports = {
906906
},
907907
},
908908

909+
/**
910+
* Enterprise Search overrides
911+
*/
912+
{
913+
files: ['x-pack/plugins/enterprise_search/**/*.{ts,tsx}'],
914+
excludedFiles: ['x-pack/plugins/enterprise_search/**/*.{test,mock}.{ts,tsx}'],
915+
rules: {
916+
'react-hooks/exhaustive-deps': 'off',
917+
'@typescript-eslint/no-explicit-any': 'error',
918+
},
919+
},
920+
909921
/**
910922
* disable jsx-a11y for kbn-ui-framework
911923
*/

.github/CODEOWNERS

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@
144144
/x-pack/plugins/licensing/ @elastic/kibana-platform
145145
/x-pack/plugins/global_search/ @elastic/kibana-platform
146146
/x-pack/plugins/cloud/ @elastic/kibana-platform
147+
/x-pack/test/saved_objects_field_count/ @elastic/kibana-platform
147148
/packages/kbn-config-schema/ @elastic/kibana-platform
148149
/src/legacy/server/config/ @elastic/kibana-platform
149150
/src/legacy/server/http/ @elastic/kibana-platform
@@ -200,6 +201,11 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
200201
# Design
201202
**/*.scss @elastic/kibana-design
202203

204+
# Enterprise Search
205+
/x-pack/plugins/enterprise_search/ @elastic/app-search-frontend @elastic/workplace-search-frontend
206+
/x-pack/test/functional_enterprise_search/ @elastic/app-search-frontend @elastic/workplace-search-frontend
207+
/x-pack/plugins/enterprise_search/**/*.scss @elastic/ent-search-design
208+
203209
# Elasticsearch UI
204210
/src/plugins/dev_tools/ @elastic/es-ui
205211
/src/plugins/console/ @elastic/es-ui

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
.signing-config.json
33
.ackrc
44
/.es
5+
/.chromium
56
.DS_Store
67
.node_binaries
78
.native_modules

CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions

0 commit comments

Comments
 (0)