Skip to content

Commit 7100145

Browse files
estherk15estherk15
committed
Merge branch 'esther/docs-6808-time-slice-slo' of github.com:DataDog/documentation into esther/docs-6808-time-slice-slo
2 parents 049744e + d7a35d4 commit 7100145

File tree

4 files changed

+26
-11
lines changed

4 files changed

+26
-11
lines changed

‎content/en/containers/docker/apm.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,10 @@ List of all environment variables available for tracing within the Docker Agent:
8282
| `DD_API_KEY` | [Datadog API Key][1] |
8383
| `DD_PROXY_HTTPS` | Set up the URL for the proxy to use. |
8484
| `DD_APM_REPLACE_TAGS` | [Scrub sensitive data from your span's tags][2]. |
85-
| `DD_APM_FILTER_TAGS_REQUIRE` | Defines required tags that traces must have in order to be sent to Datadog. |
86-
| `DD_APM_FILTER_TAGS_REJECT` | Defines rejection tags. The Agent drops traces that have these tags. |
85+
| `DD_APM_FILTER_TAGS_REQUIRE` | Defines required tags that traces must have to be sent to Datadog. |
86+
| `DD_APM_FILTER_TAGS_REGEX_REQUIRE` | Defines regular expression for required tags that traces must have to be sent to Datadog. |
87+
| `DD_APM_FILTER_TAGS_REJECT` | Defines tags that traces must not contain. The Agent drops traces that have these tags. |
88+
| `DD_APM_FILTER_TAGS_REGEX_REJECT` | Defines regular expression for tags that traces must not contain. The Agent drops traces that have these tags. |
8789
| `DD_HOSTNAME` | Manually set the hostname to use for metrics if autodetection fails, or when running the Datadog Cluster Agent. |
8890
| `DD_DOGSTATSD_PORT` | Set the DogStatsD port. |
8991
| `DD_APM_RECEIVER_SOCKET` | Collect your traces through a Unix Domain Sockets and takes priority over hostname and port configuration if set. Off by default, when set it must point to a valid sock file. |

‎content/en/data_security/agent.md‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,23 @@ The official repositories and binary packages of the Agent are signed. Verify th
2626
- [7408BFD56BC5BF0C361AAAE85D88EEA3B01082D3][20]
2727
- [C6559B690CA882F023BDF3F63F4D1729FD4BF915][5]
2828
- [A4C0B90D7443CF6E4E8AA341F1068E14E09422B3][6]
29-
- Windows MSI:
30-
- DigiCert certificate fingerprint `B03F29CC07566505A718583E9270A6EE17678742`
3129
- MacOS PKG:
3230
- Apple certificate fingerprint `FDD2ADF623EA75E62C6DC6DBFBA7520CA549AB7314E660D78B0E3DCCF15B2FBA`
3331

3432
On Debian and Ubuntu, the `datadog-agent` package has a soft dependency on the `datadog-signing-keys` package, which makes the above keys trusted by APT. Keeping the package updated ensures the latest signing keys are present on your system.
3533

34+
### Windows MSI
35+
36+
To verify the signature of a Datadog Agent installer file on Windows, pipe the output of `Get-AuthenticodeSignature` through `FormatList` (`fl`) and make sure:
37+
- the status is valid
38+
- the certificate is signed by `Datadog, Inc`
39+
- the issuer is `DigiCert`
40+
41+
For example, to verify an .msi file named `ddagent-cli-7.49.1.msi`:
42+
{{< code-block lang="powershell" >}}
43+
Get-AuthenticodeSignature ddagent-cli-7.49.1.msi | fl
44+
{{< /code-block >}}
45+
3646
## Information security
3747

3848
The Datadog Agent submits data to Datadog over a TLS-encrypted TCP connection by default. As of version 6, the Agent can be configured to enforce a minimum TLS version when connecting to Datadog. If you require the use of strong cryptography, for example, to meet PCI requirements, you should use Agent v6/7 and set the `min_tls_version: 'tlsv1.2'` setting, or `force_tls_12: true` for Agent < 6.39.0/7.39.0, in the Agent's configuration file.

‎content/en/tracing/guide/ignoring_apm_resources.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ The filter tags option requires an exact string match. If your use case requires
3232
You can specify span tags to require or reject by using a list of keys and values separated by spaces in environment variables:
3333

3434
`DD_APM_FILTER_TAGS_REQUIRE`
35-
: Collects only traces that have root spans with an exact match for the specified span tags and values. If it does not match this rule, the trace is dropped. For example, `DD_APM_FILTER_TAGS_REQUIRE="key1:value1 key2:value2"`.
35+
: Collects only traces that have root spans with an exact match for the specified span tags and values. If it does not match this rule, the trace is dropped. For example, `DD_APM_FILTER_TAGS_REQUIRE="key1:value1 key2:value2"`. Regular expression can be provided with `DD_APM_FILTER_TAGS_REGEX_REQUIRE`.
3636

3737
`DD_APM_FILTER_TAGS_REJECT`
38-
: Rejects traces that have root spans with an exact match for the specified span tags and values. If it matches this rule, the trace is dropped. For example, `DD_APM_FILTER_TAGS_REJECT="key1:value1 key2:value2"`.
38+
: Rejects traces that have root spans with an exact match for the specified span tags and values. If it matches this rule, the trace is dropped. For example, `DD_APM_FILTER_TAGS_REJECT="key1:value1 key2:value2"`. Regular expression can be provided with `DD_APM_FILTER_TAGS_REGEX_REJECT`.
3939

4040

4141
{{< tabs >}}

‎content/en/tracing/trace_collection/compatibility/python.md‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,14 @@ Two release branches are supported:
2727

2828
And the library supports the following runtimes:
2929

30-
| OS | CPU | Runtime | Runtime version | Support ddtrace versions |
31-
|---------|-----------------------|---------|-----------------|--------------------------|
32-
| Linux | x86-64, i686, AArch64 | CPython | 2.7, 3.5-3.11 | `<2` |
33-
| MacOS | Intel, Apple Silicon | CPython | 2.7, 3.5-3.11 | `<2` |
34-
| Windows | 64bit, 32bit | CPython | 2.7, 3.5-3.11 | `<2` |
30+
| OS | CPU | Runtime | Runtime version | Supported ddtrace versions |
31+
|---------|-----------------------|---------|-----------------|---------------------------|
32+
| Linux | x86-64, i686, AArch64 | CPython | 2.7, 3.5-3.11 | `<2` |
33+
| MacOS | Intel, Apple Silicon | CPython | 2.7, 3.5-3.11 | `<2` |
34+
| Windows | 64bit, 32bit | CPython | 2.7, 3.5-3.11 | `<2` |
35+
| Linux | x86-64, i686, AArch64 | CPython | 3.7+ | `>=2` |
36+
| MacOS | Intel, Apple Silicon | CPython | 3.7+ | `>=2` |
37+
| Windows | 64bit, 32bit | CPython | 3.7+ | `>=2` |
3538

3639
## Integrations
3740

0 commit comments

Comments
 (0)