Merge branch 'master' into feature_directory

.ci/Dockerfile

@@ -1,7 +1,7 @@
 # NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
 # If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
 
-ARG NODE_VERSION=12.19.1
+ARG NODE_VERSION=14.15.1
 
 FROM node:${NODE_VERSION} AS base
 

.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

.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

.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

.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

.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

.ci/teamcity/checks/sasslint.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+source "$(dirname "${0}")/../util.sh"
+
+checks-reporter-with-killswitch "Lint: sasslint" \
+  node scripts/sasslint

.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

.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

.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

.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

.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

.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

.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

.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

.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

.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

.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

.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

.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

.eslintignore

@@ -44,3 +44,4 @@ snapshots.js
 /packages/kbn-ui-framework/doc_site/build
 /packages/kbn-ui-framework/generator-kui/*/templates/
 /packages/kbn-ui-shared-deps/flot_charts
+/packages/kbn-monaco/src/painless/antlr

.github/CODEOWNERS

@@ -187,6 +187,9 @@
 /x-pack/test/saved_object_tagging/ @elastic/kibana-core
 /packages/kbn-config-schema/ @elastic/kibana-core
 /packages/kbn-std/ @elastic/kibana-core
+/packages/kbn-config/ @elastic/kibana-core
+/packages/kbn-logging/ @elastic/kibana-core
+/packages/kbn-legacy-logging/ @elastic/kibana-core
 /src/legacy/server/config/ @elastic/kibana-core
 /src/legacy/server/http/ @elastic/kibana-core
 /src/legacy/server/logging/ @elastic/kibana-core
@@ -259,8 +262,31 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
 
 # Enterprise Search
 # Shared
-/x-pack/plugins/enterprise_search/ @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/* @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/common/ @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/public/* @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/public/applications/* @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/public/applications/enterprise_search/ @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/public/applications/shared/ @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/public/applications/__mocks__/ @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/server/* @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/server/lib/ @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/server/__mocks__/ @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/server/collectors/enterprise_search/ @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/server/collectors/lib/ @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/server/routes/enterprise_search/ @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/server/saved_objects/enterprise_search/ @elastic/enterprise-search-frontend
 /x-pack/test/functional_enterprise_search/ @elastic/enterprise-search-frontend
+# App Search
+/x-pack/plugins/enterprise_search/public/applications/app_search/ @elastic/app-search-frontend
+/x-pack/plugins/enterprise_search/server/routes/app_search/ @elastic/app-search-frontend
+/x-pack/plugins/enterprise_search/server/collectors/app_search/ @elastic/app-search-frontend
+/x-pack/plugins/enterprise_search/server/saved_objects/app_search/ @elastic/app-search-frontend
+# Workplace Search
+/x-pack/plugins/enterprise_search/public/applications/workplace_search/ @elastic/workplace-search-frontend
+/x-pack/plugins/enterprise_search/server/routes/workplace_search/ @elastic/workplace-search-frontend
+/x-pack/plugins/enterprise_search/server/collectors/workplace_search/ @elastic/workplace-search-frontend
+/x-pack/plugins/enterprise_search/server/saved_objects/workplace_search/ @elastic/workplace-search-frontend
 
 # Elasticsearch UI
 /src/plugins/dev_tools/ @elastic/es-ui

.i18nrc.json

@@ -27,6 +27,8 @@
       "src/plugins/management"
     ],
     "maps_legacy": "src/plugins/maps_legacy",
+    "monaco": "packages/kbn-monaco/src",
+    "presentationUtil": "src/plugins/presentation_util",
     "indexPatternManagement": "src/plugins/index_pattern_management",
     "advancedSettings": "src/plugins/advanced_settings",
     "kibana_legacy": "src/plugins/kibana_legacy",

.node-version

@@ -1 +1 @@
-12.19.1
+14.15.1

.nvmrc

@@ -1 +1 @@
-12.19.1
+14.15.1

.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()
     }
   }

.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()

.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()

.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()

.teamcity/src/builds/test/QuickTests.kt

@@ -12,9 +12,7 @@ object QuickTests : BuildType({
   kibanaAgent(2)
 
   val testScripts = mapOf(
-    "Test Hardening" to ".ci/teamcity/tests/test_hardening.sh",
-    "X-Pack List cyclic dependency" to ".ci/teamcity/tests/xpack_list_cyclic_dependency.sh",
-    "X-Pack SIEM cyclic dependency" to ".ci/teamcity/tests/xpack_siem_cyclic_dependency.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"
   )

.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()

STYLEGUIDE.md

@@ -589,6 +589,24 @@ Do not use setters, they cause more problems than they can solve.
 
 [sideeffect]: http://en.wikipedia.org/wiki/Side_effect_(computer_science)
 
+### Avoid circular dependencies
+
+As part of a future effort to use correct and idempotent build tools we need our code to be
+able to be represented as a directed acyclic graph. We must avoid having circular dependencies 
+both on code and type imports to achieve that. One of the most critical parts is the plugins 
+code. We've developed a tool to identify plugins with circular dependencies which 
+has allowed us to build a list of plugins who have circular dependencies 
+between each other. 
+
+When building plugins we should avoid importing from plugins 
+who are known to have circular dependencies at the moment as well as introducing 
+new circular dependencies. You can run the same tool we use on our CI locally by 
+typing `node scripts/find_plugins_with_circular_deps --debug`. It will error out in 
+case new circular dependencies has been added with your changes 
+(which will also happen in the CI) as well as print out the current list of
+the known circular dependencies which, as mentioned before, should not be imported 
+by your code until the circular dependencies on these have been solved. 
+
 ## SASS files
 
 When writing a new component, create a sibling SASS file of the same name and import directly into the **top** of the JS/TS component file. Doing so ensures the styles are never separated or lost on import and allows for better modularization (smaller individual plugin asset footprint).

config/kibana.yml

@@ -18,6 +18,10 @@
 # default to `true` starting in Kibana 7.0.
 #server.rewriteBasePath: false
 
+# Specifies the public URL at which Kibana is available for end users. If
+# `server.basePath` is configured this URL should end with the same basePath.
+#server.publicBaseUrl: ""
+
 # The maximum payload size in bytes for incoming server requests.
 #server.maxPayloadBytes: 1048576
 

docs/api/logstash-configuration-management/create-logstash.asciidoc

@@ -20,9 +20,6 @@ experimental[] Create a centrally-managed Logstash pipeline, or update an existi
 [[logstash-configuration-management-api-create-request-body]]
 ==== Request body
 
-`id`::
-  (Required, string) The pipeline ID.
-
 `description`::
   (Optional, string) The pipeline description.