Skip to content

Commit c9ffcbe

Browse files
kibanamachinekibanamachine
authored
Merge branch 'master' into rule-description-empty-mitre-label
2 parents 724b666 + c0eeb86 commit c9ffcbe

481 files changed

Lines changed: 5239 additions & 4528 deletions

File tree

Some content is hidden

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

‎.github/CODEOWNERS‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,10 @@
138138
/x-pack/test/functional/apps/maps/ @elastic/kibana-gis
139139
/x-pack/test/functional/es_archives/maps/ @elastic/kibana-gis
140140
/x-pack/test/visual_regression/tests/maps/index.js @elastic/kibana-gis
141+
/x-pack/plugins/stack_alerts/server/alert_types/geo_containment @elastic/kibana-gis
142+
/x-pack/plugins/stack_alerts/public/alert_types/geo_containment @elastic/kibana-gis
143+
/x-pack/plugins/stack_alerts/server/alert_types/geo_threshold @elastic/kibana-gis
144+
/x-pack/plugins/stack_alerts/public/alert_types/geo_threshold @elastic/kibana-gis
141145
#CC# /src/plugins/maps_legacy/ @elastic/kibana-gis
142146
#CC# /src/plugins/maps_oss/ @elastic/kibana-gis
143147
#CC# /x-pack/plugins/file_upload @elastic/kibana-gis

‎.node-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.15.3
1+
14.15.4

‎.nvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.15.3
1+
14.15.4

‎docs/apm/deployment-annotations.asciidoc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
<titleabbrev>Track deployments with annotations</titleabbrev>
77
++++
88

9+
[role="screenshot"]
10+
image::apm/images/apm-transaction-annotation.png[Example view of transactions annotation in the APM app in Kibana]
11+
912
For enhanced visibility into your deployments, we offer deployment annotations on all transaction charts.
1013
This feature enables you to easily determine if your deployment has increased response times for an end-user,
1114
or if the memory/CPU footprint of your application has changed.
@@ -43,6 +46,3 @@ See the <<apm-annotation-api,annotation API>> reference for more information.
4346

4447

4548
NOTE: If custom annotations have been created for the selected time period, any derived annotations, i.e., those created automatically when `service.version` changes, will not be shown.
46-
47-
[role="screenshot"]
48-
image::apm/images/apm-transaction-annotation.png[Example view of transactions annotation in the APM app in Kibana]

‎docs/apm/errors.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[role="xpack"]
22
[[errors]]
3-
=== Errors overview
3+
=== Errors
44

55
TIP: {apm-overview-ref-v}/errors.html[Errors] are groups of exceptions with a similar exception or log message.
66

‎docs/apm/getting-started.asciidoc‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,20 @@
66
<titleabbrev>Get started</titleabbrev>
77
++++
88

9-
Elastic APM captures different types of information from within instrumented applications:
10-
11-
* *Spans* contain information about the execution of a specific code path.
12-
They measure from the start to end of an activity,
13-
and they can have a parent/child relationship with other spans.
14-
* *Transactions* are a special kind of span;
15-
they are the first span for a particular service and have extra metadata associated with them.
16-
As an example, a transaction could be a request to your server, a batch job, or a custom transaction type.
17-
*Traces* link together related transactions to show an end-to-end performance of how a request was served and which services were part of it.
18-
* *Errors* contain information about the original exception that occurred or about a log created when the exception occurred.
19-
20-
Curated charts and tables display the different types of APM data, which allows you to compare and debug your applications easily.
9+
For a quick, high-level overview of the health and performance of your application,
10+
start with:
2111

2212
* <<services>>
2313
* <<traces>>
14+
* <<service-maps>>
15+
16+
Notice something awry? Select a service or trace and dive deeper with:
17+
18+
* <<service-overview>>
2419
* <<transactions>>
2520
* <<spans>>
2621
* <<errors>>
2722
* <<metrics>>
28-
* <<service-maps>>
2923

3024
TIP: Want to learn more about the Elastic APM ecosystem?
3125
See the {apm-get-started-ref}/overview.html[APM Overview].
@@ -34,12 +28,14 @@ include::services.asciidoc[]
3428

3529
include::traces.asciidoc[]
3630

31+
include::service-maps.asciidoc[]
32+
33+
include::service-overview.asciidoc[]
34+
3735
include::transactions.asciidoc[]
3836

3937
include::spans.asciidoc[]
4038

4139
include::errors.asciidoc[]
4240

4341
include::metrics.asciidoc[]
44-
45-
include::service-maps.asciidoc[]

‎docs/apm/images/apm-agent-configuration.png‎

-20.1 KB
Loading

‎docs/apm/images/apm-alert.png‎

127 KB
Loading

‎docs/apm/images/apm-errors-overview.png‎

12.8 KB
Loading

‎docs/apm/images/apm-geo-ui.png‎

184 KB
Loading

0 commit comments

Comments
 (0)