Skip to content

Commit

Permalink
Merge branch 'master' into esther/docs-6808-time-slice-slo
Browse files Browse the repository at this point in the history
  • Loading branch information
estherk15 authored Dec 13, 2023
2 parents 24d2e8e + 74e332a commit ee5b98b
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 63 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,15 @@ further_reading:
text: "Learn more about Audit Trail"
---

{{% site-region region="gov" %}}
<div class="alert alert-warning">
Audit Event Forwarding is not available in the US1-FED site.
</div>
{{% /site-region %}}

{{% site-region region="US,US3,US5,EU,AP1" %}}
<div class="alert alert-warning">Audit Event Forwarding is in beta. </div>
{{% /site-region %}}

## Overview

Expand Down Expand Up @@ -78,4 +86,4 @@ Audit Event Forwarding allows you to send audit events from Datadog to custom de

[1]: https://ip-ranges.datadoghq.com/
[2]: https://app.datadoghq.com/organization-settings/audit-trail-settings
[3]: /logs/explorer/search_syntax/
[3]: /logs/explorer/search_syntax/
3 changes: 0 additions & 3 deletions content/en/agent/remote_config/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ The following products and features are supported with Remote Configuration:
### Application Performance Monitoring (APM)

- **Configure tracing library settings in the UI** (Beta): Change a service's trace sampling rate, Log Injection enablement, and HTTP header tags from within the [Service Catalog][19] UI, without having to restart the service.
- **Remotely instrument your Kubernetes services with APM** (Private Beta): Remotely instrument your services in Kubernetes with Datadog APM through Datadog Library Injection, and manage your deployments all within the Datadog UI. Available for Java, Node and Python applications. See [Setting up Remote instrumentation][2] for more information.
- **Remotely set Agent sampling rate** (Public Beta): Remotely configure the Datadog Agent to change its trace sampling rates and set rules to scale your organization's trace ingestion according to your needs, without needing to restart your Datadog Agent.


Expand Down Expand Up @@ -152,7 +151,6 @@ remoteConfiguration:
After you perform these steps, your Agent requests its configuration from Datadog, and the features that use remote configuration are enabled:
- [CSM Threats default agent rules][9] update automatically as released.
- [Datadog Remote instrumentation][2] is enabled.
- [APM Agent-level sampling rates][10] are applied.
- [Dynamic Instrumentation][11] is enabled.
- [ASM 1-Click enablement, IP blocking, and attack pattern updates][12] are enabled.
Expand Down Expand Up @@ -246,7 +244,6 @@ datadog:
{{< partial name="whats-next/whats-next.html" >}}

[1]: /getting_started/site/
[2]: /tracing/trace_collection/library_injection_remote/
[3]: /security/threats/setup
[4]: /observability_pipelines/#observability-pipelines-worker
[5]: /account_management/rbac/permissions#api-and-application-keys
Expand Down
12 changes: 1 addition & 11 deletions content/en/tracing/trace_collection/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ aliases:
- /tracing/getting_further/first_class_dimensions/
- /agent/apm/
- /tracing/setup_overview/
- /tracing/trace_collection/library_injection_remote
further_reading:
- link: "tracing/trace_collection/compatibility"
tag: "Documentation"
Expand Down Expand Up @@ -91,7 +92,6 @@ Depending on the programming language and infrastructure you use, you have the f

- [Auto-instrument your application](#option-1---auto-instrument-your-application)
- [Manually instrument your application](#option-2---manually-instrument-your-application)
- [Auto-instrument your application from the Datadog UI](#option-3---auto-instrument-your-application-from-the-datadog-ui)

### Option 1 - Auto-instrument your application

Expand All @@ -108,15 +108,6 @@ For setup instructions, select your language:

To instrument an application written in a language that does not have official library support, see the list of [community tracing libraries][1].


### Option 3 - Auto-instrument your application from the Datadog UI

<div class="alert alert-info">This feature is in private beta.</a></div>

For Kubernetes, you can inject the Java, Python, and Node.js tracing libraries from the Datadog UI.

For more information and instructions, read [Injecting Libraries Remotely][3].

## APM setup tutorials

The following tutorials guide you through setting up distributed tracing for a sample application on various infrastructure scenarios, with both automatic and custom instrumentation, using the direct method ([Option 2](#option-2---manually-instrument-your-application)):
Expand Down Expand Up @@ -145,5 +136,4 @@ The following tutorials guide you through setting up distributed tracing for a s

[1]: /developers/community/libraries/#apm-tracing-client-libraries
[2]: /tracing/trace_collection/library_injection_local/
[3]: /tracing/trace_collection/library_injection_remote/
[4]: /tracing/trace_collection/dd_libraries/
2 changes: 0 additions & 2 deletions content/en/tracing/trace_collection/dd_libraries/java.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ After you deploy or install and configure your Datadog Agent, the next step is t
See the following pages for supported deployment scenarios and languages:

- [Inject the instrumentation library locally][11] (at the Agent);
- [Inject the instrumentation library from the Datadog UI][12] (beta); or
- Add the tracing library directly in the application, as described in the [Install the tracer](#install-the-tracer) section. Read more about [compatibility information][1].

### Instrument your application
Expand Down Expand Up @@ -232,7 +231,6 @@ If needed, configure the tracing library to send application performance telemet
[9]: /tracing/trace_collection/library_config/java/
[10]: /tracing/trace_collection/compatibility/java/#supported-jvm-runtimes
[11]: /tracing/trace_collection/library_injection_local/
[12]: /tracing/trace_collection/library_injection_remote/
[16]: /agent/remote_config/
[17]: https://app.datadoghq.com/services
[18]: /tracing/trace_collection#install-and-configure-the-agent
Expand Down
2 changes: 0 additions & 2 deletions content/en/tracing/trace_collection/dd_libraries/nodejs.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ After you deploy or install and configure your Datadog Agent, the next step is t
See the following pages for supported deployment scenarios and languages:

- [Inject the instrumentation library locally][11] (at the Agent);
- [Inject the instrumentation library from the Datadog UI][12] (beta); or
- Add the tracing library directly in the application, as described in the [Install the tracer](#install-the-tracer) section. Read more about [compatibility information][1].


Expand Down Expand Up @@ -167,5 +166,4 @@ Read [tracer settings][3] for a list of initialization options.
[4]: /tracing/trace_collection/library_config/nodejs/
[5]: https://github.com/DataDog/dd-trace-js/blob/master/MIGRATING.md
[11]: /tracing/trace_collection/library_injection_local/
[12]: /tracing/trace_collection/library_injection_remote/
[13]: /tracing/trace_collection#install-and-configure-the-agent
2 changes: 0 additions & 2 deletions content/en/tracing/trace_collection/dd_libraries/python.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ After you deploy or install and configure your Datadog Agent, the next step is t
See the following pages for supported deployment scenarios and languages:

- [Inject the instrumentation library locally][11] (at the Agent);
- [Inject the instrumentation library from the Datadog UI][12] (beta); or
- Add the tracing library directly in the application, as described in the [Instrument your application](#instrument-your-application) section. Read more about [compatibility information][1].

### Instrument your application
Expand Down Expand Up @@ -122,5 +121,4 @@ If you are upgrading to ddtrace v1, review the [upgrade guide][4] and the [relea
[4]: https://ddtrace.readthedocs.io/en/stable/upgrading.html#upgrade-0-x
[5]: https://ddtrace.readthedocs.io/en/stable/release_notes.html#v1-0-0
[11]: /tracing/trace_collection/library_injection_local/
[12]: /tracing/trace_collection/library_injection_remote/
[13]: /tracing/trace_collection#install-and-configure-the-agent
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ aliases:
To instrument your application, you can:
* Auto-instrument your application, as described on this page.
* [Manually instrument your application][1].
* [Auto-instrument your application from the Datadog UI][5] (beta).

How to inject the library locally, without touching the application code at all, varies depending on where and how your Agent and application are installed. Select the scenario that represents your environment:

Expand Down Expand Up @@ -1106,4 +1105,3 @@ For example, you can turn on [Application Security Monitoring][3] or [Continuous
[2]: /tracing/trace_collection/library_config/
[3]: /security/application_security/enabling/java/?tab=kubernetes#get-started
[4]: /profiler/enabling/java/?tab=environmentvariables#installation
[5]: /tracing/trace_collection/library_injection_remote/
40 changes: 0 additions & 40 deletions content/en/tracing/trace_collection/library_injection_remote.md

This file was deleted.

0 comments on commit ee5b98b

Please sign in to comment.