Merge remote-tracking branch 'upstream/master' into config_tsvb

# Conflicts:
#	src/legacy/core_plugins/vis_type_timeseries/index.ts
#	x-pack/legacy/plugins/rollup/server/plugin.ts

Author: alexwizp

.eslintrc.js

@@ -109,7 +109,7 @@ module.exports = {
       },
     },
     {
-      files: ['x-pack/legacy/plugins/lens/**/*.{js,ts,tsx}'],
+      files: ['x-pack/plugins/lens/**/*.{js,ts,tsx}'],
       rules: {
         'react-hooks/exhaustive-deps': 'off',
         'react-hooks/rules-of-hooks': 'off',
@@ -728,7 +728,7 @@ module.exports = {
      * Lens overrides
      */
     {
-      files: ['x-pack/legacy/plugins/lens/**/*.{ts,tsx}', 'x-pack/plugins/lens/**/*.{ts,tsx}'],
+      files: ['x-pack/plugins/lens/**/*.{ts,tsx}'],
       rules: {
         '@typescript-eslint/no-explicit-any': 'error',
       },

.github/CODEOWNERS

@@ -3,22 +3,22 @@
 # For more info, see https://help.github.com/articles/about-codeowners/
 
 # App
-/x-pack/legacy/plugins/lens/ @elastic/kibana-app
-/x-pack/legacy/plugins/graph/ @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/dashboard/ @elastic/kibana-app
 /src/legacy/core_plugins/kibana/public/discover/ @elastic/kibana-app
 /src/legacy/core_plugins/kibana/public/visualize/ @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/legacy/core_plugins/metrics/ @elastic/kibana-app
 /src/legacy/core_plugins/vis_type_vislib/ @elastic/kibana-app
-/src/legacy/core_plugins/vis_type_xy/ @elastic/kibana-app
+/src/plugins/vis_type_xy/ @elastic/kibana-app
 /src/plugins/kibana_legacy/ @elastic/kibana-app
 /src/plugins/timelion/ @elastic/kibana-app
 /src/plugins/dashboard/ @elastic/kibana-app
 /src/plugins/discover/ @elastic/kibana-app
+/src/plugins/vis_type_timeseries/ @elastic/kibana-app
 
 # Core UI
 # Exclude tutorials folder for now because they are not owned by Kibana app and most will move out soon
@@ -95,6 +95,7 @@
 
 # Maps
 /x-pack/legacy/plugins/maps/ @elastic/kibana-gis
+/x-pack/plugins/maps/ @elastic/kibana-gis
 /x-pack/test/api_integration/apis/maps/ @elastic/kibana-gis
 /x-pack/test/functional/apps/maps/ @elastic/kibana-gis
 /x-pack/test/functional/es_archives/maps/ @elastic/kibana-gis
@@ -180,7 +181,7 @@
 /src/plugins/console/  @elastic/es-ui
 /src/plugins/es_ui_shared/  @elastic/es-ui
 /x-pack/legacy/plugins/cross_cluster_replication/  @elastic/es-ui
-/x-pack/legacy/plugins/index_lifecycle_management/  @elastic/es-ui
+/x-pack/plugins/index_lifecycle_management/  @elastic/es-ui
 /x-pack/legacy/plugins/index_management/  @elastic/es-ui
 /x-pack/legacy/plugins/license_management/  @elastic/es-ui
 /x-pack/legacy/plugins/rollup/  @elastic/es-ui
@@ -202,7 +203,8 @@
 # Endpoint
 /x-pack/plugins/endpoint/ @elastic/endpoint-app-team
 /x-pack/test/api_integration/apis/endpoint/ @elastic/endpoint-app-team
-/x-pack/test/functional/apps/endpoint/ @elastic/endpoint-app-team
+/x-pack/test/functional_endpoint/ @elastic/endpoint-app-team
+/x-pack/test/functional_endpoint_ingest_failure/ @elastic/endpoint-app-team
 /x-pack/test/functional/es_archives/endpoint/ @elastic/endpoint-app-team
 
 # SIEM

.i18nrc.json

@@ -24,6 +24,7 @@
       "src/legacy/core_plugins/management",
       "src/plugins/management"
     ],
+    "maps_legacy": "src/plugins/maps_legacy",
     "indexPatternManagement": "src/plugins/index_pattern_management",
     "advancedSettings": "src/plugins/advanced_settings",
     "kibana_legacy": "src/plugins/kibana_legacy",

.sass-lint.yml

@@ -8,10 +8,11 @@ files:
     - 'x-pack/legacy/plugins/security/**/*.s+(a|c)ss'
     - 'x-pack/legacy/plugins/canvas/**/*.s+(a|c)ss'
     - 'x-pack/plugins/triggers_actions_ui/**/*.s+(a|c)ss'
+    - 'x-pack/plugins/lens/**/*.s+(a|c)ss'
+    - 'x-pack/legacy/plugins/maps/**/*.s+(a|c)ss'
+    - 'x-pack/plugins/maps/**/*.s+(a|c)ss'
   ignore:
     - 'x-pack/legacy/plugins/canvas/shareable_runtime/**/*.s+(a|c)ss'
-    - 'x-pack/legacy/plugins/lens/**/*.s+(a|c)ss'
-    - 'x-pack/legacy/plugins/maps/**/*.s+(a|c)ss'
 rules:
   quotes:
     - 2

docs/api/saved-objects/bulk_create.asciidoc

@@ -104,7 +104,7 @@ The API returns the following:
       "type": "dashboard",
       "error": {
         "statusCode": 409,
-        "message": "version conflict, document already exists"
+        "message": "Saved object [dashboard/be3733a0-9efe-11e7-acb3-3dab96693fab] conflict"
       }
     }
   ]

docs/apm/advanced-queries.asciidoc

@@ -1,14 +1,11 @@
+[role="xpack"]
 [[advanced-queries]]
-=== Advanced queries
+=== Query your data
 
-When querying in the APM app, you're simply searching and selecting data from fields in Elasticsearch documents.
-Queries entered into the query bar are also added as parameters to the URL,
-so it's easy to share a specific query or view with others.
-
-You can begin to see some of the transaction fields available for filtering:
-
-[role="screenshot"]
-image::apm/images/apm-query-bar.png[Example of the Kibana Query bar in APM app in Kibana]
+Querying your APM data is a powerful tool that can make finding bottlenecks in your code even easier.
+Imagine you have a user that complains about a slow response time in a specific service.
+With the query bar, you can easily filter the APM app to only display trace data for that user,
+or, to only show transactions that are slower than a specified time threshold.
 
 [float]
 ==== Example APM app queries
@@ -17,23 +14,32 @@ image::apm/images/apm-query-bar.png[Example of the Kibana Query bar in APM app i
 * Filter by response status code: `context.response.status_code >= 400`
 * Filter by single user ID: `context.user.id : 12`
 
+When querying in the APM app, you're merely searching and selecting data from fields in Elasticsearch documents.
+Queries entered into the query bar are also added as parameters to the URL,
+so it's easy to share a specific query or view with others.
+
+When you type, you can begin to see some of the transaction fields available for filtering:
+
+[role="screenshot"]
+image::apm/images/apm-query-bar.png[Example of the Kibana Query bar in APM app in Kibana]
+
 TIP: Read the {kibana-ref}/kuery-query.html[Kibana Query Language Enhancements] documentation to learn more about the capabilities of the {kib} query language.
 
 [float]
 [[discover-advanced-queries]]
 === Querying in Discover
 
-It may also be helpful to view your APM data in {kibana-ref}/discover.html[*Discover*].
+Alternatively, you can query your APM documents in {kibana-ref}/discover.html[*Discover*].
 Querying documents in *Discover* works the same way as querying in the APM app,
-and all of the example APM app queries can also be used in *Discover*.
+and *Discover* supports all of the example APM app queries shown on this page.
 
 [float]
 ==== Example Discover query
 
 One example where you may want to make use of *Discover*,
 is for viewing  _all_ transactions for an endpoint, instead of just a sample.
 
-TIP: Starting in v7.6, you can view 10 samples per bucket in the APM app, instead of just one.
+TIP: Starting in v7.6, you can view ten samples per bucket in the APM app, instead of just one.
 
 Use the APM app to find a transaction name and time bucket that you're interested in learning more about.
 Then, switch to *Discover* and make a search:

docs/apm/agent-configuration.asciidoc

@@ -1,42 +1,45 @@
 [role="xpack"]
 [[agent-configuration]]
-=== APM Agent configuration
+=== APM Agent central configuration
 
-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.
+++++
+<titleabbrev>Configure APM agents with central config</titleabbrev>
+++++
 
-To get started, simply choose the services and environments you wish to configure.
-The APM app will let you know when your configurations have been applied by your agents.
+APM Agent configuration allows you to fine-tune your agent configuration from within the APM app.
+Changes are automatically propagated to your APM agents, so there's no need to redeploy.
+
+To get started, choose the services and environments you wish to configure.
+The APM app will let you know when your agents have applied your configurations.
 
 [role="screenshot"]
 image::apm/images/apm-agent-configuration.png[APM Agent configuration in Kibana]
 
 [float]
 ==== Precedence
 
-Configurations set with APM Agent configuration take precedence over configurations set locally in the Agent.
+Configurations set from the APM app take precedence over configurations set locally in each 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.
+For this reason, it is still essential 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.
+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
 
-Each Agent has its own list of supported configurations.
+Each Agent has a list of supported configurations.
 After selecting a Service name and environment in the APM app,
-a list of all available configuration options,
+a list of all supported configuration options,
 including descriptions and default values, will be displayed.
 
-Supported configurations are also marked in each Agent's configuration documentation:
+Supported configurations are also tagged with the image:./images/dynamic-config.svg[] badge in each Agent's configuration reference:
 
 [horizontal]
 Go Agent:: {apm-go-ref}/configuration.html[Configuration reference]

docs/apm/api.asciidoc

@@ -1,6 +1,10 @@
 [role="xpack"]
 [[apm-api]]
-== API
+== APM app API
+
+++++
+<titleabbrev>REST API</titleabbrev>
+++++
 
 Some APM app features are provided via a REST API:
 

docs/apm/apm-alerts.asciidoc

@@ -0,0 +1,101 @@
+[role="xpack"]
+[[apm-alerts]]
+=== Alerts
+
+++++
+<titleabbrev>Create an alert</titleabbrev>
+++++
+
+beta::[]
+
+The APM app integrates with Kibana's {kibana-ref}/alerting-getting-started.html[alerting and actions] feature.
+It provides a set of built-in **actions** and APM specific threshold **alerts** for you to use
+and enables central management of all alerts from <<management,Kibana Management>>.
+
+[role="screenshot"]
+image::apm/images/apm-alert.png[Create an alert in the APM app]
+
+There are two different types of threshold alerts: transaction duration, and error rate.
+Below, we'll create one of each.
+
+[float]
+[[apm-create-transaction-alert]]
+=== Create a transaction duration alert
+
+This guide creates an alert for the `opbeans-java` service based on the following criteria:
+
+* Transaction type: `transaction.type:request`
+* Average request is above `1500ms` for the last 5 minutes
+* Check every 10 minutes, and repeat the alert every 30 minutes
+* Send the alert via Slack
+
+From the APM app, navigate to the `opbeans-java` service and select
+**Alerts** > **Create threshold alert** > **Transaction duration**.
+
+`Transaction duration | opbeans-java` is automatically set as the name of the alert,
+and `apm` and `service.name:opbeans-java` are added as tags.
+It's fine to change the name of the alert, but do not edit the tags.
+
+Based on the alert criteria, define the following alert details:
+
+* **Check every** - `10 minutes`
+* **Notify every** - `30 minutes`
+* **TYPE** - `request`
+* **WHEN** - `avg`
+* **IS ABOVE** - `1500ms`
+* **FOR THE LAST** - `5 minutes`
+
+Select an action type.
+Multiple action types can be selected, but in this example, we want to post to a Slack channel.
+Select **Slack** > **Create a connector**.
+Enter a name for the connector,
+and paste the webhook URL.
+See Slack's webhook documentation if you need to create one.
+
+Select **Save**. The alert has been created and is now active!
+
+[float]
+[[apm-create-error-alert]]
+=== Create an error rate alert
+
+This guide creates an alert for the `opbeans-python` service based on the following criteria:
+
+* Error rate is above 25 for the last minute
+* Check every 1 minute, and repeat the alert every 10 minutes
+* Send the alert via email to the `opbeans-python` team
+
+From the APM app, navigate to the `opbeans-python` service and select
+**Alerts** > **Create threshold alert** > **Error rate**.
+
+`Error rate | opbeans-python` is automatically set as the name of the alert,
+and `apm` and `service.name:opbeans-python` are added as tags.
+It's fine to change the name of the alert, but do not edit the tags.
+
+Based on the alert criteria, define the following alert details:
+
+* **Check every** - `1 minute`
+* **Notify every** - `10 minutes`
+* **IS ABOVE** - `25 errors`
+* **FOR THE LAST** - `1 minute`
+
+Select the **Email** action type and click **Create a connector**.
+Fill out the required details: sender, host, port, etc., and click **save**.
+
+Select **Save**. The alert has been created and is now active!
+
+[float]
+[[apm-alert-manage]]
+=== Manage alerts and actions
+
+From the APM app, select **Alerts** > **View active alerts** to be taken to the Kibana alerts and actions management page.
+From this page, you can create, edit, disable, mute, and delete alerts, and create, edit, and disable connectors.
+
+[float]
+[[apm-alert-more-info]]
+=== More information
+
+See {kibana-ref}/alerting-getting-started.html[alerting and actions] for more information.
+
+NOTE: If you are using an **on-premise** Elastic Stack deployment with security,
+communication between Elasticsearch and Kibana must have TLS configured.
+More information is in the alerting {kibana-ref}/alerting-getting-started.html#alerting-setup-prerequisites[prerequisites].