From 7a62e476018df3d2883c9fc98320b73a1fa5c6b7 Mon Sep 17 00:00:00 2001 From: Aleksandra Spilkowska Date: Tue, 18 Nov 2025 19:10:01 +0100 Subject: [PATCH 1/4] Add EDOT mentions on landing pages --- solutions/observability/apm/index.md | 2 +- solutions/observability/cicd.md | 10 ++++++++-- solutions/observability/infra-and-hosts.md | 4 ++++ .../analyze-infrastructure-host-metrics.md | 4 +++- .../logs/ecs-formatted-application-logs.md | 10 +++++++--- .../observability/logs/plaintext-application-logs.md | 11 +++++++---- 6 files changed, 30 insertions(+), 11 deletions(-) diff --git a/solutions/observability/apm/index.md b/solutions/observability/apm/index.md index a5ca2555d6..a49054a3fd 100644 --- a/solutions/observability/apm/index.md +++ b/solutions/observability/apm/index.md @@ -26,4 +26,4 @@ Metrics are another vital source of information when debugging production system ## Give Elastic APM a try [give_elastic_apm_a_try] -Want to quickly spin up an APM deployment? Refer to [Get started for APM](/solutions/observability/apm/get-started.md). To host everything yourself instead, refer to [Set up APM Server](/solutions/observability/apm/apm-server/setup.md). \ No newline at end of file +Want to quickly spin up an APM deployment? Refer to [Get started for APM](/solutions/observability/apm/get-started.md). We recommend using the [Elastic Distributions of OpenTelemetry (EDOT)](/solutions/observability/apm/opentelemetry/index.md) as the preferred way to collect application telemetry data. To host everything yourself instead, refer to [Set up APM Server](/solutions/observability/apm/apm-server/setup.md). \ No newline at end of file diff --git a/solutions/observability/cicd.md b/solutions/observability/cicd.md index 686fe84755..d3f25f6a6b 100644 --- a/solutions/observability/cicd.md +++ b/solutions/observability/cicd.md @@ -2,6 +2,8 @@ navigation_title: CI/CD mapped_pages: - https://www.elastic.co/guide/en/observability/current/ci-cd-observability.html +applies_to: + stack: ga products: - id: observability --- @@ -18,14 +20,18 @@ To provide monitoring dashboards, alerting, and root cause analysis on pipelines ## CI/CD observability architectures [ci-cd-architecture] -Using the APM Server, connect all your OpenTelemetry native CI/CD tools directly to Elastic {{observability}}. +:::{tip} +We recommend using the [{{edot}} Collector](opentelemetry://reference/index.md) as the preferred way to collect CI/CD observability data. You can also use the {{apm-server}} to connect all your OpenTelemetry native CI/CD tools directly to Elastic {{observability}}. +::: + +Using the {{apm-server}}, connect all your OpenTelemetry native CI/CD tools directly to Elastic {{observability}}. :::{image} /solutions/images/observability-simple-arch-observability.png :alt: Simple architecture of CI/CD observability with Elastic :title: Architecture of CI/CD observability with Elastic ::: -A more advanced CI/CD observability architecture includes an OpenTelemetry Collector deployed on the edge, next to the CI/CD tools. This architecture provides the following: +A more advanced CI/CD observability architecture includes an [{{edot}} Collector](opentelemetry://reference/index.md) deployed on the edge, next to the CI/CD tools. This architecture provides the following: * Low latency between the CI/CD tools and the collector is particularly beneficial to ephemeral tools like the otel-cli. * The ability to route the observability signals to multiple backends in addition to Elastic {{observability}}. diff --git a/solutions/observability/infra-and-hosts.md b/solutions/observability/infra-and-hosts.md index fdf0ad0392..5982589e2e 100644 --- a/solutions/observability/infra-and-hosts.md +++ b/solutions/observability/infra-and-hosts.md @@ -17,6 +17,10 @@ products: Explore the topics in this section to learn how to observe and monitor hosts and other systems running in your environment. +:::{tip} +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 infrastructure metrics and logs. You can also use the [Elastic Agent](/solutions/observability/infra-and-hosts/get-started-with-system-metrics.md) with integrations for infrastructure monitoring. +::: + | | | | --- | --- | | [Analyze infrastructure and host metrics](/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md) | Visualize infrastructure metrics to help diagnose problematic spikes, identify high resource utilization, automatically discover and track pods, and unify your metrics with other observability data. | diff --git a/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md b/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md index b62427afde..720cd5de13 100644 --- a/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md +++ b/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md @@ -14,7 +14,9 @@ products: Observability allows you to visualize infrastructure metrics to help diagnose problematic spikes, identify high resource utilization, automatically discover and track pods, and unify your metrics with logs and APM data. -Using {{agent}} integrations, you can ingest and analyze metrics from servers, Docker containers, Kubernetes orchestrations, explore and analyze application telemetry, and more. +:::{tip} +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 infrastructure metrics. You can also use {{agent}} integrations to ingest and analyze metrics from servers, Docker containers, Kubernetes orchestrations, and more. +::: For more information, refer to the following links: diff --git a/solutions/observability/logs/ecs-formatted-application-logs.md b/solutions/observability/logs/ecs-formatted-application-logs.md index f12b64dc6b..ee743492db 100644 --- a/solutions/observability/logs/ecs-formatted-application-logs.md +++ b/solutions/observability/logs/ecs-formatted-application-logs.md @@ -3,8 +3,8 @@ mapped_pages: - https://www.elastic.co/guide/en/observability/current/logs-ecs-application.html - https://www.elastic.co/guide/en/serverless/current/observability-ecs-application-logs.html applies_to: - stack: all - serverless: all + stack: ga + serverless: ga products: - id: observability - id: cloud-serverless @@ -12,7 +12,11 @@ products: # ECS formatted application logs [logs-ecs-application] -Logs formatted in Elastic Common Schema (ECS) don’t require manual parsing, and the configuration can be reused across applications. ECS-formatted logs, when paired with an {{apm-agent}}, allow you to correlate logs to easily view logs that belong to a particular trace. +Logs formatted in {{product.ecs}} don't require manual parsing, and the configuration can be reused across applications. ECS-formatted logs, when paired with an {{apm-agent}} or [{{edot}} SDKs](opentelemetry://reference/edot-sdks/index.md), allow you to correlate logs to easily view logs that belong to a particular trace. + +:::{tip} +We recommend using the [{{edot}} SDKs](opentelemetry://reference/edot-sdks/index.md) as the preferred way to instrument your applications and collect ECS-formatted logs with automatic log correlation. You can also format your logs in ECS format. +::: You can format your logs in ECS format the following ways: diff --git a/solutions/observability/logs/plaintext-application-logs.md b/solutions/observability/logs/plaintext-application-logs.md index e1a59ec78b..401ba398ec 100644 --- a/solutions/observability/logs/plaintext-application-logs.md +++ b/solutions/observability/logs/plaintext-application-logs.md @@ -3,8 +3,8 @@ mapped_pages: - https://www.elastic.co/guide/en/observability/current/logs-plaintext.html - https://www.elastic.co/guide/en/serverless/current/observability-plaintext-application-logs.html applies_to: - stack: all - serverless: all + stack: ga + serverless: ga products: - id: observability - id: cloud-serverless @@ -30,9 +30,12 @@ To ingest, parse, and correlate plaintext logs: Send application logs to {{es}} using one of the following shipping tools: -* [{{filebeat}}](/solutions/observability/logs/plaintext-application-logs.md#ingest-plaintext-logs-with-filebeat) A lightweight data shipper that sends log data to {{es}}. -* [{{agent}}](/solutions/observability/logs/plaintext-application-logs.md#ingest-plaintext-logs-with-the-agent) A single agent for logs, metrics, security data, and threat prevention. Combined with Fleet, you can centrally manage {{agent}} policies and lifecycles directly from {{kib}}. +:::{tip} +We recommend using the [{{edot}} Collector](/solutions/observability/logs/stream-any-log-file-using-edot-collector.md) as the preferred way to collect application logs. You can also use: +* [{{filebeat}}](/solutions/observability/logs/plaintext-application-logs.md#ingest-plaintext-logs-with-filebeat) A lightweight data shipper that sends log data to {{es}}. +* [{{agent}}](/solutions/observability/logs/plaintext-application-logs.md#ingest-plaintext-logs-with-the-agent) A single agent for logs, metrics, security data, and threat prevention. Combined with {{fleet}}, you can centrally manage {{agent}} policies and lifecycles directly from {{kib}}. +::: ### Ingest logs with {{filebeat}} [ingest-plaintext-logs-with-filebeat] From 7c68662379be218ba545655938b9ccb97be181aa Mon Sep 17 00:00:00 2001 From: Aleksandra Spilkowska Date: Tue, 18 Nov 2025 19:24:31 +0100 Subject: [PATCH 2/4] fix tip in plaintext-application-logs --- solutions/observability/logs/plaintext-application-logs.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/solutions/observability/logs/plaintext-application-logs.md b/solutions/observability/logs/plaintext-application-logs.md index 401ba398ec..85a765f776 100644 --- a/solutions/observability/logs/plaintext-application-logs.md +++ b/solutions/observability/logs/plaintext-application-logs.md @@ -30,13 +30,14 @@ To ingest, parse, and correlate plaintext logs: Send application logs to {{es}} using one of the following shipping tools: -:::{tip} -We recommend using the [{{edot}} Collector](/solutions/observability/logs/stream-any-log-file-using-edot-collector.md) as the preferred way to collect application logs. You can also use: - * [{{filebeat}}](/solutions/observability/logs/plaintext-application-logs.md#ingest-plaintext-logs-with-filebeat) A lightweight data shipper that sends log data to {{es}}. * [{{agent}}](/solutions/observability/logs/plaintext-application-logs.md#ingest-plaintext-logs-with-the-agent) A single agent for logs, metrics, security data, and threat prevention. Combined with {{fleet}}, you can centrally manage {{agent}} policies and lifecycles directly from {{kib}}. + +:::{tip} +We recommend using the [{{edot}} Collector](/solutions/observability/logs/stream-any-log-file-using-edot-collector.md) as the preferred way to collect application logs. ::: + ### Ingest logs with {{filebeat}} [ingest-plaintext-logs-with-filebeat] Follow these steps to ingest application logs with {{filebeat}}. From 58c94a4b50416bdf58f4bd36656f7aa0d53242cb Mon Sep 17 00:00:00 2001 From: Aleksandra Spilkowska Date: Tue, 18 Nov 2025 19:27:32 +0100 Subject: [PATCH 3/4] Update cicd.md --- solutions/observability/cicd.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/solutions/observability/cicd.md b/solutions/observability/cicd.md index d3f25f6a6b..f0a70cb66a 100644 --- a/solutions/observability/cicd.md +++ b/solutions/observability/cicd.md @@ -20,12 +20,12 @@ To provide monitoring dashboards, alerting, and root cause analysis on pipelines ## CI/CD observability architectures [ci-cd-architecture] +Using the {{apm-server}}, connect all your OpenTelemetry native CI/CD tools directly to Elastic {{observability}}. + :::{tip} -We recommend using the [{{edot}} Collector](opentelemetry://reference/index.md) as the preferred way to collect CI/CD observability data. You can also use the {{apm-server}} to connect all your OpenTelemetry native CI/CD tools directly to Elastic {{observability}}. +We recommend using the [{{edot}} Collector](opentelemetry://reference/index.md) as the preferred way to collect CI/CD observability data. ::: -Using the {{apm-server}}, connect all your OpenTelemetry native CI/CD tools directly to Elastic {{observability}}. - :::{image} /solutions/images/observability-simple-arch-observability.png :alt: Simple architecture of CI/CD observability with Elastic :title: Architecture of CI/CD observability with Elastic From 5371a4ed94dc1241430de4320d2746ad830b504d Mon Sep 17 00:00:00 2001 From: Aleksandra Spilkowska Date: Thu, 20 Nov 2025 18:13:50 +0100 Subject: [PATCH 4/4] Apply comments --- solutions/observability/apm/index.md | 2 +- solutions/observability/cicd.md | 4 ++-- solutions/observability/infra-and-hosts.md | 2 +- .../infra-and-hosts/analyze-infrastructure-host-metrics.md | 2 +- .../observability/logs/ecs-formatted-application-logs.md | 4 ++-- solutions/observability/logs/plaintext-application-logs.md | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/solutions/observability/apm/index.md b/solutions/observability/apm/index.md index a49054a3fd..e795ee4417 100644 --- a/solutions/observability/apm/index.md +++ b/solutions/observability/apm/index.md @@ -26,4 +26,4 @@ Metrics are another vital source of information when debugging production system ## Give Elastic APM a try [give_elastic_apm_a_try] -Want to quickly spin up an APM deployment? Refer to [Get started for APM](/solutions/observability/apm/get-started.md). We recommend using the [Elastic Distributions of OpenTelemetry (EDOT)](/solutions/observability/apm/opentelemetry/index.md) as the preferred way to collect application telemetry data. To host everything yourself instead, refer to [Set up APM Server](/solutions/observability/apm/apm-server/setup.md). \ No newline at end of file +Want to quickly spin up an APM deployment? Refer to [Get started for APM](/solutions/observability/apm/get-started.md). We recommend using the [Elastic Distributions of OpenTelemetry (EDOT)](/solutions/observability/apm/opentelemetry/index.md) to collect application telemetry data. To host everything yourself instead, refer to [Set up APM Server](/solutions/observability/apm/apm-server/setup.md). \ No newline at end of file diff --git a/solutions/observability/cicd.md b/solutions/observability/cicd.md index f0a70cb66a..ecb94c89d4 100644 --- a/solutions/observability/cicd.md +++ b/solutions/observability/cicd.md @@ -20,10 +20,10 @@ To provide monitoring dashboards, alerting, and root cause analysis on pipelines ## CI/CD observability architectures [ci-cd-architecture] -Using the {{apm-server}}, connect all your OpenTelemetry native CI/CD tools directly to Elastic {{observability}}. +Use the {{apm-server}} to connect all your OpenTelemetry native CI/CD tools directly to Elastic {{observability}}. :::{tip} -We recommend using the [{{edot}} Collector](opentelemetry://reference/index.md) as the preferred way to collect CI/CD observability data. +We recommend using the [{{edot}} Collector](opentelemetry://reference/index.md) to collect CI/CD observability data. ::: :::{image} /solutions/images/observability-simple-arch-observability.png diff --git a/solutions/observability/infra-and-hosts.md b/solutions/observability/infra-and-hosts.md index 5982589e2e..bf067dc015 100644 --- a/solutions/observability/infra-and-hosts.md +++ b/solutions/observability/infra-and-hosts.md @@ -18,7 +18,7 @@ products: Explore the topics in this section to learn how to observe and monitor hosts and other systems running in your environment. :::{tip} -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 infrastructure metrics and logs. You can also use the [Elastic Agent](/solutions/observability/infra-and-hosts/get-started-with-system-metrics.md) with integrations for infrastructure monitoring. +We recommend using the [Elastic Distribution of OpenTelemetry (EDOT) Collector](/solutions/observability/get-started/quickstart-monitor-hosts-with-opentelemetry.md) to collect infrastructure metrics and logs. You can also use the [Elastic Agent](/solutions/observability/infra-and-hosts/get-started-with-system-metrics.md) with integrations for infrastructure monitoring. ::: | | | diff --git a/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md b/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md index 720cd5de13..0465df3075 100644 --- a/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md +++ b/solutions/observability/infra-and-hosts/analyze-infrastructure-host-metrics.md @@ -15,7 +15,7 @@ products: Observability allows you to visualize infrastructure metrics to help diagnose problematic spikes, identify high resource utilization, automatically discover and track pods, and unify your metrics with logs and APM data. :::{tip} -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 infrastructure metrics. You can also use {{agent}} integrations to ingest and analyze metrics from servers, Docker containers, Kubernetes orchestrations, and more. +We recommend using the [Elastic Distribution of OpenTelemetry (EDOT) Collector](/solutions/observability/get-started/quickstart-monitor-hosts-with-opentelemetry.md) to collect infrastructure metrics. You can also use {{agent}} integrations to ingest and analyze metrics from servers, Docker containers, {{k8s}} deployments, and more. ::: For more information, refer to the following links: diff --git a/solutions/observability/logs/ecs-formatted-application-logs.md b/solutions/observability/logs/ecs-formatted-application-logs.md index ee743492db..bc2c4fc6c6 100644 --- a/solutions/observability/logs/ecs-formatted-application-logs.md +++ b/solutions/observability/logs/ecs-formatted-application-logs.md @@ -12,10 +12,10 @@ products: # ECS formatted application logs [logs-ecs-application] -Logs formatted in {{product.ecs}} don't require manual parsing, and the configuration can be reused across applications. ECS-formatted logs, when paired with an {{apm-agent}} or [{{edot}} SDKs](opentelemetry://reference/edot-sdks/index.md), allow you to correlate logs to easily view logs that belong to a particular trace. +Logs formatted in {{product.ecs}} don't require manual parsing, and the same ingest configuration can be reused across applications. ECS-formatted logs, when paired with an {{apm-agent}} or [{{edot}} SDKs](opentelemetry://reference/edot-sdks/index.md), allow you to correlate logs to easily view logs that belong to a particular trace. :::{tip} -We recommend using the [{{edot}} SDKs](opentelemetry://reference/edot-sdks/index.md) as the preferred way to instrument your applications and collect ECS-formatted logs with automatic log correlation. You can also format your logs in ECS format. +We recommend using the [{{edot}} SDKs](opentelemetry://reference/edot-sdks/index.md) to instrument your applications and collect ECS-formatted logs with automatic log correlation. You can also format your logs in ECS format. ::: You can format your logs in ECS format the following ways: diff --git a/solutions/observability/logs/plaintext-application-logs.md b/solutions/observability/logs/plaintext-application-logs.md index 85a765f776..16ca149509 100644 --- a/solutions/observability/logs/plaintext-application-logs.md +++ b/solutions/observability/logs/plaintext-application-logs.md @@ -31,10 +31,10 @@ To ingest, parse, and correlate plaintext logs: Send application logs to {{es}} using one of the following shipping tools: * [{{filebeat}}](/solutions/observability/logs/plaintext-application-logs.md#ingest-plaintext-logs-with-filebeat) A lightweight data shipper that sends log data to {{es}}. -* [{{agent}}](/solutions/observability/logs/plaintext-application-logs.md#ingest-plaintext-logs-with-the-agent) A single agent for logs, metrics, security data, and threat prevention. Combined with {{fleet}}, you can centrally manage {{agent}} policies and lifecycles directly from {{kib}}. +* [{{agent}}](/solutions/observability/logs/plaintext-application-logs.md#ingest-plaintext-logs-with-the-agent) A single agent that can collect logs, metrics, and security data, and protect your hosts. You can use {{fleet}} to manage {{agent}} policies and lifecycles directly from {{kib}}. :::{tip} -We recommend using the [{{edot}} Collector](/solutions/observability/logs/stream-any-log-file-using-edot-collector.md) as the preferred way to collect application logs. +We recommend using the [{{edot}} Collector](/solutions/observability/logs/stream-any-log-file-using-edot-collector.md) to collect application logs. :::