forked from elastic/kibana
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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) ...
- Loading branch information
Showing
786 changed files
with
16,358 additions
and
6,370 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
#!/usr/bin/env bash | ||
|
||
set -euo pipefail | ||
|
||
source "$(dirname "${0}")/../util.sh" | ||
|
||
# Runs pre-commit hook script for the files touched in the last commit. | ||
# That way we can ensure a set of quick commit checks earlier as we removed | ||
# the pre-commit hook installation by default. | ||
# If files are more than 200 we will skip it and just use | ||
# the further ci steps that already check linting and file casing for the entire repo. | ||
checks-reporter-with-killswitch "Quick commit checks" \ | ||
"$(dirname "${0}")/commit_check_runner.sh" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
#!/usr/bin/env bash | ||
|
||
echo "!!!!!!!! ATTENTION !!!!!!!! | ||
That check is intended to provide earlier CI feedback after we remove the automatic install for the local pre-commit hook. | ||
If you want, you can still manually install the pre-commit hook locally by running 'node scripts/register_git_hook locally' | ||
!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
" | ||
|
||
node scripts/precommit_hook.js --ref HEAD~1..HEAD --max-files 200 --verbose |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
#!/usr/bin/env bash | ||
|
||
set -euo pipefail | ||
|
||
source "$(dirname "${0}")/../util.sh" | ||
|
||
checks-reporter-with-killswitch "Check Jest Configs" \ | ||
node scripts/check_jest_configs |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
#!/usr/bin/env bash | ||
|
||
set -euo pipefail | ||
|
||
source "$(dirname "${0}")/../util.sh" | ||
|
||
checks-reporter-with-killswitch "Check Plugins With Circular Dependencies" \ | ||
node scripts/find_plugins_with_circular_deps |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
14.15.2 | ||
14.15.3 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
14.15.2 | ||
14.15.3 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
import co.elastic.teamcity.common.GoogleCloudAgent | ||
import co.elastic.teamcity.common.GoogleCloudAgentDiskType | ||
import co.elastic.teamcity.common.GoogleCloudProfile | ||
|
||
private val sizes = listOf("2", "4", "8", "16") | ||
|
||
val StandardAgents = sizes.map { size -> size to GoogleCloudAgent { | ||
sourceImageFamily = "elastic-kibana-ci-ubuntu-1804-lts" | ||
agentPrefix = "kibana-standard-$size-" | ||
machineType = "n2-standard-$size" | ||
diskSizeGb = 75 | ||
diskType = GoogleCloudAgentDiskType.SSD | ||
} }.toMap() | ||
|
||
val BuildAgent = GoogleCloudAgent { | ||
sourceImageFamily = "elastic-kibana-ci-ubuntu-1804-lts" | ||
agentPrefix = "kibana-c2-16-" | ||
machineType = "c2-standard-16" | ||
diskSizeGb = 250 | ||
diskType = GoogleCloudAgentDiskType.SSD | ||
} | ||
|
||
val CloudProfile = GoogleCloudProfile { | ||
accessKeyId = "447fdd4d-7129-46b7-9822-2e57658c7422" | ||
|
||
agents(StandardAgents) | ||
agent(BuildAgent) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 2 additions & 6 deletions
8
...y/src/builds/test/ApiServerIntegration.kt → ...src/builds/oss/OssApiServerIntegration.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,13 @@ | ||
package builds.test | ||
package builds.oss | ||
|
||
import addTestSettings | ||
import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType | ||
import runbld | ||
|
||
object ApiServerIntegration : BuildType({ | ||
object OssApiServerIntegration : OssFunctionalBase({ | ||
name = "API/Server Integration" | ||
description = "Executes API and Server Integration Tests" | ||
|
||
steps { | ||
runbld("API Integration", "./.ci/teamcity/oss/api_integration.sh") | ||
runbld("Server Integration", "./.ci/teamcity/oss/server_integration.sh") | ||
} | ||
|
||
addTestSettings() | ||
}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.