Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/reference/agent-api.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ It’s possible to call this function multiple times within the scope of the sam
The given `context` argument must be an object and can contain any property that can be JSON encoded.

::::{tip}
Before using custom context, ensure you understand the different types of [metadata](docs-content://solutions/observability/apps/elastic-apm-events-intake-api.md#apm-api-metadata-overview) that are available.
Before using custom context, ensure you understand the different types of [metadata](docs-content://solutions/observability/apm/elastic-apm-events-intake-api.md#apm-api-metadata-overview) that are available.
::::


Expand All @@ -80,7 +80,7 @@ Set labels on transactions and errors. Starting with APM Server 7.6+, the labels
Labels are key/value pairs that are indexed by Elasticsearch and therefore searchable (as opposed to data set via [`apm.setCustomContext()`](#apm-set-custom-context)). You can set multiple labels.

::::{tip}
Before using custom labels, ensure you understand the different types of [metadata](docs-content://solutions/observability/apps/elastic-apm-events-intake-api.md#apm-api-metadata-overview) that are available.
Before using custom labels, ensure you understand the different types of [metadata](docs-content://solutions/observability/apm/elastic-apm-events-intake-api.md#apm-api-metadata-overview) that are available.
::::


Expand Down
4 changes: 2 additions & 2 deletions docs/reference/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ To disable `user-interaction` transactions, add `eventtarget` or `click` to thi

The environment where the service being monitored is deployed, e.g. "production", "development", "test", etc.

Environments allow you to easily filter data on a global level in the APM app. It’s important to be consistent when naming environments across agents. See [environment selector](docs-content://solutions/observability/apps/filter-application-data.md#apm-filter-your-data-service-environment-filter) in the APM app for more information.
Environments allow you to easily filter data on a global level in the APM app. It’s important to be consistent when naming environments across agents. See [environment selector](docs-content://solutions/observability/apm/filter-data.md#apm-filter-your-data-service-environment-filter) in the APM app for more information.

::::{note}
This feature is fully supported in the APM app in Kibana versions >= 7.2. You must use the query bar to filter for a specific environment in versions prior to 7.2.
Expand Down Expand Up @@ -265,7 +265,7 @@ Currently, only [transaction sample rate](#transaction-sample-rate) can be confi


::::{note}
This feature requires APM Server v7.5 or later. More information is available in [APM Agent configuration](docs-content://solutions/observability/apps/apm-agent-central-configuration.md).
This feature requires APM Server v7.5 or later. More information is available in [APM Agent configuration](docs-content://solutions/observability/apm/apm-agent-central-configuration.md).
::::


Expand Down
2 changes: 1 addition & 1 deletion docs/reference/configuring-cors.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ mapped_pages:

If APM Server is deployed in an origin different than the page’s origin, you will need to configure Cross-Origin Resource Sharing (CORS).

A list of permitted origins can be supplied to the [`apm-server.rum.allow_origins`](docs-content://solutions/observability/apps/configure-real-user-monitoring-rum.md#apm-rum-allow-origins) configuration option. By default, APM Server allows all origins.
A list of permitted origins can be supplied to the [`apm-server.rum.allow_origins`](docs-content://solutions/observability/apm/configure-real-user-monitoring-rum.md#apm-rum-allow-origins) configuration option. By default, APM Server allows all origins.


## How CORS works [_how_cors_works]
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@ The agent uses browser timing APIs such as [Navigation Timing](https://w3c.githu

## Additional Components [additional-components]

APM Agents work in conjunction with the [APM Server](docs-content://reference/apm/observability/apm.md), [Elasticsearch](docs-content://get-started/index.md), and [Kibana](docs-content://get-started/the-stack.md). The [APM Guide](docs-content://reference/apm/observability/apm.md) provides details on how these components work together, and provides a matrix outlining [Agent and Server compatibility](docs-content://solutions/observability/apps/apm-agent-compatibility.md).
APM Agents work in conjunction with the [APM Server](docs-content://reference/apm/observability/apm.md), [Elasticsearch](docs-content://get-started/index.md), and [Kibana](docs-content://get-started/the-stack.md). The [APM Guide](docs-content://reference/apm/observability/apm.md) provides details on how these components work together, and provides a matrix outlining [Agent and Server compatibility](docs-content://solutions/observability/apm/apm-agent-compatibility.md).

Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ mapped_pages:

# Set up the APM Real User Monitoring JavaScript Agent [getting-started]

To start reporting your web page performance to Elastic APM, you must first [enable the RUM endpoint](docs-content://solutions/observability/apps/configure-real-user-monitoring-rum.md) in your `apm-server` configuration.
To start reporting your web page performance to Elastic APM, you must first [enable the RUM endpoint](docs-content://solutions/observability/apm/configure-real-user-monitoring-rum.md) in your `apm-server` configuration.

Once the APM Server endpoint has been configured, you can:

Expand Down
10 changes: 5 additions & 5 deletions docs/reference/source-maps.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ mapped_pages:

Minifying JavaScript bundles is a common practice in production as it can improve the load time and network latency of your application. However, minified code by itself can be hard to debug. For this reason, Elastic APM supports source maps. A source map is a file that maps minified files back to the original source code, allowing you to maintain the speed advantage of minified code, without losing the ability to quickly and easily debug your applications.

There are three steps required to enable, upload, and apply a source map to error stack traces. An overview is listed below, and a complete walk-through is available in the [generate and upload a source map](docs-content://solutions/observability/apps/create-upload-source-maps-rum.md) guide.
There are three steps required to enable, upload, and apply a source map to error stack traces. An overview is listed below, and a complete walk-through is available in the [generate and upload a source map](docs-content://solutions/observability/apm/create-upload-source-maps-rum.md) guide.

1. Set the [`serviceVersion`](/reference/configuration.md#service-version) when initializing the RUM Agent.
2. [Generate a source map](docs-content://solutions/observability/apps/create-upload-source-maps-rum.md#apm-source-map-rum-generate) for your application with the `serviceVersion` from step one.
3. [Enable and upload the source map file](docs-content://solutions/observability/apps/create-upload-source-maps-rum.md#apm-source-map-rum-upload) to APM Server.
2. [Generate a source map](docs-content://solutions/observability/apm/create-upload-source-maps-rum.md#apm-source-map-rum-generate) for your application with the `serviceVersion` from step one.
3. [Enable and upload the source map file](docs-content://solutions/observability/apm/create-upload-source-maps-rum.md#apm-source-map-rum-upload) to APM Server.

$$$secret-token$$$
You can also configure a [secret token](docs-content://solutions/observability/apps/secret-token.md) or [API key](docs-content://solutions/observability/apps/api-keys.md) to restrict the uploading of sourcemaps.
You can also configure a [secret token](docs-content://solutions/observability/apm/secret-token.md) or [API key](docs-content://solutions/observability/apm/api-keys.md) to restrict the uploading of sourcemaps.

::::{tip}
Don’t forget, you must enable [RUM support](docs-content://solutions/observability/apps/configure-real-user-monitoring-rum.md) in the APM Server for this endpoint to work.
Don’t forget, you must enable [RUM support](docs-content://solutions/observability/apm/configure-real-user-monitoring-rum.md) in the APM Server for this endpoint to work.
::::


2 changes: 1 addition & 1 deletion docs/reference/transaction-api.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ Add several labels on the transaction. If an error happens during the transactio
Labels are key/value pairs that are indexed by Elasticsearch and therefore searchable (as opposed to data set via [`apm.setCustomContext()`](/reference/agent-api.md#apm-set-custom-context)).

::::{tip}
Before using custom labels, ensure you understand the different types of [metadata](docs-content://solutions/observability/apps/elastic-apm-events-intake-api.md#apm-api-metadata-overview) that are available.
Before using custom labels, ensure you understand the different types of [metadata](docs-content://solutions/observability/apm/elastic-apm-events-intake-api.md#apm-api-metadata-overview) that are available.
::::


Expand Down
2 changes: 1 addition & 1 deletion docs/reference/upgrading.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Upgrades between minor versions of the agent, like from 3.1 to 3.2 are always ba
Before upgrading the agent, be sure to review the:

* [Agent release notes](/release-notes/index.md)
* [Agent and Server compatibility chart](docs-content://solutions/observability/apps/apm-agent-compatibility.md)
* [Agent and Server compatibility chart](docs-content://solutions/observability/apm/apm-agent-compatibility.md)

The following upgrade guides are also available:

Expand Down