Merge branch 'master' into alert-state-change-toast

.ci/Jenkinsfile_flaky

@@ -70,6 +70,8 @@ def getWorkerFromParams(isXpack, job, ciGroup) {
           "run `node scripts/mocha`"
         )
       })
+    } else if (job == 'accessibility') {
+      return kibanaPipeline.functionalTestProcess('kibana-accessibility', './test/scripts/jenkins_accessibility.sh')
     } else if (job == 'firefoxSmoke') {
       return kibanaPipeline.functionalTestProcess('firefoxSmoke', './test/scripts/jenkins_firefox_smoke.sh')
     } else if(job == 'visualRegression') {
@@ -79,7 +81,9 @@ def getWorkerFromParams(isXpack, job, ciGroup) {
     }
   }
 
-  if (job == 'firefoxSmoke') {
+  if (job == 'accessibility') {
+    return kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh')
+  } else if (job == 'firefoxSmoke') {
     return kibanaPipeline.functionalTestProcess('xpack-firefoxSmoke', './test/scripts/jenkins_xpack_firefox_smoke.sh')
   } else if(job == 'visualRegression') {
     return kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh')

.ci/es-snapshots/Jenkinsfile_verify_es

@@ -22,8 +22,8 @@ def SNAPSHOT_MANIFEST = "https://storage.googleapis.com/kibana-ci-es-snapshots-d
 kibanaPipeline(timeoutMinutes: 150) {
   catchErrors {
     slackNotifications.onFailure(
-      title: ":broken_heart: *<${env.BUILD_URL}|[${SNAPSHOT_VERSION}] ES Snapshot Verification Failure>*",
-      message: ":broken_heart: [${SNAPSHOT_VERSION}] ES Snapshot Verification Failure",
+      title: "*<${env.BUILD_URL}|[${SNAPSHOT_VERSION}] ES Snapshot Verification Failure>*",
+      message: "[${SNAPSHOT_VERSION}] ES Snapshot Verification Failure",
     ) {
       retryable.enable(2)
       withEnv(["ES_SNAPSHOT_MANIFEST=${SNAPSHOT_MANIFEST}"]) {

.eslintignore

@@ -3,6 +3,7 @@
 /.es
 /build
 /built_assets
+/config/apm.dev.js
 /data
 /html_docs
 /optimize
@@ -25,7 +26,8 @@ target
 /src/plugins/vis_type_timelion/public/_generated_/**
 /src/plugins/vis_type_timelion/public/webpackShims/jquery.flot.*
 /x-pack/legacy/plugins/**/__tests__/fixtures/**
-/x-pack/plugins/apm/e2e/cypress/**/snapshots.js
+/x-pack/plugins/apm/e2e/**/snapshots.js
+/x-pack/plugins/apm/e2e/tmp/*
 /x-pack/plugins/canvas/canvas_plugin
 /x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts
 /x-pack/plugins/canvas/shareable_runtime/build

.github/CODEOWNERS

@@ -6,10 +6,7 @@
 /x-pack/plugins/dashboard_enhanced/ @elastic/kibana-app
 /x-pack/plugins/lens/ @elastic/kibana-app
 /x-pack/plugins/graph/ @elastic/kibana-app
-/src/legacy/server/url_shortening/ @elastic/kibana-app
-/src/legacy/server/sample_data/ @elastic/kibana-app
 /src/legacy/core_plugins/kibana/public/local_application_service/ @elastic/kibana-app
-/src/legacy/core_plugins/kibana/public/dev_tools/ @elastic/kibana-app
 /src/plugins/dashboard/ @elastic/kibana-app
 /src/plugins/discover/ @elastic/kibana-app
 /src/plugins/input_control_vis/ @elastic/kibana-app
@@ -158,7 +155,6 @@
 /x-pack/legacy/plugins/security/  @elastic/kibana-security
 /x-pack/legacy/plugins/spaces/  @elastic/kibana-security
 /x-pack/plugins/spaces/  @elastic/kibana-security
-/x-pack/legacy/plugins/encrypted_saved_objects/  @elastic/kibana-security
 /x-pack/plugins/encrypted_saved_objects/  @elastic/kibana-security
 /x-pack/plugins/security/  @elastic/kibana-security
 /x-pack/test/api_integration/apis/security/ @elastic/kibana-security

.gitignore

@@ -44,8 +44,8 @@ package-lock.json
 *.sublime-*
 npm-debug.log*
 .tern-project
-x-pack/plugins/apm/tsconfig.json
-apm.tsconfig.json
-/x-pack/legacy/plugins/apm/e2e/snapshots.js
-/x-pack/plugins/apm/e2e/snapshots.js
 .nyc_output
+
+# apm plugin
+/x-pack/plugins/apm/tsconfig.json
+apm.tsconfig.json

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)
@@ -414,7 +432,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).
 
@@ -467,10 +485,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.
@@ -501,13 +519,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:
 
@@ -540,7 +558,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.
 
@@ -567,7 +585,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.
 
@@ -578,7 +596,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:
 
@@ -595,11 +613,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.
@@ -610,7 +628,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.
 

config/kibana.yml

@@ -90,7 +90,7 @@
 # Specifies the path where Kibana creates the process ID file.
 #pid.file: /var/run/kibana.pid
 
-# Enables you specify a file where Kibana stores log output.
+# Enables you to specify a file where Kibana stores log output.
 #logging.dest: stdout
 
 # Set the value of this setting to true to suppress all logging output.

docs/api/saved-objects/bulk_get.asciidoc

@@ -35,7 +35,7 @@ experimental[] Retrieve multiple {kib} saved objects by ID.
 ==== Response body
 
 `saved_objects`::
-  (array) Top-level property the contains objects that represent the response for each of the requested objects. The order of the objects in the response is identical to the order of the objects in the request.
+  (array) Top-level property containing objects that represent the response for each of the requested objects. The order of the objects in the response is identical to the order of the objects in the request.
 
 Saved objects that are unable to persist are replaced with an error object.
 

docs/apm/api.asciidoc

@@ -11,6 +11,12 @@ Some APM app features are provided via a REST API:
 * <<agent-config-api>>
 * <<apm-annotation-api>>
 
+[float]
+[[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`.
 Here's an example CURL request that adds an annotation to the APM app:
 
 [source,curl]
@@ -32,16 +38,8 @@ curl -X POST \
     }'
 ----
 
-For more information, the Kibana <<api,REST API reference>> provides information on how to use Kibana APIs,
-like required request headers and authentication options.
-
-// AGENT CONFIG API
-// GET --> Feature (APM) Read
-// CREATE/EDIT/DELETE --> Feature (APM) All
-
-// ANNOTATION API
-// Feature (APM) All
-// Index: `observability-annotations`. Privileges: `create_index`, `create_doc`, `manage`, and `read`.
+The Kibana <<api,REST API reference>> provides additional information on how to use Kibana APIs,
+required request headers, and token-based authentication options.
 
 ////
 *******************************************************
@@ -61,6 +59,8 @@ 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.
+
 ////
 *******************************************************
 ////
@@ -327,6 +327,8 @@ The following APIs are available:
 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`.
 
+See <<apm-app-api-annotation-manager>> for information on the privileges required to use this API endpoint.
+
 ////
 *******************************************************
 ////