Merge branch 'master' of github.com:elastic/kibana into feature-integ…

…rations-manager

.browserslistrc

@@ -1,3 +1,3 @@
 last 2 versions
 > 5%
-Safari 7
+Safari 7 # for PhantomJS support: https://github.com/elastic/kibana/issues/27136

CONTRIBUTING.md

@@ -372,10 +372,11 @@ The following table outlines possible test file locations and how to invoke them
 
 | Test runner        | Test location                                                                                                                                           | Runner command (working directory is kibana root)                                       |
 | -----------------  | ------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- |
-| Jest               | `src/**/*.test.js`<br>`src/**/*.test.ts`                                                                                                                | `node scripts/jest -t regexp [test path]`                                                  |
+| Jest               | `src/**/*.test.js`<br>`src/**/*.test.ts`                                                                                                                | `node scripts/jest -t regexp [test path]`                                               |
 | Jest (integration) | `**/integration_tests/**/*.test.js`                                                                                                                     | `node scripts/jest_integration -t regexp [test path]`                                   |
-| Mocha              | `src/**/__tests__/**/*.js`<br>`packages/kbn-datemath/test/**/*.js`<br>`packages/kbn-dev-utils/src/**/__tests__/**/*.js`<br>`tasks/**/__tests__/**/*.js` | `node scripts/mocha --grep=regexp [test path]`                                          |
+| Mocha              | `src/**/__tests__/**/*.js`<br>`!src/**/public/__tests__/*.js`<br>`packages/kbn-datemath/test/**/*.js`<br>`packages/kbn-dev-utils/src/**/__tests__/**/*.js`<br>`tasks/**/__tests__/**/*.js` | `node scripts/mocha --grep=regexp [test path]`       |
 | Functional         | `test/*integration/**/config.js`<br>`test/*functional/**/config.js`                                                                                     | `node scripts/functional_tests_server --config test/[directory]/config.js`<br>`node scripts/functional_test_runner --config test/[directory]/config.js --grep=regexp`       |
+| Karma              | `src/**/public/__tests__/*.js`                                                                                                                          | `npm run test:dev`                                                                      |
 
 For X-Pack tests located in `x-pack/` see [X-Pack Testing](x-pack/README.md#testing)
 

bin/kibana

@@ -21,4 +21,4 @@ if [ ! -x "$NODE" ]; then
   exit 1
 fi
 
-NODE_ENV=production BROWSERSLIST_IGNORE_OLD_DATA=true exec "${NODE}" --no-warnings --max-http-header-size=65536 $NODE_OPTIONS "${DIR}/src/cli" ${@}
+NODE_ENV=production exec "${NODE}" --no-warnings --max-http-header-size=65536 $NODE_OPTIONS "${DIR}/src/cli" ${@}

docs/api/spaces-management/post.asciidoc

@@ -32,7 +32,7 @@ The following parameters can be specified in the body of a POST request to creat
 `initials`:: (string) Optionally specify the initials shown in the Space Avatar for this space. By default, the initials will be automatically generated from the space name.
 If specified, initials should be either 1 or 2 characters.
 
-`color`:: (string) Optioanlly specify the hex color code used in the Space Avatar for this space. By default, the color will be automatically generated from the space name.
+`color`:: (string) Optionally specify the hex color code used in the Space Avatar for this space. By default, the color will be automatically generated from the space name.
 
 ===== Example
 

docs/api/upgrade-assistant.asciidoc

@@ -2,7 +2,7 @@
 [[upgrade-assistant-api]]
 == Upgrade Assistant API
 
-experimental[This API is *experimental* and may be changed or removed completely in a future release. The underlying Upgrade Assistant concepts are stable, but the APIs for managing Upgrade Assistant are currently experimental.]
+experimental["This API is *experimental* and may be changed or removed completely in a future release. The underlying Upgrade Assistant concepts are stable, but the APIs for managing Upgrade Assistant are currently experimental."]
 
 The Upgrade Assistant API allows you to check the upgrade status of your Elasticsearch cluster
 and reindex indices that were created in the previous major version. The assistant helps you prepare

docs/api/upgrade-assistant/reindexing.asciidoc

@@ -1,7 +1,7 @@
 [[upgrade-assistant-api-reindexing]]
 === Reindex API
 
-experimental[This API is *experimental* and may be changed or removed completely in a future release. The underlying Upgrade Assistant concepts are stable, but the APIs for managing Upgrade Assistant are currently experimental.]
+experimental["This API is *experimental* and may be changed or removed completely in a future release. The underlying Upgrade Assistant concepts are stable, but the APIs for managing Upgrade Assistant are currently experimental."]
 
 When checking the upgrade status, some indices will have the `reindex` paramaeter set to `true`. You can use this Reindexing API to reindex these indices.
 

docs/api/upgrade-assistant/status.asciidoc

@@ -1,7 +1,7 @@
 [[upgrade-assistant-api-status]]
 === Upgrade Readiness Status
 
-experimental[This API is *experimental* and may be changed or removed completely in a future release. The underlying Upgrade Assistant concepts are stable, but the APIs for managing Upgrade Assistant are currently experimental.]
+experimental["This API is *experimental* and may be changed or removed completely in a future release. The underlying Upgrade Assistant concepts are stable, but the APIs for managing Upgrade Assistant are currently experimental."]
 
 ==== Request
 

docs/apm/agent-configuration.asciidoc

@@ -0,0 +1,45 @@
+[role="xpack"]
+[[agent-configuration]]
+=== APM Agent configuration
+
+beta[] APM Agent configuration allows you to fine-tune your agent configuration directly in Kibana.
+Best of all, changes are automatically propagated to your APM agents so there's no need to redeploy.
+
+To get started, simply choose the service and environment you wish to configure.
+
+[role="screenshot"]
+image::apm/images/apm-agent-configuration.png[APM Agent configuration in Kibana]
+
+IMPORTANT: As this feature is in Beta, a limited number of configuration settings are supported.
+We recommend you watch your agent logs to confirm that configuration has been applied.
+If you have feedback, please reach out in our https://discuss.elastic.co/c/apm[Discuss forum].
+
+[float]
+==== Precedence
+
+Configurations set with APM Agent configuration take precedence over configurations set locally in the Agent.
+However, if APM Server is slow to respond, is offline, reports an error, etc.,
+APM agents will use local defaults until they're able to update the configuration.
+For this reason, it is still important to set custom default configurations locally in each of your agents.
+
+[float]
+==== APM Server setup
+
+This feature requires {apm-server-ref}/setup-kibana-endpoint.html[Kibana endpoint configuration] in APM Server.
+
+Why is additional configuration needed in APM Server?
+That's because APM Server acts as a proxy between the agents and Kibana.
+Kibana communicates any changed settings to APM Server so that your agents only need to poll APM Server to determine which settings have changed.
+
+[float]
+==== Supported configurations
+
+[float]
+===== `TRANSACTION_SAMPLE_RATE`
+
+added[7.3.0] A sample rate between `0.000` and `1.0`. Default configuration is `1.0` (100% of traces).
+
+Adjusting the sampling rate controls what percent of requests are traced.
+`1.0` means _all_ requests are traced. If you set the `TRANSACTION_SAMPLE_RATE` to a value below `1.0`,
+the agent will randomly sample only a subset of transactions.
+Unsampled transactions only record the name of the transaction, the overall transaction time, and the result.

docs/apm/using-the-apm-ui.asciidoc

@@ -32,4 +32,6 @@ include::errors.asciidoc[]
 
 include::metrics.asciidoc[]
 
+include::agent-configuration.asciidoc[]
+
 include::advanced-queries.asciidoc[]

docs/canvas.asciidoc

@@ -34,10 +34,4 @@ include::canvas/canvas-workpad.asciidoc[]
 
 include::canvas/canvas-function-reference.asciidoc[]
 
-include::canvas/canvas-common-functions.asciidoc[]
-
-include::canvas/canvas-server-functions.asciidoc[]
-
-include::canvas/canvas-client-functions.asciidoc[]
-
 include::canvas/canvas-tinymath-functions.asciidoc[]