Skip to content

Commit 85677b6

Browse files
committed
Merge branch 'merge' into pr-27150
* merge: (30 commits) Revert "Update minimum Ruby tracer version for dynamic instrumentation to 2.9.0 (#27233)" Update custom-javascript-assertion.md (#26973) [DOCS-9908] Update RUM react initialization parameter (#27231) Update minimum Ruby tracer version for dynamic instrumentation to 2.9.0 (#27233) (DOCS-9604) Update images and text to match new panel style (#27173) Bump otel-agent version to 7.61 (#27221) Add note about key validation delay to API and Application keys docum… (#27210) Add support for vulnerability management - GetSBOM new endpoint (#27128) [ACCESS-3116] Show display name of permissions on permissions page (#27218) [DOCS-9912] Remove SDS via agent (#27215) [SDCI-880] Add K8s explanation for infra correlation for Gitlab (#27061) [AWSX] Update AWS integration role documentation (#27205) Include Weaver as a supported framework in Test Optimization for Java (#27152) (DOCS-9872) Add docs for Form component (#27118) OTel Troubleshooting Update (#27010) DOCS-9641 Take 2 (#27213) init (#27212) Updates the language on the serverless init cloud run page to push customers to use the sidecar (#27101) add additional note to the getlog limitation (#27209) fix ref numbers (#27206) ...
2 parents 36f8b96 + 47d0627 commit 85677b6

File tree

83 files changed

+3770
-448
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+3770
-448
lines changed

.apigentools-info

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
"spec_versions": {
55
"v1": {
66
"apigentools_version": "1.6.6",
7-
"regenerated": "2025-01-17 21:42:34.411023",
8-
"spec_repo_commit": "27e609f7"
7+
"regenerated": "2025-01-22 15:55:44.650228",
8+
"spec_repo_commit": "7a8ea4b1"
99
},
1010
"v2": {
1111
"apigentools_version": "1.6.6",
12-
"regenerated": "2025-01-17 21:42:42.448005",
13-
"spec_repo_commit": "27e609f7"
12+
"regenerated": "2025-01-22 15:55:52.977760",
13+
"spec_repo_commit": "7a8ea4b1"
1414
}
1515
}
1616
}

config/_default/menus/api.en.yaml

+15-2
Original file line numberDiff line numberDiff line change
@@ -2587,7 +2587,20 @@ menu:
25872587
- ListVulnerabilities
25882588
unstable:
25892589
- v2
2590-
order: 3
2590+
order: 25
2591+
- name: Get SBOM
2592+
url: '#get-sbom'
2593+
identifier: security-monitoring-get-sbom
2594+
parent: security-monitoring
2595+
generated: true
2596+
params:
2597+
versions:
2598+
- v2
2599+
operationids:
2600+
- GetSBOM
2601+
unstable:
2602+
- v2
2603+
order: 27
25912604
- name: List vulnerable assets
25922605
url: '#list-vulnerable-assets'
25932606
identifier: security-monitoring-list-vulnerable-assets
@@ -2600,7 +2613,7 @@ menu:
26002613
- ListVulnerableAssets
26012614
unstable:
26022615
- v2
2603-
order: 4
2616+
order: 26
26042617
- name: Get a finding
26052618
url: '#get-a-finding'
26062619
identifier: security-monitoring-get-a-finding

config/_default/menus/main.en.yaml

+25
Original file line numberDiff line numberDiff line change
@@ -1904,6 +1904,31 @@ menu:
19041904
parent: service_catalog
19051905
identifier: service_catalog_use_cases
19061906
weight: 3
1907+
- name: API Management
1908+
url: service_catalog/use_cases/api_management
1909+
parent: service_catalog_use_cases
1910+
identifier: service_catalog_use_cases_api_management
1911+
weight: 301
1912+
- name: Cloud Cost Management
1913+
url: service_catalog/use_cases/cloud_cost_management
1914+
parent: service_catalog_use_cases
1915+
identifier: service_catalog_use_cases_cloud_cost_management
1916+
weight: 302
1917+
- name: Application Security Management
1918+
url: service_catalog/use_cases/appsec_management
1919+
parent: service_catalog_use_cases
1920+
identifier: service_catalog_use_cases_appsec_management
1921+
weight: 303
1922+
- name: Developer Onboarding
1923+
url: service_catalog/use_cases/dev_onboarding
1924+
parent: service_catalog_use_cases
1925+
identifier: service_catalog_use_cases_dev_onboarding
1926+
weight: 304
1927+
- name: Dependency Management
1928+
url: service_catalog/use_cases/dependency_management
1929+
parent: service_catalog_use_cases
1930+
identifier: service_catalog_use_cases_dependency_management
1931+
weight: 305
19071932
- name: Manage a Component
19081933
url: service_catalog/manage
19091934
parent: service_catalog

content/en/account_management/api-app-keys.md

+2
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ To add a Datadog API key or client token:
5656

5757
- Your org must have at least one API key and at most 50 API keys.
5858
- Key names must be unique across your organization.
59+
- Newly created API keys typically take a few seconds to become valid.
5960

6061
## Remove API keys or client tokens
6162

@@ -70,6 +71,7 @@ To add a Datadog application key, navigate to [**Organization Settings** > **App
7071
**Notes:**
7172

7273
- Application key names cannot be blank.
74+
- Newly created Application keys typically take a few seconds to become valid.
7375

7476
## Remove application keys
7577

content/en/account_management/org_settings/oauth_apps.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ Use the **OAuth Apps** management page under [Organization Settings][1] to manag
1414
## Setup
1515
### Permissions
1616

17-
By default, users with [Datadog Standard and Datadog Admin roles][2] can access the OAuth Apps management page. If your organization has [custom roles][3] defined, add your user to any custom role with `org_authorized_apps_read` and `org_authorized_apps_write` permissions.
17+
By default, users with the [Datadog Admin role][2] can access the OAuth Apps management page. If your organization has [custom roles][3] defined, add your user to any custom role with the `org_management` permission.
1818

19-
Only users with the Datadog Admin role or the `org_authorized_apps_write` permission can manage OAuth applications on this page, such as disabling applications or revoking OAuth access for a user.
19+
Only users with the Datadog Admin role or the `org_management` permission can manage OAuth applications on this page, such as disabling applications or revoking OAuth access for a user.
2020

2121
### Enable
2222

23-
Enabled OAuth applications allow users with necessary permissions to authorize access on their behalf. OAuth applications include the Datadog Mobile App<!-- and your custom [UI Extensions][4] that have [OAuth API Access][5]-->.
23+
Enabled OAuth applications allow users with necessary permissions to authorize access on their behalf. OAuth applications include the Datadog Mobile App<!-- and your custom [UI Extensions][4] that have [OAuth API Access][5]-->.
2424

2525
### Disable
2626

content/en/agent/configuration/network.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ Add the following domains to your inclusion list to allow for Agent installation
4646
: `trace.agent.`{{< region-param key="dd_site" code="true" >}}<br>
4747
`instrumentation-telemetry-intake.`{{< region-param key="dd_site" code="true" >}}
4848

49+
[LLM Observabilty][23]
50+
: `llmobs-intake.`{{< region-param key="dd_site" code="true" >}}
51+
4952
[Container Images][13]
5053
: `contimage-intake.`{{< region-param key="dd_site" code="true" >}}
5154

@@ -393,4 +396,5 @@ To avoid running out of storage space, the Agent stores the metrics on disk only
393396
[19]: /agent/faq/network-time-protocol-ntp-offset-issues/
394397
[20]: /integrations/ntp/#overview
395398
[21]: /logs/log_collection/#logging-endpoints
396-
[22]: /containers/guide/cluster_agent_autoscaling_metrics
399+
[22]: /containers/guide/cluster_agent_autoscaling_metrics
400+
[23]: /llm_observability/

content/en/agent/logs/advanced_log_collection.md

-4
Original file line numberDiff line numberDiff line change
@@ -258,10 +258,6 @@ spec:
258258

259259
## Scrub sensitive data from your logs
260260

261-
{{< callout url="https://www.datadoghq.com/private-beta/sensitive-data-scanner-using-agent-in-your-premises/" >}}
262-
Sensitive Data Scanner using the Agent is in Preview. See the <a href="https://www.datadoghq.com/blog/sensitive-data-scanner-using-the-datadog-agent/">blog post</a> and <a href="https://docs.datadoghq.com/sensitive_data_scanner/">documentation</a> for more information. To request access, fill out this form.
263-
{{< /callout >}}
264-
265261
If your logs contain sensitive information that need redacting, configure the Datadog Agent to scrub sensitive sequences by using the `log_processing_rules` parameter in your configuration file with the `mask_sequences` type.
266262

267263
This replaces all matched groups with the value of the `replace_placeholder` parameter.

content/en/api/v2/ci-visibility-pipelines/examples.json

+2-1
Large diffs are not rendered by default.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"data": {
3+
"attributes": {
4+
"provider_name": "example-provider",
5+
"resource": {
6+
"level": "pipeline",
7+
"unique_id": "3eacb6f3-ff04-4e10-8a9c-46e6d054024a",
8+
"name": "Deploy to AWS",
9+
"url": "https://my-ci-provider.example/pipelines/my-pipeline/run/1",
10+
"start": "2021-11-11T11:09:11+00:00",
11+
"end": "2021-11-11T11:10:41+00:00",
12+
"status": "success",
13+
"partial_retry": false,
14+
"git": {
15+
"repository_url": "https://github.com/DataDog/datadog-agent",
16+
"sha": "7f263865994b76066c4612fd1965215e7dcb4cd2",
17+
"author_email": "[email protected]"
18+
}
19+
}
20+
},
21+
"type": "cipipeline_resource_request"
22+
}
23+
}

content/en/api/v2/security-monitoring/examples.json

+101
Large diffs are not rendered by default.

content/en/cloud_cost_management/datadog_costs/_index.md

+4-5
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,7 @@ You can use out-of-the-box tags to break down and allocate your Datadog cost dat
7676
[4]: https://app.datadoghq.com/billing/usage
7777
[5]: /account_management/plan_and_usage/cost_details/#cost-summary-sub-organization
7878
[6]: /account_management/rbac/
79-
[7]: /account_management/rbac/permissions
80-
[8]: /account_management/plan_and_usage/cost_details/
81-
[9]: /account_management/billing/usage_attribution/
82-
[10]: /account_management/plan_and_usage/cost_details/#cost-summary
83-
[11]: /account_management/plan_and_usage/cost_details/#cost-chargebacks
79+
[7]: /account_management/plan_and_usage/cost_details/
80+
[8]: /account_management/billing/usage_attribution/
81+
[9]: /account_management/plan_and_usage/cost_details/#cost-summary
82+
[10]: /account_management/plan_and_usage/cost_details/#cost-chargebacks

content/en/cloud_cost_management/recommendations/_index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ multifiltersearch:
280280
cloud_provider: AWS
281281
resource_type: Kubernetes containers
282282
recommendation_type: Over-provisioned Kubernetes Containers
283-
recommendation_description: Containers with less than 30% CPU and memory utilization.
283+
recommendation_description: Containers with less than 30% max CPU or memory utilization.
284284
recommendation_prerequisites: "[Datadog profiling agent](/profiler/enabling/)"
285285
- category: Over-provisioned resource
286286
cloud_provider: AWS

content/en/continuous_integration/pipelines/gitlab.md

+49-39
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,27 @@ further_reading:
2020

2121
## Overview
2222

23-
[GitLab][19] is a DevOps platform that automates the software development lifecycle with integrated CI/CD features, enabling you to deploy applications quickly and securely.
23+
[GitLab][18] is a DevOps platform that automates the software development lifecycle with integrated CI/CD features, enabling automated, continuous deployment of applications with built-in security controls.
2424

2525
Set up tracing in GitLab to collect data on your pipeline executions, analyze performance bottlenecks, troubleshoot operational issues, and optimize your deployment workflows.
2626

2727
### Compatibility
2828

2929
| Pipeline Visibility | Platform | Definition |
3030
|---|---|---|
31-
| [Running pipelines][25] | Running pipelines | View pipeline executions that are running. Queued or waiting pipelines show with status "Running" on Datadog. |
32-
| [Partial retries][20] | Partial pipelines | View partially retried pipeline executions. |
33-
| [Manual steps][21] | Manual steps | View manually triggered pipelines. |
34-
| [Queue time][22] | Queue time | View the amount of time pipeline jobs sit in the queue before processing. |
31+
| [Running pipelines][24] | Running pipelines | View pipeline executions that are running. Queued or waiting pipelines show with status "Running" on Datadog. |
32+
| [Partial retries][19] | Partial pipelines | View partially retried pipeline executions. |
33+
| [Manual steps][20] | Manual steps | View manually triggered pipelines. |
34+
| [Queue time][21] | Queue time | View the amount of time pipeline jobs sit in the queue before processing. |
3535
| Logs correlation | Logs correlation | Correlate pipeline spans to logs and enable [job log collection][12]. |
3636
| Infrastructure metric correlation | Infrastructure metric correlation | Correlate jobs to [infrastructure host metrics][14] for self-hosted GitLab runners. |
3737
| Custom pre-defined tags | Custom pre-defined tags | Set [custom tags][10] to all generated pipeline, stages, and job spans. |
3838
| [Custom tags][15] [and measures at runtime][16] | Custom tags and measures at runtime | Configure [custom tags and measures][13] at runtime. |
3939
| Parameters | Parameters | Set custom `env` or `service` parameters when a pipeline is triggered. |
4040
| [Pipeline failure reasons][11] | Pipeline failure reasons | Identify pipeline failure reasons from [error messages][15]. |
41-
| [Approval wait time][23] | Approval wait time | View the amount of time jobs and pipelines wait for manual approvals. |
42-
| [Execution time][24] | Execution time | View the amount of time pipelines have been running jobs. Gitlab refers to this metric as `duration`. Duration in Gitlab and execution time may show different values. Gitlab does not take into consideration jobs that failed due to certain kinds of failures (such as runner system failures). |
43-
| [Custom spans][26] | Custom spans | Configure custom spans for your pipelines. |
41+
| [Approval wait time][22] | Approval wait time | View the amount of time jobs and pipelines wait for manual approvals. |
42+
| [Execution time][23] | Execution time | View the amount of time pipelines have been running jobs. Gitlab refers to this metric as `duration`. Duration in Gitlab and execution time may show different values. Gitlab does not take into consideration jobs that failed due to certain kinds of failures (such as runner system failures). |
43+
| [Custom spans][25] | Custom spans | Configure custom spans for your pipelines. |
4444

4545
The following GitLab versions are supported:
4646

@@ -253,34 +253,46 @@ If you are using self-hosted GitLab runners, you can correlate jobs with the inf
253253

254254
Datadog infrastructure correlation is possible using different methods:
255255

256-
#### Tagging runners with hostname
257-
258-
The GitLab runner must have a tag of the form `host:<hostname>`. Tags can be added while [registering a new runner][6]. As a result, this method is only available when the runner is directly running the job.
256+
{{< tabs >}}
257+
{{% tab "Non autoscaling executors" %}}
258+
The GitLab runner must have a tag in the form `host:<hostname>`. Tags can be added while [registering a new runner][1]. As a result, this method is only available when the runner is directly running the job.
259259

260260
This excludes executors that are autoscaling the infrastructure in order to run the job (such as the Kubernetes, Docker Autoscaler, or Instance executors) as it is not possible to add tags dynamically for those runners.
261261

262262
For existing runners:
263263

264-
{{< tabs >}}
265-
{{% tab "GitLab &gt;&equals; 15.8" %}}
266-
Add tags through the UI by going to **Settings > CI/CD > Runners** and editing the appropriate runner.
264+
- GitLab >= 15.8: Add tags through the UI by going to **Settings > CI/CD > Runners** and editing the appropriate runner.
265+
266+
- GitLab < 15.8: Add tags by updating the runner's `config.toml`. Or add tags through the UI by going to **Settings > CI/CD > Runners** and editing the appropriate runner.
267+
268+
After these steps, CI Visibility adds the hostname to each job. To see the metrics, click on a job span in the trace view. In the drawer, a new tab named **Infrastructure** appears which contains the host metrics.
269+
270+
[1]: https://docs.gitlab.com/runner/register/
267271
{{% /tab %}}
268272

269-
{{% tab "GitLab &lt; 15.8" %}}
270-
Add tags by updating the runner's `config.toml`. Or add tags
271-
through the UI by going to **Settings > CI/CD > Runners** and editing the appropriate runner.
273+
{{% tab "Docker Autoscaler" %}}
274+
CI Visibility supports Infrastructure metrics for "Docker Autoscaler" executors. For more information, see the [Correlate Infrastructure Metrics with GitLab Jobs guide][1].
275+
276+
[1]: /continuous_integration/guides/infrastructure_metrics_with_gitlab
272277
{{% /tab %}}
273-
{{< /tabs >}}
274278

275-
After these steps, CI Visibility adds the hostname to each job. To see the metrics, click on a job span in the trace view. In the drawer, a new tab named **Infrastructure** appears which contains the host metrics.
279+
{{% tab "Instance" %}}
280+
CI Visibility supports Infrastructure metrics for "Instance" executors. For more information, see the [Correlate Infrastructure Metrics with GitLab Jobs guide][1].
276281

277-
#### Instance and Docker Autoscaler executors
282+
[1]: /continuous_integration/guides/infrastructure_metrics_with_gitlab
283+
{{% /tab %}}
278284

279-
CI Visibility also supports Infrastructure metrics for "Instance" and "Docker Autoscaler" executors. For more information, see the [Correlate Infrastructure Metrics with GitLab Jobs guide][18].
285+
{{% tab "Kubernetes" %}}
286+
CI Visibility supports Infrastructure metrics for the Kubernetes executor. For this, it is necessary to have the Datadog Agent monitoring the Kubernetes Gitlab infrastructure. See [Install the Datadog Agent on Kubernetes][1] to install the Datadog Agent in a Kubernetes cluster.
280287

281-
#### Other executors
288+
[1]: /containers/kubernetes/installation/?tab=datadogoperator
289+
{{% /tab %}}
282290

283-
CI Visibility does not support Infrastructure metrics for other executors such as the Kubernetes executor.
291+
{{% tab "Other executors" %}}
292+
CI Visibility does not support Infrastructure metrics for other executors.
293+
{{% /tab %}}
294+
295+
{{< /tabs >}}
284296

285297
### View error messages for pipeline failures
286298

@@ -366,13 +378,13 @@ The <a href="https://docs.gitlab.com/ee/administration/object_storage.html#amazo
366378
{{% /tab %}}
367379
{{< /tabs >}}
368380

369-
Logs are billed separately from CI Visibility. Log retention, exclusion, and indexes are configured in [Log Management][29]. Logs for GitLab jobs can be identified by the `datadog.product:cipipeline` and `source:gitlab` tags.
381+
Logs are billed separately from CI Visibility. Log retention, exclusion, and indexes are configured in [Log Management][6]. Logs for GitLab jobs can be identified by the `datadog.product:cipipeline` and `source:gitlab` tags.
370382

371383
For more information about processing job logs collected from the GitLab integration, see the [Processors documentation][17].
372384

373385
## View partial and downstream pipelines
374386

375-
You can use the following filters to customize your search query in the [CI Visibility Explorer][27].
387+
You can use the following filters to customize your search query in the [CI Visibility Explorer][26].
376388

377389
{{< img src="ci/partial_retries_search_tags.png" alt="The Pipeline executions page with Partial Pipeline:retry entered in the search query" style="width:100%;">}}
378390

@@ -390,7 +402,7 @@ You can also apply these filters using the facet panel on the left hand side of
390402

391403
Once the integration is successfully configured, the [**CI Pipeline List**][4] and [**Executions**][5] pages populate with data after the pipelines finish.
392404

393-
The **CI Pipeline List** page shows data for only the default branch of each repository. For more information, see [Search and Manage CI Pipelines][28].
405+
The **CI Pipeline List** page shows data for only the default branch of each repository. For more information, see [Search and Manage CI Pipelines][27].
394406

395407
## Further reading
396408

@@ -401,7 +413,7 @@ The **CI Pipeline List** page shows data for only the default branch of each rep
401413
[3]: https://docs.gitlab.com/ee/user/project/integrations/webhooks.html
402414
[4]: https://app.datadoghq.com/ci/pipelines
403415
[5]: https://app.datadoghq.com/ci/pipeline-executions
404-
[6]: https://docs.gitlab.com/runner/register/
416+
[6]: /logs/guide/best-practices-for-log-management/
405417
[7]: https://docs.gitlab.com/ee/administration/job_artifacts.html#using-object-storage
406418
[8]: https://docs.gitlab.com/ee/administration/feature_flags.html
407419
[9]: /logs/
@@ -413,15 +425,13 @@ The **CI Pipeline List** page shows data for only the default branch of each rep
413425
[15]: /continuous_integration/pipelines/gitlab/?tab=gitlabcom#view-error-messages-for-pipeline-failures
414426
[16]: /account_management/teams/
415427
[17]: /logs/log_configuration/processors/
416-
[18]: /continuous_integration/guides/infrastructure_metrics_with_gitlab
417-
[19]: https://about.gitlab.com/
418-
[20]: /glossary/#partial-retry
419-
[21]: /glossary/#manual-step
420-
[22]: /glossary/#queue-time
421-
[23]: /glossary/#approval-wait-time
422-
[24]: /glossary/#pipeline-execution-time
423-
[25]: /glossary/#running-pipeline
424-
[26]: /glossary/#custom-span
425-
[27]: /continuous_integration/explorer
426-
[28]: /continuous_integration/search/#search-for-pipelines
427-
[29]: /logs/guide/best-practices-for-log-management/
428+
[18]: https://about.gitlab.com/
429+
[19]: /glossary/#partial-retry
430+
[20]: /glossary/#manual-step
431+
[21]: /glossary/#queue-time
432+
[22]: /glossary/#approval-wait-time
433+
[23]: /glossary/#pipeline-execution-time
434+
[24]: /glossary/#running-pipeline
435+
[25]: /glossary/#custom-span
436+
[26]: /continuous_integration/explorer
437+
[27]: /continuous_integration/search/#search-for-pipelines

0 commit comments

Comments
 (0)