Skip to content

Commit 561ebb1

Browse files
committed
Merge branch 'master' into alerts/remove-generics-defaults-redux
* master: (48 commits) Fix request with disabled aggregation (elastic#85696) [Security Solution][Detections][Threshold Rules] Threshold Rule Bug Fixes (elastic#84918) Removed a possibility to define two different names for Alert types on API and UI level. (elastic#86236) Bump Node.js from version 14.15.2 to 14.15.3 (elastic#86593) [index patterns] Fleep app - Keep saved object field list until field caps provides fields (elastic#85370) [Security Solutions] fix timeline tabs + layout (elastic#86581) Upgrade to hapi version 20 (elastic#85406) App Services: Remove remaining uiActions, expressions, data, embeddable circular dependencies. (elastic#82791) Rename chartLibrary setting to legacyChartsLibrary (elastic#86529) [CI] TeamCity updates (elastic#85843) [Maps] Use Json for mvt-tests (elastic#86492) [Rollup Jobs] Added autofocus to cron editor (elastic#86324) [Monitoring][Alerting] CCR read exceptions alert (elastic#85908) [CI] Bump memory for main CI workers (elastic#86541) Explicitly set Elasticsearch heap size during CI and local development (elastic#86513) [App Search] Updates to results on the documents view (elastic#86181) [Discover] Change default sort handling (elastic#85561) [App Search] Convert DocumentCreationModal to DocumentCreationFlyout (elastic#86508) [App Search] Sample Engines should have access to the Crawler (elastic#86502) Fixed duplication of create new modal (elastic#86489) ...
2 parents bfcab2a + f67f1ec commit 561ebb1

File tree

786 files changed

+16358
-6370
lines changed

Some content is hidden

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

786 files changed

+16358
-6370
lines changed

.ci/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
22
# If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
33

4-
ARG NODE_VERSION=14.15.2
4+
ARG NODE_VERSION=14.15.3
55

66
FROM node:${NODE_VERSION} AS base
77

.ci/teamcity/bootstrap.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ source "$(dirname "${0}")/util.sh"
77
tc_start_block "Bootstrap"
88

99
tc_start_block "yarn install and kbn bootstrap"
10-
verify_no_git_changes yarn kbn bootstrap --prefer-offline
10+
verify_no_git_changes yarn kbn bootstrap
1111
tc_end_block "yarn install and kbn bootstrap"
1212

1313
tc_start_block "build kbn-pm"

.ci/teamcity/checks/bundle_limits.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ set -euo pipefail
44

55
source "$(dirname "${0}")/../util.sh"
66

7-
node scripts/build_kibana_platform_plugins --validate-limits
7+
checks-reporter-with-killswitch "Check Bundle Limits" \
8+
node scripts/build_kibana_platform_plugins --validate-limits

.ci/teamcity/checks/commit.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/usr/bin/env bash
2+
3+
set -euo pipefail
4+
5+
source "$(dirname "${0}")/../util.sh"
6+
7+
# Runs pre-commit hook script for the files touched in the last commit.
8+
# That way we can ensure a set of quick commit checks earlier as we removed
9+
# the pre-commit hook installation by default.
10+
# If files are more than 200 we will skip it and just use
11+
# the further ci steps that already check linting and file casing for the entire repo.
12+
checks-reporter-with-killswitch "Quick commit checks" \
13+
"$(dirname "${0}")/commit_check_runner.sh"
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/usr/bin/env bash
2+
3+
echo "!!!!!!!! ATTENTION !!!!!!!!
4+
That check is intended to provide earlier CI feedback after we remove the automatic install for the local pre-commit hook.
5+
If you want, you can still manually install the pre-commit hook locally by running 'node scripts/register_git_hook locally'
6+
!!!!!!!!!!!!!!!!!!!!!!!!!!!
7+
"
8+
9+
node scripts/precommit_hook.js --ref HEAD~1..HEAD --max-files 200 --verbose
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/usr/bin/env bash
2+
3+
set -euo pipefail
4+
5+
source "$(dirname "${0}")/../util.sh"
6+
7+
checks-reporter-with-killswitch "Check Jest Configs" \
8+
node scripts/check_jest_configs
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/usr/bin/env bash
2+
3+
set -euo pipefail
4+
5+
source "$(dirname "${0}")/../util.sh"
6+
7+
checks-reporter-with-killswitch "Check Plugins With Circular Dependencies" \
8+
node scripts/find_plugins_with_circular_deps

.ci/teamcity/oss/plugin_functional.sh

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,21 @@ if [[ ! -d "target" ]]; then
1313
fi
1414
cd -
1515

16-
./test/scripts/test/plugin_functional.sh
17-
./test/scripts/test/example_functional.sh
18-
./test/scripts/test/interpreter_functional.sh
16+
checks-reporter-with-killswitch "Plugin Functional Tests" \
17+
node scripts/functional_tests \
18+
--config test/plugin_functional/config.ts \
19+
--bail \
20+
--debug
21+
22+
checks-reporter-with-killswitch "Example Functional Tests" \
23+
node scripts/functional_tests \
24+
--config test/examples/config.js \
25+
--bail \
26+
--debug
27+
28+
checks-reporter-with-killswitch "Interpreter Functional Tests" \
29+
node scripts/functional_tests \
30+
--config test/interpreter_functional/config.ts \
31+
--bail \
32+
--debug \
33+
--kibana-install-dir "$KIBANA_INSTALL_DIR"

.ci/teamcity/setup_env.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,14 @@ tc_set_env FORCE_COLOR 1
2525
tc_set_env TEST_BROWSER_HEADLESS 1
2626

2727
tc_set_env ELASTIC_APM_ENVIRONMENT ci
28+
tc_set_env ELASTIC_APM_TRANSACTION_SAMPLE_RATE 0.1
2829

2930
if [[ "${KIBANA_CI_REPORTER_KEY_BASE64-}" ]]; then
3031
tc_set_env KIBANA_CI_REPORTER_KEY "$(echo "$KIBANA_CI_REPORTER_KEY_BASE64" | base64 -d)"
3132
fi
3233

3334
if is_pr; then
35+
tc_set_env ELASTIC_APM_ACTIVE false
3436
tc_set_env CHECKS_REPORTER_ACTIVE true
3537

3638
# These can be removed once we're not supporting Jenkins and TeamCity at the same time
@@ -39,6 +41,7 @@ if is_pr; then
3941
tc_set_env ghprbActualCommit "$GITHUB_PR_TRIGGERED_SHA"
4042
tc_set_env BUILD_URL "$TEAMCITY_BUILD_URL"
4143
else
44+
tc_set_env ELASTIC_APM_ACTIVE true
4245
tc_set_env CHECKS_REPORTER_ACTIVE false
4346
fi
4447

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.15.2
1+
14.15.3

0 commit comments

Comments
 (0)