Merge branch 'master' of github.com:elastic/kibana into service-overv…

…iew-dependencies-table
elastic · Dec 9, 2020 · e24e3f3 · e24e3f3
2 parents 70b6b72 + 2355dde
commit e24e3f3
Show file tree

Hide file tree

Showing 471 changed files with 27,549 additions and 8,602 deletions.
diff --git a/.ci/teamcity/checks/doc_api_changes.sh b/.ci/teamcity/checks/doc_api_changes.sh
@@ -4,4 +4,5 @@ set -euo pipefail
 
 source "$(dirname "${0}")/../util.sh"
 
-yarn run grunt run:checkDocApiChanges
+checks-reporter-with-killswitch "Check Doc API Changes" \
+  node scripts/check_published_api_changes
diff --git a/.ci/teamcity/checks/eslint.sh b/.ci/teamcity/checks/eslint.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+source "$(dirname "${0}")/../util.sh"
+
+checks-reporter-with-killswitch "Lint: eslint" \
+  node scripts/eslint --no-cache
diff --git a/.ci/teamcity/checks/file_casing.sh b/.ci/teamcity/checks/file_casing.sh
@@ -4,4 +4,5 @@ set -euo pipefail
 
 source "$(dirname "${0}")/../util.sh"
 
-yarn run grunt run:checkFileCasing
+checks-reporter-with-killswitch "Check File Casing" \
+  node scripts/check_file_casing --quiet
diff --git a/.ci/teamcity/checks/i18n.sh b/.ci/teamcity/checks/i18n.sh
@@ -4,4 +4,5 @@ set -euo pipefail
 
 source "$(dirname "${0}")/../util.sh"
 
-yarn run grunt run:i18nCheck
+checks-reporter-with-killswitch "Check i18n" \
+  node scripts/i18n_check --ignore-missing
diff --git a/.ci/teamcity/checks/licenses.sh b/.ci/teamcity/checks/licenses.sh
@@ -4,4 +4,5 @@ set -euo pipefail
 
 source "$(dirname "${0}")/../util.sh"
 
-yarn run grunt run:licenses
+checks-reporter-with-killswitch "Check Licenses" \
+  node scripts/check_licenses --dev
diff --git a/...city/checks/verify_dependency_versions.sh → .ci/teamcity/checks/sasslint.sh b/...city/checks/verify_dependency_versions.sh → .ci/teamcity/checks/sasslint.sh
@@ -4,4 +4,5 @@ set -euo pipefail
 
 source "$(dirname "${0}")/../util.sh"
 
-yarn run grunt run:verifyDependencyVersions
+checks-reporter-with-killswitch "Lint: sasslint" \
+  node scripts/sasslint
diff --git a/.ci/teamcity/checks/telemetry.sh b/.ci/teamcity/checks/telemetry.sh
@@ -4,4 +4,5 @@ set -euo pipefail
 
 source "$(dirname "${0}")/../util.sh"
 
-yarn run grunt run:telemetryCheck
+checks-reporter-with-killswitch "Check Telemetry Schema" \
+  node scripts/telemetry_check
diff --git a/.ci/teamcity/checks/test_hardening.sh b/.ci/teamcity/checks/test_hardening.sh
@@ -4,4 +4,5 @@ set -euo pipefail
 
 source "$(dirname "${0}")/../util.sh"
 
-yarn run grunt run:test_hardening
+checks-reporter-with-killswitch "Test Hardening" \
+  node scripts/test_hardening
diff --git a/.ci/teamcity/checks/ts_projects.sh b/.ci/teamcity/checks/ts_projects.sh
@@ -4,4 +4,5 @@ set -euo pipefail
 
 source "$(dirname "${0}")/../util.sh"
 
-yarn run grunt run:checkTsProjects
+checks-reporter-with-killswitch "Check TypeScript Projects" \
+  node scripts/check_ts_projects
diff --git a/.ci/teamcity/checks/type_check.sh b/.ci/teamcity/checks/type_check.sh
@@ -4,4 +4,5 @@ set -euo pipefail
 
 source "$(dirname "${0}")/../util.sh"
 
-yarn run grunt run:typeCheck
+checks-reporter-with-killswitch "Check Types" \
+  node scripts/type_check
diff --git a/.ci/teamcity/checks/verify_notice.sh b/.ci/teamcity/checks/verify_notice.sh
@@ -4,4 +4,5 @@ set -euo pipefail
 
 source "$(dirname "${0}")/../util.sh"
 
-yarn run grunt run:verifyNotice
+checks-reporter-with-killswitch "Verify NOTICE" \
+  node scripts/notice --validate
diff --git a/.ci/teamcity/default/jest.sh b/.ci/teamcity/default/jest.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(dirname "${0}")/../util.sh"
+
+export JOB=kibana-default-jest
+
+cd "$XPACK_DIR"
+
+checks-reporter-with-killswitch "Jest Unit Tests" \
+  node scripts/jest --bail --debug
diff --git a/.ci/teamcity/oss/api_integration.sh b/.ci/teamcity/oss/api_integration.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(dirname "${0}")/../util.sh"
+
+export JOB=kibana-oss-api-integration
+
+checks-reporter-with-killswitch "API Integration Tests" \
+  node scripts/functional_tests --config test/api_integration/config.js --bail --debug
diff --git a/.ci/teamcity/oss/jest.sh b/.ci/teamcity/oss/jest.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(dirname "${0}")/../util.sh"
+
+export JOB=kibana-oss-jest
+
+checks-reporter-with-killswitch "OSS Jest Unit Tests" \
+  node scripts/jest --ci --verbose
diff --git a/.ci/teamcity/oss/jest_integration.sh b/.ci/teamcity/oss/jest_integration.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(dirname "${0}")/../util.sh"
+
+export JOB=kibana-oss-jest-integration
+
+checks-reporter-with-killswitch "OSS Jest Integration Tests" \
+  node scripts/jest_integration --verbose
diff --git a/.ci/teamcity/oss/plugin_functional.sh b/.ci/teamcity/oss/plugin_functional.sh
@@ -13,6 +13,6 @@ if [[ ! -d "target" ]]; then
 fi
 cd -
 
-yarn run grunt run:pluginFunctionalTestsRelease --from=source
-yarn run grunt run:exampleFunctionalTestsRelease --from=source
-yarn run grunt run:interpreterFunctionalTestsRelease
+./test/scripts/test/plugin_functional.sh
+./test/scripts/test/example_functional.sh
+./test/scripts/test/interpreter_functional.sh
diff --git a/.ci/teamcity/oss/server_integration.sh b/.ci/teamcity/oss/server_integration.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(dirname "${0}")/../util.sh"
+
+export JOB=kibana-oss-server-integration
+export KIBANA_INSTALL_DIR="$PARENT_DIR/build/kibana-build-oss"
+
+checks-reporter-with-killswitch "Server integration tests" \
+  node scripts/functional_tests \
+    --config test/server_integration/http/ssl/config.js \
+    --config test/server_integration/http/ssl_redirect/config.js \
+    --config test/server_integration/http/platform/config.ts \
+    --config test/server_integration/http/ssl_with_p12/config.js \
+    --config test/server_integration/http/ssl_with_p12_intermediate/config.js \
+    --bail \
+    --debug \
+    --kibana-install-dir $KIBANA_INSTALL_DIR
diff --git a/.ci/teamcity/tests/mocha.sh b/.ci/teamcity/tests/mocha.sh
@@ -4,4 +4,5 @@ set -euo pipefail
 
 source "$(dirname "${0}")/../util.sh"
 
-yarn run grunt run:mocha
+checks-reporter-with-killswitch "Mocha Tests" \
+  node scripts/mocha
diff --git a/.ci/teamcity/tests/test_hardening.sh b/.ci/teamcity/tests/test_hardening.sh
diff --git a/.ci/teamcity/tests/test_projects.sh b/.ci/teamcity/tests/test_projects.sh
@@ -4,4 +4,5 @@ set -euo pipefail
 
 source "$(dirname "${0}")/../util.sh"
 
-yarn run grunt run:test_projects
+checks-reporter-with-killswitch "Test Projects" \
+  yarn kbn run test --exclude kibana --oss --skip-kibana-plugins
diff --git a/.teamcity/src/builds/Lint.kt b/.teamcity/src/builds/Lint.kt
@@ -17,7 +17,7 @@ object Lint : BuildType({
       scriptContent =
         """
           #!/bin/bash
-          yarn run grunt run:sasslint
+          ./.ci/teamcity/checks/sasslint.sh
         """.trimIndent()
     }
 
@@ -26,7 +26,7 @@ object Lint : BuildType({
       scriptContent =
         """
           #!/bin/bash
-          yarn run grunt run:eslint
+          ./.ci/teamcity/checks/eslint.sh
         """.trimIndent()
     }
   }

diff --git a/.teamcity/src/builds/test/ApiServerIntegration.kt b/.teamcity/src/builds/test/ApiServerIntegration.kt
@@ -9,8 +9,8 @@ object ApiServerIntegration : BuildType({
   description = "Executes API and Server Integration Tests"
 
   steps {
-    runbld("API Integration", "yarn run grunt run:apiIntegrationTests")
-    runbld("Server Integration", "yarn run grunt run:serverIntegrationTests")
+    runbld("API Integration", "./.ci/teamcity/oss/api_integration.sh")
+    runbld("Server Integration", "./.ci/teamcity/oss/server_integration.sh")
   }
 
   addTestSettings()

diff --git a/.teamcity/src/builds/test/Jest.kt b/.teamcity/src/builds/test/Jest.kt
@@ -12,7 +12,7 @@ object Jest : BuildType({
   kibanaAgent(8)
 
   steps {
-    runbld("Jest Unit", "yarn run grunt run:test_jest")
+    runbld("Jest Unit", "./.ci/teamcity/oss/jest.sh")
   }
 
   addTestSettings()

diff --git a/.teamcity/src/builds/test/JestIntegration.kt b/.teamcity/src/builds/test/JestIntegration.kt
@@ -9,7 +9,7 @@ object JestIntegration : BuildType({
   description = "Executes Jest Integration Tests"
 
   steps {
-    runbld("Jest Integration", "yarn run grunt run:test_jest_integration")
+    runbld("Jest Integration", "./.ci/teamcity/oss/jest_integration.sh")
   }
 
   addTestSettings()

diff --git a/.teamcity/src/builds/test/QuickTests.kt b/.teamcity/src/builds/test/QuickTests.kt
@@ -12,7 +12,7 @@ object QuickTests : BuildType({
   kibanaAgent(2)
 
   val testScripts = mapOf(
-    "Test Hardening" to ".ci/teamcity/tests/test_hardening.sh",
+    "Test Hardening" to ".ci/teamcity/checkes/test_hardening.sh",
     "Test Projects" to ".ci/teamcity/tests/test_projects.sh",
     "Mocha Tests" to ".ci/teamcity/tests/mocha.sh"
   )

diff --git a/.teamcity/src/builds/test/XPackJest.kt b/.teamcity/src/builds/test/XPackJest.kt
@@ -12,10 +12,7 @@ object XPackJest : BuildType({
   kibanaAgent(16)
 
   steps {
-      runbld("X-Pack Jest Unit", """
-        cd x-pack
-        node --max-old-space-size=6144 scripts/jest --ci --verbose --maxWorkers=6
-      """.trimIndent())
+    runbld("X-Pack Jest Unit", "./.ci/teamcity/default/jest.sh")
   }
 
   addTestSettings()

diff --git a/package.json b/package.json
@@ -47,7 +47,6 @@
     "test:jest": "node scripts/jest",
     "test:jest_integration": "node scripts/jest_integration",
     "test:mocha": "node scripts/mocha",
-    "test:mocha:coverage": "grunt test:mochaCoverage",
     "test:ftr": "node scripts/functional_tests",
     "test:ftr:server": "node scripts/functional_tests_server",
     "test:ftr:runner": "node scripts/functional_test_runner",
@@ -85,6 +84,7 @@
     "**/@types/hapi__hapi": "^18.2.6",
     "**/@types/hapi__mimos": "4.1.0",
     "**/@types/node": "14.14.7",
+    "**/chokidar": "^3.4.3",
     "**/cross-fetch/node-fetch": "^2.6.1",
     "**/deepmerge": "^4.2.2",
     "**/fast-deep-equal": "^3.1.1",
@@ -175,7 +175,7 @@
     "chalk": "^4.1.0",
     "check-disk-space": "^2.1.0",
     "cheerio": "0.22.0",
-    "chokidar": "^3.4.2",
+    "chokidar": "^3.4.3",
     "chroma-js": "^1.4.1",
     "classnames": "2.2.6",
     "color": "1.0.3",
@@ -674,7 +674,6 @@
     "grunt-contrib-copy": "^1.0.0",
     "grunt-contrib-watch": "^1.1.0",
     "grunt-peg": "^2.0.1",
-    "grunt-run": "0.8.1",
     "gulp": "4.0.2",
     "gulp-babel": "^8.0.0",
     "gulp-sourcemaps": "2.6.5",