Skip to content

Commit ed1ac18

Browse files
authored
[7.3][docs] Documentation backports (#2688)
1 parent ad79b57 commit ed1ac18

File tree

4 files changed

+18
-3
lines changed

4 files changed

+18
-3
lines changed

docs/configuration-rum.asciidoc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ apm-server.rum.event_rate.lru_size: 1000
1313
apm-server.rum.allow_origins: ['*']
1414
apm-server.rum.library_pattern: "node_modules|bower_components|~"
1515
apm-server.rum.exclude_from_grouping: "^/webpack"
16+
apm-server.rum.source_mapping.enabled: true
1617
apm-server.rum.source_mapping.cache.expiration: 5m
1718
apm-server.rum.source_mapping.index_pattern: "apm-*-sourcemap*"
1819
----
@@ -64,6 +65,12 @@ RegExp to be matched against a stacktrace frame's `file_name`.
6465
If the RegExp matches, the stacktrace frame is excluded from being used for calculating error groups.
6566
The default pattern excludes stacktrace frames that have a filename starting with `/webpack`.
6667

68+
[[config-sourcemapping-enabled]]
69+
[float]
70+
==== `source_mapping.enabled`
71+
Used to enable/disable <<sourcemaps,sourcemapping>> for RUM events.
72+
Defaults to `true`.
73+
6774
[[config-sourcemapping-elasticsearch]]
6875
[float]
6976
==== `source_mapping.elasticsearch`

docs/guide/agent-server-compatibility.asciidoc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,18 @@ The chart below outlines the compatibility between different versions of the APM
1616

1717
// .NET
1818
.1+|**.NET Agent**
19-
|`1.0.0-beta1` |>= `6.5`
19+
|`1.x` |>= `6.5`
2020

2121
// Node
2222
.2+|**Node.js Agent**
2323
|`1.x` |`6.2`-`6.x`
2424
|`2.x` |>= `6.5`
2525

2626
// Python
27-
.2+|**Python Agent**
27+
.3+|**Python Agent**
2828
|`2.x`, `3.x` |`6.2`-`6.x`
2929
|`4.x` |>= `6.5`
30+
|`5.x` |>= `6.6`
3031

3132
// Ruby
3233
.2+|**Ruby Agent**

docs/rum.asciidoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ A source map library helps by mapping the minified files back to the the origina
1515

1616
APM Server provides a <<sourcemap-api,Source Map API>> for uploading source maps.
1717

18-
Source maps are then automatically applied to all incoming transactions and errors.
18+
By default, <<config-sourcemapping-enabled>> is set to `true`.
19+
This means if a source map has previously been uploaded,
20+
source mapping will automatically be applied all incoming transactions and errors.
1921

2022
Source maps are cached in memory for as long as the <<rum-sourcemap-cache,cache expiration>> setting indicates.
2123

docs/version.asciidoc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
// stack-version can be: 7.0.1, 8.0.0-alpha1, 8.1.0, etc.
2+
// major-version can be: 8.x, 7.x, 6.x, etc.
3+
// doc-branch can be: master, 8.0, 8.1, etc.
4+
// release-state is only: released | prerelease | unreleased
5+
16
:stack-version: 7.3.1
27
:major-version: 7.x
38
:doc-branch: 7.3

0 commit comments

Comments
 (0)