Skip to content

Commit b71b05c

Browse files
committed
Merge remote-tracking branch 'upstream/master' into alerting-ui-webhook-body-variables
# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
2 parents 680eb60 + 7fa5c2f commit b71b05c

File tree

421 files changed

+16371
-4658
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

421 files changed

+16371
-4658
lines changed

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,7 @@ module.exports = {
322322
'x-pack/test/functional/apps/**/*.js',
323323
'x-pack/legacy/plugins/apm/**/*.js',
324324
'test/*/config.ts',
325+
'test/*/config_open.ts',
325326
'test/*/{tests,test_suites,apis,apps}/**/*',
326327
'test/visual_regression/tests/**/*',
327328
'x-pack/test/*/{tests,test_suites,apis,apps}/**/*',

docs/apm/advanced-queries.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ When querying in the APM app, you're simply searching and selecting data from fi
55
Queries entered into the query bar are also added as parameters to the URL,
66
so it's easy to share a specific query or view with others.
77

8-
In the screenshot below, you can begin to see some of the transaction fields available for filtering on:
8+
You can begin to see some of the transaction fields available for filtering:
99

1010
[role="screenshot"]
1111
image::apm/images/apm-query-bar.png[Example of the Kibana Query bar in APM app in Kibana]

docs/apm/spans.asciidoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ This makes it useful for visualizing where the selected transaction spent most o
1212
image::apm/images/apm-transaction-sample.png[Example of distributed trace colors in the APM app in Kibana]
1313

1414
View a span in detail by clicking on it in the timeline waterfall.
15-
For example, in the below screenshot we've clicked on an SQL Select database query.
16-
The information displayed includes the actual SQL that was executed, how long it took,
15+
When you click on an SQL Select database query,
16+
the information displayed includes the actual SQL that was executed, how long it took,
1717
and the percentage of the trace's total time.
1818
You also get a stack trace, which shows the SQL query in your code.
1919
Finally, APM knows which files are your code and which are just modules or libraries that you've installed.
20-
These library frames will be minimized by default in order to show you the most relevant stack trace.
20+
These library frames will be minimized by default in order to show you the most relevant stack trace.
2121

2222
[role="screenshot"]
2323
image::apm/images/apm-span-detail.png[Example view of a span detail in the APM app in Kibana]

docs/apm/transactions.asciidoc

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ If there's a particular endpoint you're worried about, you can click on it to vi
5050
[IMPORTANT]
5151
====
5252
If you only see one route in the Transactions table, or if you have transactions named "unknown route",
53-
it could be a symptom that the agent either wasn't installed correctly or doesn't support your framework.
53+
it could be a symptom that the agent either wasn't installed correctly or doesn't support your framework.
5454
5555
For further details, including troubleshooting and custom implementation instructions,
5656
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
103103
[role="screenshot"]
104104
image::apm/images/apm-transaction-duration-dist.png[Example view of transactions duration distribution graph]
105105

106-
Let's look at an example.
107-
In the screenshot below,
108-
you'll notice most of the requests fall into buckets on the left side of the graph,
106+
Most of the requests fall into buckets on the left side of the graph,
109107
with a long tail of smaller buckets to the right.
110108
This is a typical distribution, and indicates most of our requests were served quickly - awesome!
111109
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
133131
* Custom - You can configure your agent to add custom contextual information on transactions.
134132

135133
TIP: All of this data is stored in documents in Elasticsearch.
136-
This means you can select "Actions - View sample document" to see the actual Elasticsearch document under the discover tab.
134+
This means you can select "Actions - View sample document" to see the actual Elasticsearch document under the discover tab.

0 commit comments

Comments
 (0)