Skip to content

Commit

Permalink
Merge branch 'master' into jacobotb/STAL-2993/update-for-cwp-sa
Browse files Browse the repository at this point in the history
  • Loading branch information
jacobotb authored Dec 10, 2024
2 parents bfb60fe + 649ed42 commit c23d9e4
Show file tree
Hide file tree
Showing 22 changed files with 197 additions and 22 deletions.
8 changes: 4 additions & 4 deletions .apigentools-info
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"spec_versions": {
"v1": {
"apigentools_version": "1.6.6",
"regenerated": "2024-12-05 20:24:11.476192",
"spec_repo_commit": "970515f9"
"regenerated": "2024-12-10 13:54:01.729995",
"spec_repo_commit": "4f71be94"
},
"v2": {
"apigentools_version": "1.6.6",
"regenerated": "2024-12-05 20:24:19.436525",
"spec_repo_commit": "970515f9"
"regenerated": "2024-12-10 13:54:09.828535",
"spec_repo_commit": "4f71be94"
}
}
}
7 changes: 6 additions & 1 deletion config/_default/menus/main.en.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6019,11 +6019,16 @@ menu:
parent: appsec_threats
identifier: exploit_prevention
weight: 707
- name: WAF Integrations
url: security/application_security/threats/waf-integration/
parent: appsec_threats
identifier: aws_waf_int
weight: 708
- name: In-App WAF Rules
url: security/application_security/threats/inapp_waf_rules/
parent: appsec_threats
identifier: threats_event_rules
weight: 708
weight: 709
- name: OOTB Rules
url: security/default_rules/#cat-application-security
parent: appsec_threats
Expand Down
6 changes: 3 additions & 3 deletions content/en/agent/logs/advanced_log_collection.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
title: Advanced Log Collection Configurations
description: Use the Datadog Agent to collect your logs and send them to Datadog
further_reading:
- link: "/logs/guide/getting-started-lwl/"
tag: "Documentation"
text: "Getting started with Logging without Limits™"
- link: "/logs/guide/how-to-set-up-only-logs/"
tag: "Documentation"
text: "Use the Datadog Agent for log collection only"
Expand All @@ -17,9 +20,6 @@ further_reading:
- link: "/logs/explorer/"
tag: "Documentation"
text: "See how to explore your logs"
- link: "/logs/logging_without_limits/"
tag: "Documentation"
text: "Logging without Limits*"
- link: "/glossary/#tail"
tag: Glossary
text: 'Glossary entry for "tail"'
Expand Down
10 changes: 5 additions & 5 deletions content/en/api/v1/synthetics/examples.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"target": 200
}
],
"exitIfSucceed": true,
"extractedValues": [
{
"field": "server",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@
"steps": [
{
"allowFailure": false,
"alwaysExecute": true,
"exitIfSucceed": true,
"isCritical": true,
"name": "Refresh page",
"params": {},
Expand Down
12 changes: 8 additions & 4 deletions content/en/api/v2/security-monitoring/examples.json

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion content/en/database_monitoring/guide/sql_deadlock.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@ further_reading:

The Deadlock view enables you to explore deadlock events in your SQL Server database.
A deadlock occurs when two or more processes are unable to proceed because each is waiting for the other to release resources.
This guide assumes that Database Monitoring has been configured for your [SQL Server][1].

## Before you begin

You must configure Database Monitoring for your [SQL Server][1] before following the steps in this guide.


Supported databases
: SQL Server

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ The following metrics report on logs that have been forwarded successfully, incl
5. Enter the query to filter your logs for forwarding. See [Search Syntax][5] for more information.
6. Select the **Destination Type**.

{{< img src="logs/log_configuration/forwarding/tag-forwarding.png" alt="The destination configuration page, showing the steps to set up a new destination." style="width:70%;">}}
{{< img src="logs/log_configuration/forwarding/log-forwarding-tag-sentinel.png" alt="The destination configuration page, showing the steps to set up a new destination." style="width:70%;">}}

{{< tabs >}}
{{% tab "HTTP" %}}
Expand Down
3 changes: 2 additions & 1 deletion content/en/logs/log_configuration/pipelines.md
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ By default, Datadog tracers can [automatically inject span IDs into your logs][1
**Note**: The pipeline filtering is applied before any of the pipeline's processors. For this reason, you cannot filter on an attribute that is extracted in the pipeline itself.

4. Name your pipeline.
5. (Optional) Grant editing access to processors in the pipeline.
5. (Optional) Grant editing access to processors in the pipeline. If you assign a role to a pipeline, the role receives `logs_write_processor` [permissions][12] specifically scoped to that pipeline. Roles with `logs_write_processor` permissions assigned globally (by editing role), cannot be selected, as they have access to all pipelines.
6. (Optional) Add tags and a description to the pipeline. The description and tags can be used to state the pipeline's purpose and which team owns it.
7. Press **Create**.

Expand Down Expand Up @@ -276,3 +276,4 @@ Estimated usage metrics are displayed per pipeline - specifically, the volume an
[9]: /integrations/#cat-log-collection
[10]: /logs/log_configuration/parsing/?tab=matchers#parsing-dates
[11]: https://app.datadoghq.com/dash/integration/logs_estimated_usage
[12]: /account_management/rbac/permissions/?tab=ui#log-management
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
title: Cloud Network Monitoring Guides
aliases:
- /network_performance_monitoring/guide/
private: true
- /network_monitoring/performance/guide/
disable_toc: true
---

Expand Down
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ Cloud Security Management Vulnerabilities supports vulnerability scanning for ho
| Ubuntu | All versions supported by Canonical | apt/dpkg | {{< X >}} | {{< X >}} |
| Windows | Windows Server 2016/2019/2022, Windows 10 and later | Windows OS | | {{< X >}} |

{{% collapse-content title="Windows limitations" level="h4" %}}
- Datadog detects vulnerabilities in Windows by identifying the Windows version and installed security knowledge base (KB) updates to address vulnerabilities associated with that version. However, some KB updates are cumulative and contain other KB updates, which might cause Datadog to misidentify which updates have been installed.
- Datadog can't track vulnerability fixes that Windows applies outside of KB updates.
- Datadog can't track vulnerabilities associated with third-party software.
{{% /collapse-content %}}

## Application libraries

Cloud Security Management Vulnerabilities supports vulnerability scanning for the following application languages and libraries on containers and Lambda instances:
Expand Down
3 changes: 3 additions & 0 deletions data/api/v1/full_spec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13977,6 +13977,9 @@ components:
items:
$ref: '#/components/schemas/SyntheticsAssertion'
type: array
exitIfSucceed:
description: Determines whether or not to exit the test if the step succeeds.
type: boolean
extractedValues:
description: Array of values to parse and save as variables from the response.
items:
Expand Down
36 changes: 36 additions & 0 deletions data/api/v1/full_spec_deref.json
Original file line number Diff line number Diff line change
Expand Up @@ -487886,6 +487886,10 @@
},
"type": "array"
},
"exitIfSucceed": {
"description": "Determines whether or not to exit the test if the step succeeds.",
"type": "boolean"
},
"extractedValues": {
"description": "Array of values to parse and save as variables from the response.",
"items": {
Expand Down Expand Up @@ -490255,6 +490259,10 @@
},
"type": "array"
},
"exitIfSucceed": {
"description": "Determines whether or not to exit the test if the step succeeds.",
"type": "boolean"
},
"extractedValues": {
"description": "Array of values to parse and save as variables from the response.",
"items": {
Expand Down Expand Up @@ -493022,6 +493030,10 @@
},
"type": "array"
},
"exitIfSucceed": {
"description": "Determines whether or not to exit the test if the step succeeds.",
"type": "boolean"
},
"extractedValues": {
"description": "Array of values to parse and save as variables from the response.",
"items": {
Expand Down Expand Up @@ -497392,6 +497404,10 @@
},
"type": "array"
},
"exitIfSucceed": {
"description": "Determines whether or not to exit the test if the step succeeds.",
"type": "boolean"
},
"extractedValues": {
"description": "Array of values to parse and save as variables from the response.",
"items": {
Expand Down Expand Up @@ -1079326,6 +1079342,10 @@
},
"type": "array"
},
"exitIfSucceed": {
"description": "Determines whether or not to exit the test if the step succeeds.",
"type": "boolean"
},
"extractedValues": {
"description": "Array of values to parse and save as variables from the response.",
"items": {
Expand Down Expand Up @@ -1082105,6 +1082125,10 @@
},
"type": "array"
},
"exitIfSucceed": {
"description": "Determines whether or not to exit the test if the step succeeds.",
"type": "boolean"
},
"extractedValues": {
"description": "Array of values to parse and save as variables from the response.",
"items": {
Expand Down Expand Up @@ -1085075,6 +1085099,10 @@
},
"type": "array"
},
"exitIfSucceed": {
"description": "Determines whether or not to exit the test if the step succeeds.",
"type": "boolean"
},
"extractedValues": {
"description": "Array of values to parse and save as variables from the response.",
"items": {
Expand Down Expand Up @@ -1087977,6 +1088005,10 @@
},
"type": "array"
},
"exitIfSucceed": {
"description": "Determines whether or not to exit the test if the step succeeds.",
"type": "boolean"
},
"extractedValues": {
"description": "Array of values to parse and save as variables from the response.",
"items": {
Expand Down Expand Up @@ -1090756,6 +1090788,10 @@
},
"type": "array"
},
"exitIfSucceed": {
"description": "Determines whether or not to exit the test if the step succeeds.",
"type": "boolean"
},
"extractedValues": {
"description": "Array of values to parse and save as variables from the response.",
"items": {
Expand Down
4 changes: 4 additions & 0 deletions data/api/v2/full_spec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23314,6 +23314,10 @@ components:
description: User ID of the user who updated the rule.
format: int64
type: integer
updatedAt:
description: The date the rule was last updated, in milliseconds.
format: int64
type: integer
version:
description: The version of the rule.
format: int64
Expand Down
35 changes: 35 additions & 0 deletions data/api/v2/full_spec_deref.json
Original file line number Diff line number Diff line change
Expand Up @@ -132092,6 +132092,11 @@
"format": "int64",
"type": "integer"
},
"updatedAt": {
"description": "The date the rule was last updated, in milliseconds.",
"format": "int64",
"type": "integer"
},
"version": {
"description": "The version of the rule.",
"format": "int64",
Expand Down Expand Up @@ -136743,6 +136748,11 @@
"format": "int64",
"type": "integer"
},
"updatedAt": {
"description": "The date the rule was last updated, in milliseconds.",
"format": "int64",
"type": "integer"
},
"version": {
"description": "The version of the rule.",
"format": "int64",
Expand Down Expand Up @@ -145975,6 +145985,11 @@
"format": "int64",
"type": "integer"
},
"updatedAt": {
"description": "The date the rule was last updated, in milliseconds.",
"format": "int64",
"type": "integer"
},
"version": {
"description": "The version of the rule.",
"format": "int64",
Expand Down Expand Up @@ -305065,6 +305080,11 @@
"format": "int64",
"type": "integer"
},
"updatedAt": {
"description": "The date the rule was last updated, in milliseconds.",
"format": "int64",
"type": "integer"
},
"version": {
"description": "The version of the rule.",
"format": "int64",
Expand Down Expand Up @@ -307736,6 +307756,11 @@
"format": "int64",
"type": "integer"
},
"updatedAt": {
"description": "The date the rule was last updated, in milliseconds.",
"format": "int64",
"type": "integer"
},
"version": {
"description": "The version of the rule.",
"format": "int64",
Expand Down Expand Up @@ -312895,6 +312920,11 @@
"format": "int64",
"type": "integer"
},
"updatedAt": {
"description": "The date the rule was last updated, in milliseconds.",
"format": "int64",
"type": "integer"
},
"version": {
"description": "The version of the rule.",
"format": "int64",
Expand Down Expand Up @@ -314900,6 +314930,11 @@
"format": "int64",
"type": "integer"
},
"updatedAt": {
"description": "The date the rule was last updated, in milliseconds.",
"format": "int64",
"type": "integer"
},
"version": {
"description": "The version of the rule.",
"format": "int64",
Expand Down
Loading

0 comments on commit c23d9e4

Please sign in to comment.