merge master and fix merge conflicts

.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

@@ -41,6 +41,5 @@ snapshots.js
 /packages/kbn-test/src/functional_test_runner/__tests__/fixtures/
 /packages/kbn-test/src/functional_test_runner/lib/config/__tests__/fixtures/
 /packages/kbn-ui-framework/dist
-/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

.eslintrc.js

@@ -85,12 +85,6 @@ module.exports = {
     /**
      * Temporarily disable some react rules for specific plugins, remove in separate PRs
      */
-    {
-      files: ['packages/kbn-ui-framework/**/*.{js,mjs,ts,tsx}'],
-      rules: {
-        'jsx-a11y/no-onchange': 'off',
-      },
-    },
     {
       files: ['src/plugins/kibana_react/**/*.{js,mjs,ts,tsx}'],
       rules: {
@@ -413,7 +407,6 @@ module.exports = {
     {
       files: [
         '**/public/**/*.js',
-        'packages/kbn-ui-framework/doc_site/src/**/*.js',
         'src/fixtures/**/*.js', // TODO: this directory needs to be more obviously "public" (or go away)
       ],
       settings: {
@@ -436,11 +429,7 @@ module.exports = {
      * Files that ARE NOT allowed to use devDependencies
      */
     {
-      files: [
-        'packages/kbn-ui-framework/**/*.js',
-        'x-pack/**/*.js',
-        'packages/kbn-interpreter/**/*.js',
-      ],
+      files: ['x-pack/**/*.js', 'packages/kbn-interpreter/**/*.js'],
       rules: {
         'import/no-extraneous-dependencies': [
           'error',
@@ -458,10 +447,6 @@ module.exports = {
      */
     {
       files: [
-        'packages/kbn-ui-framework/**/*.test.js',
-        'packages/kbn-ui-framework/doc_site/**/*.js',
-        'packages/kbn-ui-framework/generator-kui/**/*.js',
-        'packages/kbn-ui-framework/Gruntfile.js',
         'packages/kbn-es/src/**/*.js',
         'packages/kbn-interpreter/tasks/**/*.js',
         'packages/kbn-interpreter/src/plugin/**/*.js',
@@ -1073,20 +1058,6 @@ module.exports = {
       },
     },
 
-    /**
-     * disable jsx-a11y for kbn-ui-framework
-     */
-    {
-      files: ['packages/kbn-ui-framework/**/*.js'],
-      rules: {
-        'jsx-a11y/click-events-have-key-events': 'off',
-        'jsx-a11y/anchor-has-content': 'off',
-        'jsx-a11y/tabindex-no-positive': 'off',
-        'jsx-a11y/label-has-associated-control': 'off',
-        'jsx-a11y/aria-role': 'off',
-      },
-    },
-
     /**
      * Canvas overrides
      */

.gitignore

@@ -49,8 +49,6 @@ selenium
 *.swp
 *.swo
 *.out
-/packages/kbn-ui-framework/doc_site/build/*
-!/packages/kbn-ui-framework/doc_site/build/index.html
 package-lock.json
 .yo-rc.json
 .vscode

.i18nrc.json

@@ -28,6 +28,7 @@
     ],
     "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",

.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,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"
   )

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

SECURITY.md

@@ -0,0 +1,7 @@
+# Security Policy
+
+Thanks for your interest in the security of our products.
+Our security policy can be found at [https://www.elastic.co/community/security](https://www.elastic.co/community/security).
+
+## Reporting a Vulnerability
+Please send security vulnerability reports to [email protected].

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/developer/plugin-list.asciidoc

@@ -47,7 +47,7 @@ as uiSettings within the code.
 - Adds a dashboard embeddable that can be used in other applications.
 
 
-|{kib-repo}blob/{branch}/src/plugins/data/README.md[data]
+|{kib-repo}blob/{branch}/src/plugins/data/README.mdx[data]
 |The data plugin provides common data access services, such as search and query, for solutions and application developers.
 
 
@@ -160,6 +160,10 @@ It also provides a stateful version of it on the start contract.
 Content is fetched from the remote (https://feeds.elastic.co and https://feeds-staging.elastic.co in dev mode) once a day, with periodic checks if the content needs to be refreshed. All newsfeed content is hosted remotely.
 
 
+|{kib-repo}blob/{branch}/src/plugins/presentation_util/README.md[presentationUtil]
+|Utilities and components used by the presentation-related plugins
+
+
 |{kib-repo}blob/{branch}/src/plugins/region_map/README.md[regionMap]
 |Create choropleth maps. Display the results of a term-aggregation as e.g. countries, zip-codes, states.
 

docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md

@@ -101,6 +101,12 @@ readonly links: {
             readonly dateMath: string;
         };
         readonly management: Record<string, string>;
+        readonly ml: {
+            readonly guide: string;
+            readonly anomalyDetection: string;
+            readonly anomalyDetectionJobs: string;
+            readonly dataFrameAnalytics: string;
+        };
         readonly visualize: Record<string, string>;
     };
 ```