diff --git a/config/_default/menus/main.en.yaml b/config/_default/menus/main.en.yaml index f0a9c69c878e9..d62d9367c88f4 100644 --- a/config/_default/menus/main.en.yaml +++ b/config/_default/menus/main.en.yaml @@ -592,10 +592,18 @@ menu: parent: essentials_heading weight: 70000 - name: Getting Started - url: /getting_started/opentelemetry + url: /opentelemetry/getting_started/ identifier: otel_guides_getting_started parent: opentelemetry_top_level weight: 1 + - name: Datadog Example Application + url: /getting_started/opentelemetry + parent: otel_guides_getting_started + weight: 101 + - name: OpenTelemetry Demo Application + url: /opentelemetry/guide/otel_demo_to_datadog + parent: otel_guides_getting_started + weight: 102 - name: Feature Compatibility url: opentelemetry/compatibility/ identifier: otel_compatibility @@ -611,7 +619,7 @@ menu: identifier: otel_sdks parent: otel-instrumentation weight: 301 - - name: OTel APIs + - name: OTel APIs with Datadog SDKs url: /opentelemetry/instrument/api_support identifier: otel-api-dd-sdk parent: otel-instrumentation @@ -649,7 +657,7 @@ menu: identifier: otel_instrumentation_libraries parent: otel-instrumentation weight: 303 - - name: Environment Variables + - name: Configuration url: opentelemetry/config/environment_variable_support/ identifier: otel_env_var parent: otel-instrumentation @@ -694,17 +702,17 @@ menu: identifier: otel-setup-otlp-ingest parent: otel_collect weight: 402 - - name: Direct OTLP Ingest - url: /opentelemetry/setup/intake_endpoint + - name: Agentless Deployment + url: /opentelemetry/setup/agentless/ identifier: otel-setup-intake-endpoint parent: otel_collect weight: 403 - name: Logs Endpoint - url: /opentelemetry/setup/intake_endpoint/otlp_logs + url: /opentelemetry/setup/agentless/logs parent: otel-setup-intake-endpoint weight: 301 - name: Metrics Endpoint - url: /opentelemetry/setup/intake_endpoint/otlp_metrics + url: /opentelemetry/setup/agentless/metrics parent: otel-setup-intake-endpoint weight: 302 - name: Semantic Mapping diff --git a/content/en/opentelemetry/_index.md b/content/en/opentelemetry/_index.md index 621bd731480e8..97c899da58a5c 100644 --- a/content/en/opentelemetry/_index.md +++ b/content/en/opentelemetry/_index.md @@ -129,7 +129,7 @@ If your applications and services are instrumented with OpenTelemetry libraries, ### Additional setup options -For other setup options, including direct OTLP intake, see [Send Data to Datadog][7]. +For other setup options, including Agentless deployment, see [Send Data to Datadog][7]. ## Further reading diff --git a/content/en/opentelemetry/getting_started.md b/content/en/opentelemetry/getting_started.md new file mode 100644 index 0000000000000..611786b1d4ca6 --- /dev/null +++ b/content/en/opentelemetry/getting_started.md @@ -0,0 +1,18 @@ +--- +title: Getting Started with OpenTelemetry at Datadog +disable_toc: false +further_reading: +- link: "/opentelemetry/guide" + tag: "Documentation" + text: "OpenTelemetry Guides" +--- + +{{< whatsnext desc=" " >}} + {{< nextlink href="/getting_started/opentelemetry" >}}Getting Started with a Datadog Example Application{{< /nextlink >}} + {{< nextlink href="/opentelemetry/guide/otel_demo_to_datadog" >}}Getting Started with the OpenTelemetry Demo Application +{{< /nextlink >}} +{{< /whatsnext >}} + +## Further reading + +{{< partial name="whats-next/whats-next.html" >}} \ No newline at end of file diff --git a/content/en/opentelemetry/setup/_index.md b/content/en/opentelemetry/setup/_index.md index ce1c737836b52..79cbe0d9d4a11 100644 --- a/content/en/opentelemetry/setup/_index.md +++ b/content/en/opentelemetry/setup/_index.md @@ -13,7 +13,7 @@ There are multiple ways to send OpenTelemetry data to Datadog. Choose the method |---------------------------------|--------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------| | <strong>OTel Collector</strong> | New or existing OTel users wanting a vendor-neutral setup | <ul><li>Complete vendor neutrality</li><li>Send traces, metrics, and logs to Datadog without installing the Datadog Agent or tracing libraries</li><li>Advanced processing capabilities (for example, [tail-based sampling][4])</li></ul> | [Send data using the OTel Collector][2] | | <strong>Datadog Agent</strong> | Existing Datadog users or teams requiring Agent-based features | <ul><li>Access to full Datadog Agent capabilities</li><li>Enhanced monitoring capabilities including:<ul><li>Fleet Automation</li><li>Live Container Monitoring</li><li>Kubernetes Explorer</li><li>Live Processes</li><li>Cloud Network Monitoring</li><li>Universal Service Monitoring</li><li>{{< translate key="integration_count" >}}+ Datadog integrations</li></ul></li></ul> | [Send data using OTLP ingest in the Agent][1] | -| <strong>Direct OTLP Ingest</strong> | Situations requiring direct connection without additional infrastructure | <ul><li>Direct data transmission</li><li>No additional components needed</li></ul> | [Send data using the intake endpoint][3] | +| <strong>Agentless Deployment</strong> | Situations requiring direct connection without additional infrastructure | <ul><li>Direct data transmission</li><li>No additional components needed</li></ul> | [Send data using the OTLP endpoint][3] | <div class="alert alert-info"><strong>Still not sure which setup is right for you?</strong><br> See the <a href="/opentelemetry/compatibility/">Feature Compatibility</a> table to understand which Datadog features are supported.</div> diff --git a/content/en/opentelemetry/setup/intake_endpoint/_index.md b/content/en/opentelemetry/setup/agentless/_index.md similarity index 96% rename from content/en/opentelemetry/setup/intake_endpoint/_index.md rename to content/en/opentelemetry/setup/agentless/_index.md index acdea79bf941a..b9eef60e53105 100644 --- a/content/en/opentelemetry/setup/intake_endpoint/_index.md +++ b/content/en/opentelemetry/setup/agentless/_index.md @@ -1,5 +1,7 @@ --- title: Datadog OTLP Intake Endpoint +aliases: +- /opentelemetry/setup/intake_endpoint/ further_reading: - link: "/opentelemetry/setup" tag: "Documentation" diff --git a/content/en/opentelemetry/setup/intake_endpoint/otlp_logs.md b/content/en/opentelemetry/setup/agentless/logs.md similarity index 99% rename from content/en/opentelemetry/setup/intake_endpoint/otlp_logs.md rename to content/en/opentelemetry/setup/agentless/logs.md index e51211fa18f12..513d3ac11bc0f 100644 --- a/content/en/opentelemetry/setup/intake_endpoint/otlp_logs.md +++ b/content/en/opentelemetry/setup/agentless/logs.md @@ -2,6 +2,7 @@ title: Datadog OTLP Logs Intake Endpoint aliases: - /opentelemetry/otlp_logs + - /opentelemetry/setup/intake_endpoint/otlp_logs further_reading: - link: "https://opentelemetry.io/docs/concepts/sdk-configuration/general-sdk-configuration/" tag: "External Site" diff --git a/content/en/opentelemetry/setup/intake_endpoint/otlp_metrics.md b/content/en/opentelemetry/setup/agentless/metrics.md similarity index 99% rename from content/en/opentelemetry/setup/intake_endpoint/otlp_metrics.md rename to content/en/opentelemetry/setup/agentless/metrics.md index 32bd05463804d..82e0bb04cd4fc 100644 --- a/content/en/opentelemetry/setup/intake_endpoint/otlp_metrics.md +++ b/content/en/opentelemetry/setup/agentless/metrics.md @@ -2,6 +2,7 @@ title: Datadog OTLP Metrics Intake Endpoint aliases: - "/opentelemetry/otlp_metrics" + - "/opentelemetry/setup/intake_endpoint/otlp_metrics" further_reading: - link: "https://opentelemetry.io/docs/concepts/sdk-configuration/general-sdk-configuration/" tag: "External Site" diff --git a/content/en/opentelemetry/setup/intake_endpoint/otlp_traces.md b/content/en/opentelemetry/setup/agentless/traces.md similarity index 99% rename from content/en/opentelemetry/setup/intake_endpoint/otlp_traces.md rename to content/en/opentelemetry/setup/agentless/traces.md index 158dc301b43df..ebeafba4db61d 100644 --- a/content/en/opentelemetry/setup/intake_endpoint/otlp_traces.md +++ b/content/en/opentelemetry/setup/agentless/traces.md @@ -2,6 +2,7 @@ title: Datadog OTLP Traces Intake Endpoint aliases: - /opentelemetry/otlp_endpoint + - /opentelemetry/setup/intake_endpoint/otlp_traces private: true further_reading: - link: "https://opentelemetry.io/docs/concepts/sdk-configuration/general-sdk-configuration/"