Skip to content

Commit 4ff5799

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into 64755-expand-anomalies-page-to-add-categories
2 parents 0686810 + 005128c commit 4ff5799

2,618 files changed

Lines changed: 108378 additions & 35540 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.

‎.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/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: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,11 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
201201
# Design
202202
**/*.scss @elastic/kibana-design
203203

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+
204209
# Elasticsearch UI
205210
/src/plugins/dev_tools/ @elastic/es-ui
206211
/src/plugins/console/ @elastic/es-ui

‎.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

‎docs/apm/api.asciidoc‎

Lines changed: 1 addition & 1 deletion

docs/images/canvas-add-image.gif renamed to docs/canvas/images/canvas-add-image.gif

File renamed without changes.

docs/images/canvas-add-pages.gif renamed to docs/canvas/images/canvas-add-pages.gif

File renamed without changes.

docs/images/canvas-autoplay-interval.png renamed to docs/canvas/images/canvas-autoplay-interval.png

File renamed without changes.

0 commit comments

Comments
 (0)