Skip to content

Commit e976691

Browse files
committed
Apply comments
1 parent b31385b commit e976691

File tree

7 files changed

+7
-14
lines changed

7 files changed

+7
-14
lines changed

solutions/observability/apm/apm-server/advanced-setup.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,14 @@ applies_to:
77
products:
88
- id: observability
99
- id: apm
10-
- id: edot-collector
11-
- id: edot-sdk
1210
---
1311

1412
# APM Server advanced setup [apm-setting-up-and-running]
1513

16-
Before reading this section, refer to [](/solutions/observability/apm/apm-server/setup.md) for basic installation and running instructions.
14+
Before reading this section, refer to [](/solutions/observability/apm/apm-server/setup.md) for basic installation and deployment instructions.
1715

1816
:::{note}
19-
This section covers APM Server setup. As an alternative, you can use the [Elastic Distribution of OpenTelemetry (EDOT) Collector](opentelemetry://reference/index.md) to collect application telemetry data using OpenTelemetry. For mobile applications, you can use the [EDOT Android SDK](apm-agent-android://reference/edot-android/index.md) or [EDOT iOS SDK](apm-agent-ios://reference/edot-ios/index.md).
17+
This section covers {{apm-server}} setup. We recommend using the [{{edot}} Collector](opentelemetry://reference/index.md) as the preferred way to collect application telemetry data using OpenTelemetry. For mobile applications, we recommend using the [EDOT Android SDK](apm-agent-android://reference/edot-android/index.md) or [EDOT iOS SDK](apm-agent-ios://reference/edot-ios/index.md).
2018
:::
2119

2220
This section includes additional information on how to set up and run APM Server, including:

solutions/observability/apm/mobile-service-overview.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ applies_to:
66
products:
77
- id: observability
88
- id: apm
9-
- id: edot-sdk
109
---
1110

1211
# Mobile service overview [apm-mobile-service-overview]

solutions/observability/get-started/other-tutorials/tutorial-monitor-java-application.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ You’ll learn how to:
2222
* Instrument your application using the [Elastic APM Java agent](apm-agent-java://reference/index.md).
2323

2424
:::{tip}
25-
You can also instrument your Java application using the [Elastic Distribution of OpenTelemetry (EDOT) Java SDK](elastic-otel-java://reference/edot-java/setup/index.md) as an alternative to the Elastic APM Java agent. The EDOT Java SDK provides OpenTelemetry-based instrumentation and can send telemetry data to Elastic.
25+
We recommend using the [Elastic Distribution of OpenTelemetry (EDOT) Java SDK](elastic-otel-java://reference/edot-java/setup/index.md) as the preferred way to instrument your Java application. The EDOT Java SDK provides OpenTelemetry-based instrumentation and can send telemetry data to Elastic.
2626
:::
2727

2828
* Monitor your services using {{heartbeat}} and view your uptime data in {{kib}}.
@@ -1415,7 +1415,7 @@ The third piece of {{observability}} is Application Performance Management (APM)
14151415
The agent has two tasks: instrumenting the Java application to extract application performance information and sending that data to the APM Server.
14161416
14171417
:::{note}
1418-
This tutorial uses the Elastic APM Java agent. As an alternative, you can use the [Elastic Distribution of OpenTelemetry (EDOT) Java SDK](elastic-otel-java://reference/edot-java/setup/index.md) for OpenTelemetry-based instrumentation. Refer to the [EDOT Java SDK setup guide](elastic-otel-java://reference/edot-java/setup/index.md) for instructions.
1418+
This tutorial uses the Elastic APM Java agent. We recommend using the [Elastic Distribution of OpenTelemetry (EDOT) Java SDK](elastic-otel-java://reference/edot-java/setup/index.md) as the preferred way to instrument your Java application with OpenTelemetry-based instrumentation. Refer to the [EDOT Java SDK setup guide](elastic-otel-java://reference/edot-java/setup/index.md) for instructions.
14191419
:::
14201420
14211421
One of the APM’s core ideas is the ability to follow the flow of a user session across your whole stack, regardless of whether you have dozens of microservices or a monolith answering your user requests. This implies the ability to tag a request across your entire stack.

solutions/observability/get-started/quickstart-monitor-hosts-with-elastic-agent.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ products:
1212
- id: observability
1313
- id: cloud-serverless
1414
- id: elastic-stack
15-
- id: edot-collector
1615
---
1716

1817
# Quickstart: Monitor hosts with {{agent}} [quickstart-monitor-hosts-with-elastic-agent]
@@ -24,7 +23,7 @@ To scan your host, you’ll run an auto-detection script that downloads and inst
2423
The script also generates an {{agent}} configuration file that you can use with your existing Infrastructure-as-Code tooling.
2524

2625
:::{tip}
27-
You can also use the [Elastic Distribution of OpenTelemetry (EDOT) Collector](/solutions/observability/get-started/quickstart-monitor-hosts-with-opentelemetry.md) to collect system metrics and logs using OpenTelemetry.
26+
We recommend using the [Elastic Distribution of OpenTelemetry (EDOT) Collector](/solutions/observability/get-started/quickstart-monitor-hosts-with-opentelemetry.md) as the preferred way to collect system metrics and logs using OpenTelemetry.
2827
:::
2928

3029

solutions/observability/get-started/quickstart-monitor-kubernetes-cluster-with-elastic-agent.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,14 @@ applies_to:
99
products:
1010
- id: cloud-serverless
1111
- id: observability
12-
- id: edot-collector
1312
---
1413

1514
# Quickstart: Monitor your Kubernetes cluster with {{agent}} [monitor-k8s-logs-metrics-with-elastic-agent]
1615

1716
In this quickstart guide, you'll learn how to create the Kubernetes resources required to monitor your cluster infrastructure by using a single command to download, install, and configure {{agent}} in your Kubernetes cluster.
1817

1918
:::{tip}
20-
You can also use the [Elastic Distribution of OpenTelemetry (EDOT) Collector](/solutions/observability/get-started/quickstart-unified-kubernetes-observability-with-elastic-distributions-of-opentelemetry-edot.md) to collect Kubernetes logs, metrics, and application traces using OpenTelemetry.
19+
We recommend using the [Elastic Distribution of OpenTelemetry (EDOT) Collector](/solutions/observability/get-started/quickstart-unified-kubernetes-observability-with-elastic-distributions-of-opentelemetry-edot.md) as the preferred way to collect Kubernetes logs, metrics, and application traces using OpenTelemetry.
2120
:::
2221

2322
:::{note}

solutions/observability/infra-and-hosts/get-started-with-system-metrics.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,14 @@ applies_to:
88
products:
99
- id: observability
1010
- id: cloud-serverless
11-
- id: edot-collector
1211
---
1312

1413
# Get started with system metrics [logs-metrics-get-started]
1514

1615
In this guide you can learn how to onboard system metrics data from a machine or server using {{fleet}}-managed {{agent}}.
1716

1817
:::{tip}
19-
To get started quickly without {{fleet}}, follow the steps described in the [quickstarts](/solutions/observability/get-started/quickstarts.md). You can also use the [Elastic Distribution of OpenTelemetry (EDOT) Collector](/solutions/observability/get-started/quickstart-monitor-hosts-with-opentelemetry.md) as an alternative to collect system metrics and logs.
18+
To get started quickly without {{fleet}}, follow the steps described in the [quickstarts](/solutions/observability/get-started/quickstarts.md). We recommend using the [{{edot}} Collector](/solutions/observability/get-started/quickstart-monitor-hosts-with-opentelemetry.md) as the preferred way to collect system metrics and logs.
2019
:::
2120

2221
## Prerequisites [logs-metrics-prereqs]

solutions/observability/infra-and-hosts/get-started-with-universal-profiling.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ applies_to:
66
stack: ga
77
products:
88
- id: observability
9-
- id: edot-collector
109
---
1110

1211

0 commit comments

Comments
 (0)