Merge branch 'master' into mv/kibana-keystore

.ci/end2end.groovy

@@ -76,7 +76,7 @@ pipeline {
         }
       }
       steps{
-        notifyStatus('Running smoke tests', 'PENDING')
+        notifyTestStatus('Running smoke tests', 'PENDING')
         dir("${BASE_DIR}"){
           sh "${E2E_DIR}/ci/run-e2e.sh"
         }
@@ -95,10 +95,10 @@ pipeline {
           }
         }
         unsuccessful {
-          notifyStatus('Test failures', 'FAILURE')
+          notifyTestStatus('Test failures', 'FAILURE')
         }
         success {
-          notifyStatus('Tests passed', 'SUCCESS')
+          notifyTestStatus('Tests passed', 'SUCCESS')
         }
       }
     }
@@ -113,5 +113,9 @@ pipeline {
 }
 
 def notifyStatus(String description, String status) {
-  withGithubNotify.notify('end2end-for-apm-ui', description, status, getBlueoceanDisplayURL())
+  withGithubNotify.notify('end2end-for-apm-ui', description, status, getBlueoceanTabURL('pipeline'))
+}
+
+def notifyTestStatus(String description, String status) {
+  withGithubNotify.notify('end2end-for-apm-ui', description, status, getBlueoceanTabURL('tests'))
 }

.ci/packer_cache.sh

@@ -2,59 +2,5 @@
 
 set -e
 
-branch="$(git rev-parse --abbrev-ref HEAD 2> /dev/null)"
-
-# run setup script that gives us node, yarn, and bootstraps the project
-source src/dev/ci_setup/setup.sh;
-
-# download es snapshots
-node scripts/es snapshot --download-only;
-node scripts/es snapshot --license=oss --download-only;
-
-# download reporting browsers
-(cd "x-pack" && yarn gulp prepare);
-
-# cache the chromedriver archive
-chromedriverDistVersion="$(node -e "console.log(require('chromedriver').version)")"
-chromedriverPkgVersion="$(node -e "console.log(require('./package.json').devDependencies.chromedriver)")"
-if [ -z "$chromedriverDistVersion" ] || [ -z "$chromedriverPkgVersion" ]; then
-  echo "UNABLE TO DETERMINE CHROMEDRIVER VERSIONS"
-  exit 1
-fi
-mkdir -p .chromedriver
-curl "https://chromedriver.storage.googleapis.com/$chromedriverDistVersion/chromedriver_linux64.zip" > .chromedriver/chromedriver.zip
-echo "$chromedriverPkgVersion" > .chromedriver/pkgVersion
-
-# cache the geckodriver archive
-geckodriverPkgVersion="$(node -e "console.log(require('./package.json').devDependencies.geckodriver)")"
-if [ -z "$geckodriverPkgVersion" ]; then
-  echo "UNABLE TO DETERMINE geckodriver VERSIONS"
-  exit 1
-fi
-mkdir -p ".geckodriver"
-cp "node_modules/geckodriver/geckodriver.tar.gz" .geckodriver/geckodriver.tar.gz
-echo "$geckodriverPkgVersion" > .geckodriver/pkgVersion
-
-echo "Creating bootstrap_cache archive"
-
-# archive cacheable directories
-mkdir -p "$HOME/.kibana/bootstrap_cache"
-tar -cf "$HOME/.kibana/bootstrap_cache/$branch.tar" \
-  x-pack/plugins/reporting/.chromium \
-  .es \
-  .chromedriver \
-  .geckodriver;
-
-echo "Adding node_modules"
-# Find all of the node_modules directories that aren't test fixtures, and aren't inside other node_modules directories, and append them to the tar
-find . -type d -name node_modules -not -path '*__fixtures__*' -prune -print0 | xargs -0I % tar -rf "$HOME/.kibana/bootstrap_cache/$branch.tar" "%"
-
-echo "created $HOME/.kibana/bootstrap_cache/$branch.tar"
-
-if [ "$branch" == "master" ]; then
-  echo "Creating bootstrap cache for 7.x";
-
-  git clone https://github.com/elastic/kibana.git --branch 7.x --depth 1 /tmp/kibana-7.x
-  (cd /tmp/kibana-7.x && ./.ci/packer_cache.sh);
-  rm -rf /tmp/kibana-7.x;
-fi
+./.ci/packer_cache_for_branch.sh master
+./.ci/packer_cache_for_branch.sh 7.x

.ci/packer_cache_for_branch.sh

@@ -0,0 +1,62 @@
+#!/usr/bin/env bash
+
+set -e
+
+branch="$1"
+checkoutDir="$(pwd)"
+
+if [[ "$branch" != "master" ]]; then
+  checkoutDir="/tmp/kibana-$branch"
+  git clone https://github.com/elastic/kibana.git --branch "$branch" --depth 1 "$checkoutDir"
+  cd "$checkoutDir"
+fi
+
+source src/dev/ci_setup/setup.sh;
+
+# download es snapshots
+node scripts/es snapshot --download-only;
+node scripts/es snapshot --license=oss --download-only;
+
+# download reporting browsers
+(cd "x-pack" && yarn gulp prepare);
+
+# cache the chromedriver archive
+chromedriverDistVersion="$(node -e "console.log(require('chromedriver').version)")"
+chromedriverPkgVersion="$(node -e "console.log(require('./package.json').devDependencies.chromedriver)")"
+if [ -z "$chromedriverDistVersion" ] || [ -z "$chromedriverPkgVersion" ]; then
+  echo "UNABLE TO DETERMINE CHROMEDRIVER VERSIONS"
+  exit 1
+fi
+mkdir -p .chromedriver
+curl "https://chromedriver.storage.googleapis.com/$chromedriverDistVersion/chromedriver_linux64.zip" > .chromedriver/chromedriver.zip
+echo "$chromedriverPkgVersion" > .chromedriver/pkgVersion
+
+# cache the geckodriver archive
+geckodriverPkgVersion="$(node -e "console.log(require('./package.json').devDependencies.geckodriver)")"
+if [ -z "$geckodriverPkgVersion" ]; then
+  echo "UNABLE TO DETERMINE geckodriver VERSIONS"
+  exit 1
+fi
+mkdir -p ".geckodriver"
+cp "node_modules/geckodriver/geckodriver.tar.gz" .geckodriver/geckodriver.tar.gz
+echo "$geckodriverPkgVersion" > .geckodriver/pkgVersion
+
+echo "Creating bootstrap_cache archive"
+
+# archive cacheable directories
+mkdir -p "$HOME/.kibana/bootstrap_cache"
+tar -cf "$HOME/.kibana/bootstrap_cache/$branch.tar" \
+  x-pack/plugins/reporting/.chromium \
+  .es \
+  .chromedriver \
+  .geckodriver;
+
+echo "Adding node_modules"
+# Find all of the node_modules directories that aren't test fixtures, and aren't inside other node_modules directories, and append them to the tar
+find . -type d -name node_modules -not -path '*__fixtures__*' -prune -print0 | xargs -0I % tar -rf "$HOME/.kibana/bootstrap_cache/$branch.tar" "%"
+
+echo "created $HOME/.kibana/bootstrap_cache/$branch.tar"
+
+if [[ "$branch" != "master" ]]; then
+  rm --preserve-root -rf "$checkoutDir"
+fi

.eslintrc.js

@@ -472,6 +472,7 @@ module.exports = {
     {
       files: [
         'test/functional/services/lib/web_element_wrapper/scroll_into_view_if_necessary.js',
+        'src/legacy/ui/ui_render/bootstrap/kbn_bundles_loader_source.js',
         '**/browser_exec_scripts/**/*.js',
       ],
       rules: {

.github/CODEOWNERS

@@ -4,6 +4,7 @@
 
 # App
 /x-pack/plugins/dashboard_enhanced/ @elastic/kibana-app
+/x-pack/plugins/discover_enhanced/ @elastic/kibana-app
 /x-pack/plugins/lens/ @elastic/kibana-app
 /x-pack/plugins/graph/ @elastic/kibana-app
 /src/legacy/core_plugins/kibana/public/local_application_service/ @elastic/kibana-app
@@ -66,11 +67,10 @@
 
 # APM
 /x-pack/plugins/apm/  @elastic/apm-ui
-/x-pack/plugins/apm/  @elastic/apm-ui
 /x-pack/test/functional/apps/apm/  @elastic/apm-ui
 /src/legacy/core_plugins/apm_oss/  @elastic/apm-ui
 /src/plugins/apm_oss/  @elastic/apm-ui
-/src/apm.js @watson
+/src/apm.js @watson @vigneshshanmugam
 
 # Beats
 /x-pack/legacy/plugins/beats_management/  @elastic/beats
@@ -168,15 +168,15 @@
 /src/core/public/i18n/  @elastic/kibana-localization
 /packages/kbn-i18n/  @elastic/kibana-localization
 
-# Pulse
-/packages/kbn-analytics/ @elastic/pulse
-/src/plugins/kibana_usage_collection/ @elastic/pulse
-/src/plugins/newsfeed/ @elastic/pulse
-/src/plugins/telemetry/ @elastic/pulse
-/src/plugins/telemetry_collection_manager/ @elastic/pulse
-/src/plugins/telemetry_management_section/ @elastic/pulse
-/src/plugins/usage_collection/ @elastic/pulse
-/x-pack/plugins/telemetry_collection_xpack/ @elastic/pulse
+# Kibana Telemetry
+/packages/kbn-analytics/ @elastic/kibana-telemetry
+/src/plugins/kibana_usage_collection/ @elastic/kibana-telemetry
+/src/plugins/newsfeed/ @elastic/kibana-telemetry
+/src/plugins/telemetry/ @elastic/kibana-telemetry
+/src/plugins/telemetry_collection_manager/ @elastic/kibana-telemetry
+/src/plugins/telemetry_management_section/ @elastic/kibana-telemetry
+/src/plugins/usage_collection/ @elastic/kibana-telemetry
+/x-pack/plugins/telemetry_collection_xpack/ @elastic/kibana-telemetry
 
 # Kibana Alerting Services
 /x-pack/plugins/alerts/ @elastic/kibana-alerting-services

.gitignore

@@ -52,3 +52,7 @@ npm-debug.log*
 # apm plugin
 /x-pack/plugins/apm/tsconfig.json
 apm.tsconfig.json
+
+# release notes script output
+report.csv
+report.asciidoc

CONTRIBUTING.md

@@ -657,8 +657,8 @@ Distributable packages can be found in `target/` after the build completes.
 Kibana documentation is written in [asciidoc](http://asciidoc.org/) format in
 the `docs/` directory.
 
-To build the docs, you must clone the [elastic/docs](https://github.com/elastic/docs)
-repo as a sibling of your kibana repo. Follow the instructions in that project's
+To build the docs, clone the [elastic/docs](https://github.com/elastic/docs)
+repo as a sibling of your Kibana repo. Follow the instructions in that project's
 README for getting the docs tooling set up.
 
 **To build the Kibana docs and open them in your browser:**
@@ -676,14 +676,26 @@ node scripts/docs.js --open
 
 Part of this process only applies to maintainers, since it requires access to GitHub labels.
 
-Kibana publishes [Release Notes](https://www.elastic.co/guide/en/kibana/current/release-notes.html) for major and minor releases.  To generate the Release Notes, the writers run a script against this repo to collect the merged PRs against the release.
-To include your PRs in the Release Notes:
+Kibana publishes [Release Notes](https://www.elastic.co/guide/en/kibana/current/release-notes.html) for major and minor releases. The Release Notes summarize what the PRs accomplish in language that is meaningful to users. To generate the Release Notes, the team runs a script against this repo to collect the merged PRs against the release.
 
-1. In the title, summarize what the PR accomplishes in language that is meaningful to the user.  In general, use present tense (for example, Adds, Fixes) in sentence case.
-2. Label the PR with the targeted version (ex: `v7.3.0`).
-3. Label the PR with the appropriate GitHub labels:
+#### Create the Release Notes text
+The text that appears in the Release Notes is pulled directly from your PR title, or a single paragraph of text that you specify in the PR description. 
+
+To use a single paragraph of text, enter `Release note:` or a `## Release note` header in the PR description, followed by your text. For example, refer to this [PR](https://github.com/elastic/kibana/pull/65796) that uses the `## Release note` header.
+
+When you create the Release Notes text, use the following best practices:
+* Use present tense. 
+* Use sentence case.
+* When you create a feature PR, start with `Adds`.
+* When you create an enhancement PR, start with `Improves`. 
+* When you create a bug fix PR, start with `Fixes`.
+* When you create a deprecation PR, start with `Deprecates`.
+
+#### Add your labels
+1. Label the PR with the targeted version (ex: `v7.3.0`).
+2. Label the PR with the appropriate GitHub labels:
     * For a new feature or functionality, use `release_note:enhancement`.
-    * For an external-facing fix, use `release_note:fix`. Exception: docs, build, and test fixes do not go in the Release Notes. Neither fixes for issues that were only on `master` and never have been released.
+    * For an external-facing fix, use `release_note:fix`. We do not include docs, build, and test fixes in the Release Notes, or unreleased issues that are only on `master`.
     * For a deprecated feature, use `release_note:deprecation`.
     * For a breaking change, use `release_note:breaking`.
     * To **NOT** include your changes in the Release Notes, use `release_note:skip`.
@@ -695,7 +707,7 @@ We also produce a blog post that details more important breaking API changes in
 
 ## Name the feature with the break (ex: Visualize Loader)
 
-Summary of the change. Anything Under `#Dev Docs` will be used in the blog.
+Summary of the change. Anything Under `#Dev Docs` is used in the blog.
 ```
 
 ## Signing the contributor license agreement

Jenkinsfile

@@ -4,8 +4,8 @@ library 'kibana-pipeline-library'
 kibanaLibrary.load()
 
 kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true) {
-  ciStats.trackBuild {
-    githubPr.withDefaultPrComments {
+  githubPr.withDefaultPrComments {
+    ciStats.trackBuild {
       catchError {
         retryable.enable()
         parallel([
@@ -41,7 +41,7 @@ kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true) {
             'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
             'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
             'xpack-accessibility': kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh'),
-            'xpack-pageLoadMetrics': kibanaPipeline.functionalTestProcess('xpack-pageLoadMetrics', './test/scripts/jenkins_xpack_page_load_metrics.sh'),
+            // 'xpack-pageLoadMetrics': kibanaPipeline.functionalTestProcess('xpack-pageLoadMetrics', './test/scripts/jenkins_xpack_page_load_metrics.sh'),
             'xpack-securitySolutionCypress': { processNumber ->
               whenChanged(['x-pack/plugins/security_solution/', 'x-pack/test/security_solution_cypress/']) {
                 kibanaPipeline.functionalTestProcess('xpack-securitySolutionCypress', './test/scripts/jenkins_security_solution_cypress.sh')(processNumber)
@@ -53,10 +53,10 @@ kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true) {
         ])
       }
     }
+  }
 
-    if (params.NOTIFY_ON_FAILURE) {
-      slackNotifications.onFailure()
-      kibanaPipeline.sendMail()
-    }
+  if (params.NOTIFY_ON_FAILURE) {
+    slackNotifications.onFailure()
+    kibanaPipeline.sendMail()
   }
 }

NOTICE.txt

@@ -21,9 +21,76 @@ used. Logarithmic ticks are places at powers of ten and at half those
 values if there are not to many ticks already (e.g. [1, 5, 10, 50, 100]).
 For details,  see https://github.com/flot/flot/pull/1328
 
+---
+This module was heavily inspired by the externals plugin that ships with webpack@97d58d31
+MIT License http://www.opensource.org/licenses/mit-license.php
+Author Tobias Koppers @sokra
+
 ---
 This product has relied on ASTExplorer that is licensed under MIT.
 
+---
+This product includes code that is based on Ace editor, which was available
+under a "BSD" license.
+
+Distributed under the BSD license:
+
+Copyright (c) 2010, Ajax.org B.V.
+All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of Ajax.org B.V. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+---
+This product includes code that is based on Ace editor, which was available
+under a "BSD" license.
+
+Distributed under the BSD license:
+
+Copyright (c) 2010, Ajax.org B.V.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of Ajax.org B.V. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 ---
 This product includes code that is based on flot-charts, which was available
 under a "MIT" license.

docs/api/saved-objects/create.asciidoc

@@ -13,7 +13,7 @@ experimental[] Create {kib} saved objects.
 
 `POST <kibana host>:<port>/api/saved_objects/<type>/<id>`
 
-`POST <kibana host>:<port>/s/<space_id>/saved_objects/<type>`
+`POST <kibana host>:<port>/s/<space_id>/api/saved_objects/<type>`
 
 [[saved-objects-api-create-path-params]]
 ==== Path parameters