Merge branch '7.x' into backport/7.x/pr-67358

.gitignore

@@ -4,6 +4,7 @@
 /.es
 .DS_Store
 .node_binaries
+.native_modules
 node_modules
 !/src/dev/npm/integration_tests/__fixtures__/fixture1/node_modules
 !/src/dev/notice/__fixtures__/node_modules

.sass-lint.yml

@@ -12,6 +12,7 @@ files:
     - 'x-pack/plugins/maps/**/*.s+(a|c)ss'
     - 'x-pack/plugins/spaces/**/*.s+(a|c)ss'
     - 'x-pack/plugins/security/**/*.s+(a|c)ss'
+    - 'x-pack/plugins/monitoring/**/*.s+(a|c)ss'
   ignore:
     - 'x-pack/plugins/canvas/shareable_runtime/**/*.s+(a|c)ss'
 rules:

CONTRIBUTING.md

@@ -13,26 +13,44 @@ A high level overview of our contributing guidelines.
   - ["My issue isn't getting enough attention"](#my-issue-isnt-getting-enough-attention)
   - ["I want to help!"](#i-want-to-help)
 - [How We Use Git and GitHub](#how-we-use-git-and-github)
+  - [Forking](#forking)
   - [Branching](#branching)
   - [Commits and Merging](#commits-and-merging)
+    - [Rebasing and fixing merge conflicts](#rebasing-and-fixing-merge-conflicts)
   - [What Goes Into a Pull Request](#what-goes-into-a-pull-request)
 - [Contributing Code](#contributing-code)
   - [Setting Up Your Development Environment](#setting-up-your-development-environment)
+    - [Increase node.js heap size](#increase-nodejs-heap-size)
+  - [Running Elasticsearch Locally](#running-elasticsearch-locally)
+    - [Nightly snapshot (recommended)](#nightly-snapshot-recommended)
+      - [Keeping data between snapshots](#keeping-data-between-snapshots)
+    - [Source](#source)
+    - [Archive](#archive)
+      - [Sample Data](#sample-data)
+  - [Running Elasticsearch Remotely](#running-elasticsearch-remotely)
+  - [Running remote clusters](#running-remote-clusters)
+  - [Running Kibana](#running-kibana)
+    - [Running Kibana in Open-Source mode](#running-kibana-in-open-source-mode)
+    - [Unsupported URL Type](#unsupported-url-type)
     - [Customizing `config/kibana.dev.yml`](#customizing-configkibanadevyml)
+    - [Potential Optimization Pitfalls](#potential-optimization-pitfalls)
     - [Setting Up SSL](#setting-up-ssl)
   - [Linting](#linting)
+    - [Setup Guide for VS Code Users](#setup-guide-for-vs-code-users)
   - [Internationalization](#internationalization)
   - [Localization](#localization)
+  - [Styling with SASS](#styling-with-sass)
   - [Testing and Building](#testing-and-building)
     - [Debugging server code](#debugging-server-code)
     - [Instrumenting with Elastic APM](#instrumenting-with-elastic-apm)
-  - [Debugging Unit Tests](#debugging-unit-tests)
-  - [Unit Testing Plugins](#unit-testing-plugins)
-  - [Automated Accessibility Testing](#automated-accessibility-testing)
-  - [Cross-browser compatibility](#cross-browser-compatibility)
-    - [Testing compatibility locally](#testing-compatibility-locally)
-    - [Running Browser Automation Tests](#running-browser-automation-tests)
-      - [Browser Automation Notes](#browser-automation-notes)
+    - [Unit testing frameworks](#unit-testing-frameworks)
+    - [Running specific Kibana tests](#running-specific-kibana-tests)
+    - [Debugging Unit Tests](#debugging-unit-tests)
+    - [Unit Testing Plugins](#unit-testing-plugins)
+    - [Automated Accessibility Testing](#automated-accessibility-testing)
+    - [Cross-browser compatibility](#cross-browser-compatibility)
+      - [Testing compatibility locally](#testing-compatibility-locally)
+      - [Running Browser Automation Tests](#running-browser-automation-tests)
   - [Building OS packages](#building-os-packages)
   - [Writing documentation](#writing-documentation)
   - [Release Notes Process](#release-notes-process)
@@ -403,7 +421,7 @@ extract them to a `JSON` file or integrate translations back to Kibana. To know
 We cannot support accepting contributions to the translations from any source other than the translators we have engaged to do the work.
 We are still to develop a proper process to accept any contributed translations. We certainly appreciate that people care enough about the localization effort to want to help improve the quality. We aim to build out a more comprehensive localization process for the future and will notify you once contributions can be supported, but for the time being, we are not able to incorporate suggestions.
 
-### Syling with SASS
+### Styling with SASS
 
 When writing a new component, create a sibling SASS file of the same name and import directly into 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).
 
@@ -456,10 +474,10 @@ macOS users on a machine with a discrete graphics card may see significant speed
 - Uncheck the "Prefer integrated to discrete GPU" option
 - Restart iTerm
 
-### Debugging Server Code
+#### Debugging Server Code
 `yarn debug` will start the server with Node's inspect flag. Kibana's development mode will start three processes on ports `9229`, `9230`, and `9231`. Chrome's developer tools need to be configured to connect to all three connections. Add `localhost:<port>` for each Kibana process in Chrome's developer tools connection tab.
 
-### Instrumenting with Elastic APM
+#### Instrumenting with Elastic APM
 Kibana ships with the [Elastic APM Node.js Agent](https://github.com/elastic/apm-agent-nodejs) built-in for debugging purposes.
 
 Its default configuration is meant to be used by core Kibana developers only, but it can easily be re-configured to your needs.
@@ -490,13 +508,13 @@ ELASTIC_APM_ACTIVE=true yarn start
 Once the agent is active, it will trace all incoming HTTP requests to Kibana, monitor for errors, and collect process-level metrics.
 The collected data will be sent to the APM Server and is viewable in the APM UI in Kibana.
 
-### Unit testing frameworks
+#### Unit testing frameworks
 Kibana is migrating unit testing from Mocha to Jest. Legacy unit tests still
 exist in Mocha but all new unit tests should be written in Jest. Mocha tests
 are contained in `__tests__` directories. Whereas Jest tests are stored in
 the same directory as source code files with the `.test.js` suffix.
 
-### Running specific Kibana tests
+#### Running specific Kibana tests
 
 The following table outlines possible test file locations and how to invoke them:
 
@@ -529,7 +547,7 @@ Test runner arguments:
     yarn test:ftr:runner --config test/api_integration/config.js --grep='should return 404 if id does not match any sample data sets'
     ```
 
-### Debugging Unit Tests
+#### Debugging Unit Tests
 
 The standard `yarn test` task runs several sub tasks and can take several minutes to complete, making debugging failures pretty painful. In order to ease the pain specialized tasks provide alternate methods for running the tests.
 
@@ -556,7 +574,7 @@ In the screenshot below, you'll notice the URL is `localhost:9876/debug.html`. Y
 
 ![Browser test debugging](http://i.imgur.com/DwHxgfq.png)
 
-### Unit Testing Plugins
+#### Unit Testing Plugins
 
 This should work super if you're using the [Kibana plugin generator](https://github.com/elastic/kibana/tree/master/packages/kbn-plugin-generator). If you're not using the generator, well, you're on your own. We suggest you look at how the generator works.
 
@@ -567,7 +585,7 @@ yarn test:mocha
 yarn test:karma:debug # remove the debug flag to run them once and close
 ```
 
-### Automated Accessibility Testing
+#### Automated Accessibility Testing
 
 To run the tests locally:
 
@@ -584,11 +602,11 @@ can be run locally using their browser plugins:
 - [Chrome](https://chrome.google.com/webstore/detail/axe-web-accessibility-tes/lhdoppojpmngadmnindnejefpokejbdd?hl=en-US)
 - [Firefox](https://addons.mozilla.org/en-US/firefox/addon/axe-devtools/)
 
-### Cross-browser Compatibility
+#### Cross-browser Compatibility
 
-#### Testing Compatibility Locally
+##### Testing Compatibility Locally
 
-##### Testing IE on OS X
+###### Testing IE on OS X
 
 * [Download VMWare Fusion](http://www.vmware.com/products/fusion/fusion-evaluation.html).
 * [Download IE virtual machines](https://developer.microsoft.com/en-us/microsoft-edge/tools/vms/#downloads) for VMWare.
@@ -599,7 +617,7 @@ can be run locally using their browser plugins:
 * Now you can run your VM, open the browser, and navigate to `http://computer.local:5601` to test Kibana.
 * Alternatively you can use browserstack
 
-#### Running Browser Automation Tests
+##### Running Browser Automation Tests
 
 [Read about the `FunctionalTestRunner`](https://www.elastic.co/guide/en/kibana/current/development-functional-tests.html) to learn more about how you can run and develop functional tests for Kibana core and plugins.
 

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([
@@ -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()
   }
 }

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>`
 
 `POST /s/<space_id>/saved_objects/<type>`
 

docs/apm/api.asciidoc

@@ -15,8 +15,39 @@ Some APM app features are provided via a REST API:
 [[apm-api-example]]
 === Using the APIs
 
-Users interacting with APM APIs must have <<apm-app-api-user,sufficient privileges>>.
-In addition, there are request headers to be aware of, like `kbn-xsrf: true`, and `Content-Type: applicaton/json`.
+// The following content is reused throughout the API docs
+// tag::using-the-APIs[]
+Interact with APM APIs using cURL or another API tool.
+All APM APIs are Kibana APIs, not Elasticsearch APIs;
+because of this, the Kibana dev tools console cannot be used to interact with APM APIs.
+
+For all APM APIs, you must use a request header.
+Supported headers are `Authorization`, `kbn-xsrf`, and `Content-Type`.
+
+`Authorization: ApiKey {credentials}`::
+Kibana supports token-based authentication with the Elasticsearch API key service.
+The API key returned by the  {ref}/security-api-create-api-key.html[Elasticsearch create API key API]
+can be used by sending a request with an `Authorization` header that has a value of `ApiKey` followed by the `{credentials}`,
+where `{credentials}` is the base64 encoding of `id` and `api_key` joined by a colon.
++
+Alternatively, you can create a user and use their username and password to authenticate API access: `-u $USER:$PASSWORD`.
++
+Whether using `Authorization: ApiKey {credentials}`, or `-u $USER:$PASSWORD`,
+users interacting with APM APIs must have <<apm-app-api-user,sufficient privileges>>.
+
+`kbn-xsrf: true`::
+  By default, you must use `kbn-xsrf` for all API calls, except in the following scenarios:
+
+* The API endpoint uses the `GET` or `HEAD` operations
+* The path is whitelisted using the <<settings, `server.xsrf.whitelist`>> setting
+* XSRF protections are disabled using the `server.xsrf.disableProtection` setting
+
+`Content-Type: application/json`::
+  Applicable only when you send a payload in the API request.
+  {kib} API requests and responses use JSON.
+  Typically, if you include the `kbn-xsrf` header, you must also include the `Content-Type` header.
+// end::using-the-APIs[]
+
 Here's an example CURL request that adds an annotation to the APM app:
 
 [source,curl]
@@ -38,9 +69,6 @@ curl -X POST \
     }'
 ----
 
-The Kibana <<api,REST API reference>> provides additional information on how to use Kibana APIs,
-required request headers, and token-based authentication options.
-
 ////
 *******************************************************
 ////
@@ -59,7 +87,15 @@ The following Agent configuration APIs are available:
 * <<apm-list-config>> to list all Agent configurations.
 * <<apm-search-config>> to search for an Agent configuration.
 
-See <<apm-app-api-config-manager>> for information on the privileges required to use this API endpoint.
+[float]
+[[use-agent-config-api]]
+==== How to use APM APIs
+
+.Expand for required headers, privileges, and usage details
+[%collapsible%closed]
+======
+include::api.asciidoc[tag=using-the-APIs]
+======
 
 ////
 *******************************************************
@@ -100,7 +136,7 @@ See <<apm-app-api-config-manager>> for information on the privileges required to
 [[apm-update-config-example]]
 ===== Example
 
-[source,console]
+[source,curl]
 --------------------------------------------------
 PUT /api/apm/settings/agent-configuration
 {
@@ -150,7 +186,7 @@ PUT /api/apm/settings/agent-configuration
 [[apm-delete-config-example]]
 ===== Example
 
-[source,console]
+[source,curl]
 --------------------------------------------------
 DELETE /api/apm/settings/agent-configuration
 {
@@ -228,7 +264,7 @@ DELETE /api/apm/settings/agent-configuration
 [[apm-list-config-example]]
 ===== Example
 
-[source,console]
+[source,curl]
 --------------------------------------------------
 GET  /api/apm/settings/agent-configuration
 --------------------------------------------------
@@ -293,7 +329,7 @@ GET  /api/apm/settings/agent-configuration
 [[apm-search-config-example]]
 ===== Example
 
-[source,console]
+[source,curl]
 --------------------------------------------------
 POST /api/apm/settings/agent-configuration/search
 {
@@ -317,17 +353,25 @@ POST /api/apm/settings/agent-configuration/search
 The Annotation API allows you to annotate visualizations in the APM app with significant events, like deployments,
 allowing you to easily see how these events are impacting the performance of your existing applications.
 
+By default, annotations are stored in a newly created `observability-annotations` index.
+The name of this index can be changed in your `config.yml` by editing `xpack.observability.annotations.index`.
+
 The following APIs are available:
 
 * <<apm-annotation-create>> to create an annotation for APM.
 // * <<obs-annotation-create>> POST /api/observability/annotation
 // * <<obs-annotation-get>> GET /api/observability/annotation/:id
 // * <<obs-annotation-delete>> DELETE /api/observability/annotation/:id
 
-By default, annotations are stored in a newly created `observability-annotations` index.
-The name of this index can be changed in your `config.yml` by editing `xpack.observability.annotations.index`.
+[float]
+[[use-annotation-api]]
+==== How to use APM APIs
 
-See <<apm-app-api-annotation-manager>> for information on the privileges required to use this API endpoint.
+.Expand for required headers, privileges, and usage details
+[%collapsible%closed]
+======
+include::api.asciidoc[tag=using-the-APIs]
+======
 
 ////
 *******************************************************
@@ -374,19 +418,20 @@ While you can add additional tags, you cannot remove the `apm` tag.
 
 The following example creates an annotation for a service named `opbeans-java`.
 
-[source,console]
+[source,curl]
 --------------------------------------------------
-POST /api/apm/services/opbeans-java/annotation
-{
-	"@timestamp": "2020-05-08T10:31:30.452Z",
-	"service": {
-		"version": "1.2"
-	},
-	"message": "Deployment 1.2",
-	"tags": [
-		"elastic.co", "customer"
-	]
-}
+curl -X POST \
+  http://localhost:5601/api/apm/services/opbeans-java/annotation \
+-H 'Content-Type: application/json' \
+-H 'kbn-xsrf: true' \
+-H 'Authorization: Basic YhUlubWZhM0FDbnlQeE6WRtaW49FQmSGZ4RUWXdX' \
+-d '{
+      "@timestamp": "2020-05-08T10:31:30.452Z",
+      "service": {
+        "version": "1.2"
+      },
+      "message": "Deployment 1.2"
+    }'
 --------------------------------------------------
 
 [[apm-annotation-config-body]]

docs/apm/deployment-annotations.asciidoc

@@ -18,7 +18,7 @@ Alternatively, you can explicitly create deployment annotations with our annotat
 The API can integrate into your CI/CD pipeline,
 so that each time you deploy, a POST request is sent to the annotation API endpoint:
 
-[source,console]
+[source,curl]
 ----
 curl -X POST \
   http://localhost:5601/api/apm/services/${SERVICE_NAME}/annotation \ <1>

docs/apm/machine-learning.asciidoc

@@ -1,6 +1,6 @@
 [role="xpack"]
 [[machine-learning-integration]]
-=== Machine Learning integration
+===  integration
 
 ++++
 <titleabbrev>Integrate with machine learning</titleabbrev>

docs/apm/transactions.asciidoc

@@ -64,7 +64,7 @@ The transaction overview page is customized for the JavaScript RUM Agent.
 This page highlights things like *page load times*, *transactions per minute*, and even the *average page load duration distribution by country*.
 
 [role="screenshot"]
-image::apm/images/apm-geo-ui.jpg[average page load duration distribution]
+image::apm/images/apm-geo-ui.png[average page load duration distribution]
 
 This data is available due to the geo-ip and user agent pipelines being enabled by default,
 which allows for the capture of geo-location and user agent data.

docs/canvas/canvas-tutorial.asciidoc

@@ -14,7 +14,7 @@ For this tutorial, you'll need to add the <<add-sample-data, Sample eCommerce or
 
 Your first step to working with Canvas is to create a workpad.
 
-. Open the menu, then click *Kibana > Canvas*.
+. Open the menu, then go to *Canvas*.
 
 . On the *Canvas workpads* page, click *Create workpad*.