Merge branch 'master' into apm-59786-remove-service-maps-update-popup

.eslintrc.js

@@ -322,6 +322,7 @@ module.exports = {
         'x-pack/test/functional/apps/**/*.js',
         'x-pack/legacy/plugins/apm/**/*.js',
         'test/*/config.ts',
+        'test/*/config_open.ts',
         'test/*/{tests,test_suites,apis,apps}/**/*',
         'test/visual_regression/tests/**/*',
         'x-pack/test/*/{tests,test_suites,apis,apps}/**/*',

docs/apm/advanced-queries.asciidoc

@@ -5,7 +5,7 @@ When querying in the APM app, you're simply searching and selecting data from fi
 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.
 
-In the screenshot below, you can begin to see some of the transaction fields available for filtering on:
+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]

docs/apm/spans.asciidoc

@@ -12,12 +12,12 @@ This makes it useful for visualizing where the selected transaction spent most o
 image::apm/images/apm-transaction-sample.png[Example of distributed trace colors in the APM app in Kibana]
 
 View a span in detail by clicking on it in the timeline waterfall.
-For example, in the below screenshot we've clicked on an SQL Select database query.
-The information displayed includes the actual SQL that was executed, how long it took,
+When you click on an SQL Select database query,
+the information displayed includes the actual SQL that was executed, how long it took,
 and the percentage of the trace's total time.
 You also get a stack trace, which shows the SQL query in your code.
 Finally, APM knows which files are your code and which are just modules or libraries that you've installed.
-These library frames will be minimized by default in order to show you the most relevant stack trace. 
+These library frames will be minimized by default in order to show you the most relevant stack trace.
 
 [role="screenshot"]
 image::apm/images/apm-span-detail.png[Example view of a span detail in the APM app in Kibana]

docs/apm/transactions.asciidoc

@@ -50,7 +50,7 @@ If there's a particular endpoint you're worried about, you can click on it to vi
 [IMPORTANT]
 ====
 If you only see one route in the Transactions table, or if you have transactions named "unknown route",
-it could be a symptom that the agent either wasn't installed correctly or doesn't support your framework. 
+it could be a symptom that the agent either wasn't installed correctly or doesn't support your framework.
 
 For further details, including troubleshooting and custom implementation instructions,
 refer to the documentation for each {apm-agents-ref}[APM Agent] you've implemented.
@@ -103,9 +103,7 @@ The number of requests per bucket is displayed when hovering over the graph, and
 [role="screenshot"]
 image::apm/images/apm-transaction-duration-dist.png[Example view of transactions duration distribution graph]
 
-Let's look at an example.
-In the screenshot below,
-you'll notice most of the requests fall into buckets on the left side of the graph,
+Most of the requests fall into buckets on the left side of the graph,
 with a long tail of smaller buckets to the right.
 This is a typical distribution, and indicates most of our requests were served quickly - awesome!
 It's the requests on the right, the ones taking longer than average, that we probably want to focus on.
@@ -133,4 +131,4 @@ For a particular transaction sample, we can get even more information in the *me
 * Custom - You can configure your agent to add custom contextual information on transactions.
 
 TIP: All of this data is stored in documents in Elasticsearch.
-This means you can select "Actions - View sample document" to see the actual Elasticsearch document under the discover tab.
+This means you can select "Actions - View sample document" to see the actual Elasticsearch document under the discover tab.