Merge with master and resolve conflicts

.ci/es-snapshots/Jenkinsfile_verify_es

@@ -29,6 +29,7 @@ kibanaPipeline(timeoutMinutes: 150) {
       withEnv(["ES_SNAPSHOT_MANIFEST=${SNAPSHOT_MANIFEST}"]) {
         parallel([
           'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'),
+          'x-pack-intake-agent': workers.intake('x-pack-intake', './test/scripts/jenkins_xpack.sh'),
           'kibana-oss-agent': workers.functional('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
             'oss-ciGroup1': kibanaPipeline.ossCiGroupProcess(1),
             'oss-ciGroup2': kibanaPipeline.ossCiGroupProcess(2),

.ci/jobs.yml

@@ -2,6 +2,7 @@
 
 JOB:
   - kibana-intake
+  - x-pack-intake
   - kibana-firefoxSmoke
   - kibana-ciGroup1
   - kibana-ciGroup2

.ci/teamcity/default/jest.sh

@@ -1,4 +1,10 @@
 #!/bin/bash
 
-# This file is temporary and can be removed once #85850 has been
-# merged and the changes included in open PR's (~3 days after merging)
+set -euo pipefail
+
+source "$(dirname "${0}")/../util.sh"
+
+export JOB=kibana-default-jest
+
+checks-reporter-with-killswitch "Jest Unit Tests" \
+  node scripts/jest x-pack --ci --verbose --maxWorkers=5

.ci/teamcity/oss/jest.sh

@@ -1,13 +1,10 @@
 #!/bin/bash
 
-# This file is temporary and can be removed once #85850 has been
-# merged and the changes included in open PR's (~3 days after merging)
-
 set -euo pipefail
 
 source "$(dirname "${0}")/../util.sh"
 
 export JOB=kibana-oss-jest
 
-checks-reporter-with-killswitch "Jest Unit Tests" \
-  node scripts/jest --ci --maxWorkers=5 --verbose
+checks-reporter-with-killswitch "OSS Jest Unit Tests" \
+  node scripts/jest --config jest.config.oss.js --ci --verbose --maxWorkers=5

.eslintignore

@@ -36,6 +36,7 @@ snapshots.js
 # package overrides
 /packages/elastic-eslint-config-kibana
 /packages/kbn-interpreter/src/common/lib/grammar.js
+/packages/kbn-tinymath/src/grammar.js
 /packages/kbn-plugin-generator/template
 /packages/kbn-pm/dist
 /packages/kbn-test/src/functional_test_runner/__tests__/fixtures/

.teamcity/src/Extensions.kt

@@ -20,21 +20,20 @@ fun BuildType.kibanaAgent(size: Int) {
 }
 
 val testArtifactRules = """
-    target/junit/**/*
     target/kibana-*
-    target/kibana-coverage/**/*
-    target/kibana-security-solution/**/*.png
     target/test-metrics/*
+    target/kibana-security-solution/**/*.png
+    target/junit/**/*
     target/test-suites-ci-plan.json
-    test/**/screenshots/diff/*.png
-    test/**/screenshots/failure/*.png
     test/**/screenshots/session/*.png
+    test/**/screenshots/failure/*.png
+    test/**/screenshots/diff/*.png
     test/functional/failure_debug/html/*.html
-    x-pack/test/**/screenshots/diff/*.png
-    x-pack/test/**/screenshots/failure/*.png
     x-pack/test/**/screenshots/session/*.png
-    x-pack/test/functional/apps/reporting/reports/session/*.pdf
+    x-pack/test/**/screenshots/failure/*.png
+    x-pack/test/**/screenshots/diff/*.png
     x-pack/test/functional/failure_debug/html/*.html
+    x-pack/test/functional/apps/reporting/reports/session/*.pdf
   """.trimIndent()
 
 fun BuildType.addTestSettings() {

.teamcity/src/builds/test/AllTests.kt

@@ -9,5 +9,5 @@ object AllTests : BuildType({
   description = "All Non-Functional Tests"
   type = Type.COMPOSITE
 
-  dependsOn(QuickTests, Jest, JestIntegration, OssApiServerIntegration)
+  dependsOn(QuickTests, Jest, XPackJest, JestIntegration, OssApiServerIntegration)
 })

.teamcity/src/builds/test/Jest.kt

@@ -12,7 +12,7 @@ object Jest : BuildType({
   kibanaAgent(8)
 
   steps {
-    runbld("Jest Unit", "./.ci/teamcity/tests/jest.sh")
+    runbld("Jest Unit", "./.ci/teamcity/oss/jest.sh")
   }
 
   addTestSettings()

.teamcity/src/builds/test/XPackJest.kt

@@ -0,0 +1,19 @@
+package builds.test
+
+import addTestSettings
+import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
+import kibanaAgent
+import runbld
+
+object XPackJest : BuildType({
+  name = "X-Pack Jest Unit"
+  description = "Executes X-Pack Jest Unit Tests"
+
+  kibanaAgent(16)
+
+  steps {
+    runbld("X-Pack Jest Unit", "./.ci/teamcity/default/jest.sh")
+  }
+
+  addTestSettings()
+})

.teamcity/src/projects/Kibana.kt

@@ -77,6 +77,7 @@ fun Kibana(config: KibanaConfiguration = KibanaConfiguration()) : Project {
           name = "Jest"
 
           buildType(Jest)
+          buildType(XPackJest)
           buildType(JestIntegration)
         }
 

docs/developer/plugin-list.asciidoc

@@ -150,8 +150,8 @@ 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/presentation_util/README.mdx[presentationUtil]
+|The Presentation Utility Plugin is a set of common, shared components and toolkits for solutions within the Presentation space, (e.g. Dashboards, Canvas).
 
 
 |{kib-repo}blob/{branch}/src/plugins/region_map/README.md[regionMap]

docs/user/dashboard/vega-reference.asciidoc

@@ -223,7 +223,7 @@ experimental[] Access the Elastic Map Service files via the same mechanism:
 ----
 url: {
   // "type" defaults to "elasticsearch" otherwise
-  type: emsfile
+  %type%: emsfile
   // Name of the file, exactly as in the Region map visualization
   name: World Countries
 }
@@ -289,7 +289,7 @@ experimental[] You can use the *Vega* https://vega.github.io/vega/docs/data/[dat
 ----
 url: {
   // "type" defaults to "elasticsearch" otherwise
-  type: emsfile
+  %type%: emsfile
   // Name of the file, exactly as in the Region map visualization
   name: World Countries
 }