Skip to content

Commit 22d3d37

Browse files
hestonhoffmanhestonhoffman
authored
(DOCS-12521) Batch 1: Account Management + Agent (#32713)
* simplify agent page * account_management
1 parent ee36498 commit 22d3d37

File tree

9 files changed

+36
-157
lines changed

9 files changed

+36
-157
lines changed

‎assets/scripts/config/regions.config.js‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ export default {
4747
},
4848
tcp_endpoint: {
4949
us: 'agent-intake.logs.datadoghq.com',
50+
us3: 'The US3 TCP endpoint is not supported.',
5051
us5: 'The US5 TCP endpoint is not supported.',
5152
eu: 'agent-intake.logs.datadoghq.eu',
5253
ap1: 'The AP1 endpoint is not supported.',
@@ -69,6 +70,15 @@ export default {
6970
ap2: 'The AP2 endpoint is not supported.',
7071
gov: 'The GOV TCP endpoint port is not supported.'
7172
},
73+
hipaa_logs_legacy: {
74+
us: 'tcp-encrypted-intake.logs.datadoghq.com<br>lambda-tcp-encrypted-intake.logs.datadoghq.com<br>gcp-encrypted-intake.logs.datadoghq.com<br>http-encrypted-intake.logs.datadoghq.com',
75+
us3: 'lambda-tcp-encrypted-intake.logs.us3.datadoghq.com<br>gcp-encrypted-intake.logs.us3.datadoghq.com<br>http-encrypted-intake.logs.us3.datadoghq.com',
76+
us5: 'lambda-tcp-encrypted-intake.logs.us5.datadoghq.com<br>gcp-encrypted-intake.logs.us5.datadoghq.com<br>http-encrypted-intake.logs.us5.datadoghq.com',
77+
eu: 'tcp-encrypted-intake.logs.datadoghq.eu<br>lambda-tcp-encrypted-intake.logs.datadoghq.eu<br>gcp-encrypted-intake.logs.datadoghq.eu<br>http-encrypted-intake.logs.datadoghq.eu',
78+
ap1: 'N/A',
79+
ap2: 'N/A',
80+
gov: 'lambda-tcp-encrypted-intake.logs.ddog-gov.com<br>gcp-encrypted-intake.logs.ddog-gov.com<br>http-encrypted-intake.logs.ddog-gov.com'
81+
},
7282
web_integrations_endpoint: {
7383
us: 'intake.logs.datadoghq.com',
7484
us3: 'intake.logs.us3.datadoghq.com',
@@ -542,5 +552,14 @@ export default {
542552
ap1: 'config.ap1.datadoghq.com',
543553
ap2: 'violet.intake.ap2.datadoghq.com',
544554
gov: 'config.ddog-gov.com'
555+
},
556+
org_management_max_session_duration: {
557+
us: '720 hours (30 days)',
558+
us3: '720 hours (30 days)',
559+
us5: '720 hours (30 days)',
560+
eu: '720 hours (30 days)',
561+
ap1: '720 hours (30 days)',
562+
ap2: '720 hours (30 days)',
563+
gov: '12 hours'
545564
}
546565
};

‎config/_default/params.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ unsupported_sites:
266266
app_builder: [gov]
267267
application_security: [gov]
268268
autocomplete_search: [gov]
269+
azure-private-link: [us,us5,eu,gov,ap1,ap2]
269270
backstage: [gov]
270271
bits_ai: [gov]
271272
bits_ai_sre: [gov, ap2]
@@ -285,7 +286,9 @@ unsupported_sites:
285286
eng_reports: [gov]
286287
events_from_sns_emails: [gov]
287288
feature_flags: [gov]
289+
forwarding_audit_events: [gov]
288290
getting_started_feature_flags: [gov]
291+
gcp-private-service-connect: [us,us3,gov,ap1,ap2]
289292
google-hangouts-chat: [gov]
290293
fips-compliance: [us,us3,us5,eu,ap1,ap2]
291294
fips-integrations: [us,us3,us5,eu,ap1,ap2]

‎content/en/account_management/audit_trail/forwarding_audit_events.md‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,9 @@ further_reading:
88
text: "Learn more about Audit Trail"
99
---
1010

11-
{{% site-region region="gov" %}}
12-
<div class="alert alert-danger">
13-
Audit Event Forwarding is not available in the US1-FED site.
14-
</div>
15-
{{% /site-region %}}
16-
17-
{{% site-region region="us,us3,us5,eu,ap1,ap2" %}}
1811
<div class="alert alert-danger">
1912
Audit Event Forwarding is in Preview.
2013
</div>
21-
{{% /site-region %}}
2214

2315
## Overview
2416

‎content/en/account_management/multi_organization.md‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -64,20 +64,10 @@ Onboarding a new sub-organization with a set of baseline dashboards and monitors
6464
The custom sub-domain feature is not enabled by default. Contact [Datadog support][1] to have it enabled.
6565

6666
If you are a member of multiple organizations, custom sub-domains help you identify the source of an alert or notification. Also, they can immediately switch you to the organization associated with the sub-domain.
67-
{{% site-region region="us,us3,us5,ap1,ap2" %}}
68-
For example, the URL `https://app.datadoghq.com/event/event?id=1` is associated with an event in Organization A. If a user is a member of both Organization A and Organization B, but is viewing Datadog within the context of Organization B, then that URL returns a `404 Not Found error`. The user must switch to Organization A using the [user account settings menu][2], then revisit the URL. However, with custom sub-domains, the user could navigate to `https://org-a.datadoghq.com/event/event?id=1` which would automatically switch the user's context to Organization A and display the correct page.
6967

70-
**Note**: If you have a custom Datadog subdomain, manually edit the links from the Datadog documentation with your subdomain name. For example, a link redirecting to `https://**app**.datadoghq.com/account/settings` becomes `https://**<custom_sub-domain_name>**.datadoghq.com/account/settings`. {{% /site-region %}}
68+
For example, the URL **https:{{< region-param key=dd_full_site >}}/event/event?id=1** is associated with an event in Organization A. If a user is a member of both Organization A and Organization B, but is viewing Datadog within the context of Organization B, then that URL returns a `404 Not Found error`. The user must switch to Organization A using the [user account settings menu][2], then revisit the URL. However, with custom sub-domains, the user could navigate to **https://org-a.{{< region-param key=dd_site >}}/event/event?id=1** which would automatically switch the user's context to Organization A and display the correct page.
7169

72-
{{% site-region region="eu" %}}
73-
For example, the URL `https://app.datadoghq.eu/event/event?id=1` is associated with an event in Organization A. If a user is a member of both Organization A and Organization B, but is viewing Datadog within the context of Organization B, then that URL returns a `404 Not Found error`. The user must switch to Organization A using the [user account settings menu][2], then revisit the URL. However, with custom sub-domains, the user could navigate to `https://org-a.datadoghq.eu/event/event?id=1` which would automatically switch the user's context to Organization A and display the correct page.
74-
75-
**Note**: If you have a custom Datadog subdomain, manually edit the links from the Datadog documentation with your subdomain name. For example, a link redirecting to `https://**app**.datadoghq.eu/account/settings` becomes `https://**<custom_sub-domain_name>**.datadoghq.eu/account/settings`. {{% /site-region %}}
76-
77-
{{% site-region region="gov" %}}
78-
For example, the URL `https://app.ddog-gov.com/event/event?id=1` is associated with an event in Organization A. If a user is a member of both Organization A and Organization B, but is viewing Datadog within the context of Organization B, then that URL returns a `404 Not Found error`. The user must switch to Organization A using the [user account settings menu][2], then revisit the URL. However, with custom sub-domains, the user could navigate to `https://org-a.ddog-gov.com/event/event?id=1` which would automatically switch the user's context to Organization A and display the correct page.
79-
80-
**Note**: If you have a custom Datadog subdomain, manually edit the links from the Datadog documentation with your subdomain name. For example, a link redirecting to `https://**app**.ddog-gov.com/account/settings` becomes `https://**<custom_sub-domain_name>**.ddog-gov.com/account/settings`. {{% /site-region %}}
70+
**Note**: If you have a custom Datadog subdomain, manually edit the links from the Datadog documentation with your subdomain name. For example, a link redirecting to **https:{{< region-param key=dd_full_site >}}/account/settings** becomes **https://<custom_sub-domain_name>.{{< region-param key=dd_site >}}/account/settings**.
8171

8272
## Set up SAML
8373

‎content/en/account_management/org_settings.md‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -138,14 +138,8 @@ When enabled, users with `Modify Index` permission can choose any of the 3-, 7-,
138138
Users with the `Org Management` permission can set a maximum session duration for their organization. The duration applies to all new web sessions created after you change it, for all users, regardless of their role in the organization. It doesn't apply to Datadog mobile application sessions.
139139

140140
The session duration can be configured within the following limits:
141-
{{% site-region region="gov" %}}
142141
- **Minimum duration:** 1 hour
143-
- **Maximum duration:** 12 hours
144-
{{% /site-region %}}
145-
{{% site-region region="us,eu,us3,us5,ap1,ap2" %}}
146-
- **Minimum duration:** 1 hour
147-
- **Maximum duration:** 720 hours (30 days)
148-
{{% /site-region %}}
142+
- **Maximum duration:** {{< region-param key=org_management_max_session_duration >}}
149143

150144
{{< img src="account_management/org_settings/max_session_duration.png" alt="Max Session Duration Setting" style="width:70%;" >}}
151145

‎content/en/account_management/saml/_index.md‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,9 @@ Configuring [SAML (Security Assertion Markup Language)][1] for your Datadog acco
2222

2323
{{% site-region region="us,us3,us5,eu,ap1,ap2" %}}
2424
- If you don't have SAML enabled on your Datadog account, reach out to [support][2] to enable it.
25-
- This documentation assumes that you already have a SAML Identity Provider (IdP). If you do not have a SAML IdP, there are several IdPs that have integrations with Datadog such as [Active Directory][3], [Auth0][4], [Google][5], [LastPass][6], [Microsoft Entra ID][3], [Okta][7], and [SafeNet][8].
26-
- SAML configuration requires [Datadog Administrator][9] access.
2725
{{% /site-region %}}
28-
29-
{{% site-region region="gov" %}}
3026
- This documentation assumes that you already have a SAML Identity Provider (IdP). If you do not have a SAML IdP, there are several IdPs that have integrations with Datadog such as [Active Directory][3], [Auth0][4], [Google][5], [LastPass][6], [Microsoft Entra ID][3], [Okta][7], and [SafeNet][8].
3127
- SAML configuration requires [Datadog Administrator][9] access.
32-
{{% /site-region %}}
3328

3429
## Configuring SAML
3530

‎content/en/agent/configuration/network.md‎

Lines changed: 11 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -102,104 +102,13 @@ API test results for the Synthetics Worker < v0.1.5: `api.`{{< region-param key=
102102

103103
{{% /site-region %}}
104104

105-
{{% site-region region="us" %}}
106-
[Logs][200] & [HIPAA logs][201]
107-
: TCP: `agent-intake.logs.datadoghq.com`<br>
108-
HTTP: `agent-http-intake.logs.datadoghq.com`<br>
109-
Other: See [logs endpoints][203]
110-
111-
[HIPAA logs legacy][201]
112-
: `tcp-encrypted-intake.logs.datadoghq.com`<br>
113-
`lambda-tcp-encrypted-intake.logs.datadoghq.com`<br>
114-
`gcp-encrypted-intake.logs.datadoghq.com`<br>
115-
`http-encrypted-intake.logs.datadoghq.com`
116-
117-
[200]: /logs/
118-
[201]: /data_security/logs/#hipaa-enabled-customers
119-
[203]: /logs/log_collection/#logging-endpoints
120-
{{% /site-region %}}
121-
122-
{{% site-region region="eu" %}}
123-
[Logs][200] & [HIPAA logs][201]
124-
: TCP: `agent-intake.logs.datadoghq.eu`<br>
125-
HTTP: `agent-http-intake.logs.datadoghq.eu`<br>
126-
Other: See [logs endpoints][202]
127-
128-
[HIPAA logs legacy][201]
129-
: `tcp-encrypted-intake.logs.datadoghq.eu`<br>
130-
`lambda-tcp-encrypted-intake.logs.datadoghq.eu`<br>
131-
`gcp-encrypted-intake.logs.datadoghq.eu`<br>
132-
`http-encrypted-intake.logs.datadoghq.eu`
133-
134-
[200]: /logs/
135-
[201]: /data_security/logs/#hipaa-enabled-customers
136-
[202]: /logs/log_collection/#logging-endpoints
137-
{{% /site-region %}}
138-
139-
{{% site-region region="us3" %}}
140-
[Logs][200] & [HIPAA logs][201]
141-
: HTTP: `agent-http-intake.logs.us3.datadoghq.com`<br>
142-
Other: See [logs endpoints][202]
143-
144-
[HIPAA logs legacy][201]
145-
: `lambda-tcp-encrypted-intake.logs.us3.datadoghq.com`<br>
146-
`gcp-encrypted-intake.logs.us3.datadoghq.com`<br>
147-
`http-encrypted-intake.logs.us3.datadoghq.com`
148-
149-
[200]: /logs/
150-
[201]: /data_security/logs/#hipaa-enabled-customers
151-
[202]: /logs/log_collection/#logging-endpoints
152-
{{% /site-region %}}
153-
154-
{{% site-region region="us5" %}}
155-
[Logs][200] & [HIPAA logs][201]
156-
: HTTP: `agent-http-intake.logs.us5.datadoghq.com`<br>
157-
Other: See [logs endpoints][202]
158-
159-
[HIPAA logs legacy][201]
160-
: `lambda-tcp-encrypted-intake.logs.us5.datadoghq.com`<br>
161-
`gcp-encrypted-intake.logs.us5.datadoghq.com`<br>
162-
`http-encrypted-intake.logs.us5.datadoghq.com`
163-
164-
[200]: /logs/
165-
[201]: /data_security/logs/#hipaa-enabled-customers
166-
[202]: /logs/log_collection/#logging-endpoints
167-
{{% /site-region %}}
168-
169-
{{% site-region region="ap1" %}}
170-
[Logs][200] & [HIPAA logs][201]
171-
: HTTP: `agent-http-intake.logs.ap1.datadoghq.com`<br>
172-
Other: See [logs endpoints][202]
173-
174-
[200]: /logs/
175-
[201]: /data_security/logs/#hipaa-enabled-customers
176-
[202]: /logs/log_collection/#logging-endpoints
177-
{{% /site-region %}}
178-
179-
{{% site-region region="ap2" %}}
180-
[Logs][200] & [HIPAA logs][201]
181-
: HTTP: `agent-http-intake.logs.ap2.datadoghq.com`<br>
182-
Other: See [logs endpoints][202]
183-
184-
[200]: /logs/
185-
[201]: /data_security/logs/#hipaa-enabled-customers
186-
[202]: /logs/log_collection/#logging-endpoints
187-
{{% /site-region %}}
105+
[Logs][30] & [HIPAA logs][31]
106+
: TCP: {{< region-param key=tcp_endpoint code="true" >}}<br>
107+
HTTP: {{< region-param key=agent_http_endpoint code="true" >}}<br>
108+
Other: See [logs endpoints][32]
188109

189-
{{% site-region region="gov" %}}
190-
[Logs][200] & [HIPAA logs][201]
191-
: HTTP: `agent-http-intake.logs.ddog-gov.com`<br>
192-
Other: See [logs endpoints][202]
193-
194-
[HIPAA logs legacy][201]
195-
: `lambda-tcp-encrypted-intake.logs.ddog-gov.com`<br>
196-
`gcp-encrypted-intake.logs.ddog-gov.com`<br>
197-
`http-encrypted-intake.logs.ddog-gov.com`
198-
199-
[200]: /logs/
200-
[201]: /data_security/logs/#hipaa-enabled-customers
201-
[202]: /logs/log_collection/#logging-endpoints
202-
{{% /site-region %}}
110+
[HIPAA logs legacy][31]
111+
: {{< region-param key=hipaa_logs_legacy code="true" >}}
203112

204113
[Metrics][26], [Service Checks][27], [Events][28], and other Agent metadata
205114
: `<VERSION>-app.agent.`{{< region-param key="dd_site" code="true" >}}<br>
@@ -264,29 +173,13 @@ Open the following ports to benefit from all the **Agent** functionalities:
264173

265174
#### Outbound
266175

267-
{{% site-region region="us" %}}
268-
269-
| Product/Functionality | Port | Protocol | Description |
270-
| ------ | ---- | ------- | ----------- |
271-
| Agent<br>APM<br>Containers<br>Live Processes<br>Metrics<br>Cloud Network Monitoring<br>Universal Service Monitoring | 443 | TCP | Most Agent data uses port 443. |
272-
| [Custom Agent Autoscaling][22] | 8443 | TCP | |
273-
| Log collection | 10516 | TCP | Logging over TCP. See [logs endpoints][21] for other connection types. |
274-
| NTP | 123 | UDP | Network Time Protocol (NTP). See [default NTP targets][20].<br>For information on troubleshooting NTP, see [NTP issues][19]. |
275-
276-
[19]: /agent/faq/network-time-protocol-ntp-offset-issues/
277-
[20]: /integrations/ntp/#overview
278-
[21]: /logs/log_collection/#logging-endpoints
279-
[22]: /containers/guide/cluster_agent_autoscaling_metrics
280-
281-
{{% /site-region %}}
282-
283-
{{% site-region region="eu" %}}
176+
{{% site-region region="us,eu" %}}
284177

285178
| Product/Functionality | Port | Protocol | Description |
286179
| ------ | ---- | ------- | ----------- |
287180
| Agent<br>APM<br>Containers<br>Live Processes<br>Metrics<br>Cloud Network Monitoring<br>Universal Service Monitoring | 443 | TCP | Most Agent data uses port 443. |
288181
| [Custom Agent Autoscaling][22] | 8443 | TCP | |
289-
| Log collection | 443 | TCP | Logging over TCP. See [logs endpoints][21] for other connection types. |
182+
| Log collection | {{< region-param key=web_integrations_port >}} | TCP | Logging over TCP. See [logs endpoints][21] for other connection types. |
290183
| NTP | 123 | UDP | Network Time Protocol (NTP). See [default NTP targets][20].<br>For information on troubleshooting NTP, see [NTP issues][19]. |
291184

292185
[19]: /agent/faq/network-time-protocol-ntp-offset-issues/
@@ -435,3 +328,6 @@ If you are installing the Datadog Operator in a Kubernetes environment with limi
435328
[27]: /developers/service_checks/
436329
[28]: /events/
437330
[29]: /security/cloud_security_management/vulnerabilities/
331+
[30]: /logs/
332+
[31]: /data_security/logs/#hipaa-enabled-customers
333+
[32]: /logs/log_collection/#logging-endpoints

‎content/en/agent/guide/azure-private-link.md‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ title: Connect to Datadog over Azure Private Link
33
description: Configure Azure Private Link to send telemetry to Datadog securely without using the public internet, including endpoint setup and DNS configuration.
44
---
55

6-
{{% site-region region="us,us5,eu,gov,ap1,ap2" %}}
7-
<div class="alert alert-danger">This feature is not supported for the selected Datadog site.</div>
8-
{{% /site-region %}}
9-
10-
{{% site-region region="us3" %}}
116
[Azure Private Link][1] allows you to send telemetry to Datadog without using the public internet.
127

138
Datadog exposes some of its data intake services as [Azure Private Link services][2].
@@ -94,4 +89,3 @@ Create a Private DNS Zone for `agent.`{{< region-param key="dd_site" code="true"
9489
[1]: https://azure.microsoft.com/en-us/products/private-link
9590
[2]: https://learn.microsoft.com/en-us/azure/private-link/private-link-service-overview
9691
[3]: https://learn.microsoft.com/en-us/azure/dns/private-dns-privatednszone
97-
{{% /site-region %}}

‎content/en/agent/guide/gcp-private-service-connect.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ further_reading:
1010
text: 'Connect to Datadog over AWS PrivateLink'
1111
---
1212

13-
{{% site-region region="us,us3,gov,ap1,ap2" %}}
14-
<div class="alert alert-danger">This feature is not supported for the selected Datadog site.</div>
15-
{{% /site-region %}}
16-
1713
{{% site-region region="us5" %}}
1814
[Google Cloud Private Service Connect][1] (PSC) allows you to send telemetry to Datadog without using the public internet.
1915

0 commit comments

Comments
 (0)