Skip to content

Commit b8e317b

Browse files
authored
Merge branch 'main' into US562360_multicloud
2 parents 9412b98 + 75da4af commit b8e317b

39 files changed

Lines changed: 870 additions & 232 deletions

.openpublishing.redirection.defender-for-cloud.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -574,6 +574,11 @@
574574
"source_path_from_root": "/articles/defender-for-cloud/monitor-connected-aws-resources.md",
575575
"redirect_url": "/azure/defender-for-cloud/quickstart-onboard-aws#validate-connector-health",
576576
"redirect_document_id": false
577+
},
578+
{
579+
"source_path_from_root": "/articles/defender-for-cloud/deploy-vulnerability-assessment-vm.md",
580+
"redirect_url": "/azure/defender-for-cloud/deploy-vulnerability-assessment-defender-vulnerability-management",
581+
"redirect_document_id": false
577582
}
578583
]
579584
}

articles/confidential-ledger/data-organization.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,18 @@ for entry in list_result:
103103
print(f"Contents: {entry['contents']}")
104104
```
105105

106+
## Sample Scenarios
107+
108+
The following scenarios can help you decide when to use collection IDs versus Tags.
109+
110+
| Scenario | Recommended approach | Why |
111+
|--|--|--|
112+
| You write general records and mostly read by transaction ID or latest entry. | Use the default collection ID (`subledger-0`). | This approach keeps data organization simple and avoids managing many collection IDs. |
113+
| You need strict logical separation of data sets, such as tenant-specific or workload-specific isolation. | Use dedicated collection IDs for each logical group. | Group-level collection IDs make it easier to isolate and list records by boundary. |
114+
| You need query-oriented lookups at a finer granularity, including per-entry categorization. | Prefer tags within a shared collection before creating a unique collection ID per entry. | You can achieve similar query outcomes without creating and managing a unique collection ID for every entry. |
115+
116+
If your main goal is query flexibility, start with tags and add more collection IDs only when clear isolation boundaries are required.
117+
106118

107119
## Next steps
108120

articles/confidential-ledger/overview.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,21 @@ Confidential ledger nodes are deployed across Azure availability zones to provid
8282

8383
Data is automatically replicated to Azure regional pairs for disaster recovery. For information about data residency considerations, see [Data residency for Azure confidential ledger](data-residency.md).
8484

85+
### Limitations
86+
87+
| Resource | Limit |
88+
|--|--|
89+
| Number of ledgers per subscription | 2 standard SKU ledgers |
90+
| Number of collection IDs per ledger | 50,000 |
91+
| Create entry | 1800 requests per second, 1800 transactions per second |
92+
| Get current entry | 3600 requests per second |
93+
| Get entry | 2500 requests per second |
94+
| Get receipt | 2400 requests per second |
95+
| List entries | 3300 requests per second |
96+
97+
> [!NOTE]
98+
> To request higher limits or discuss limitations, reach out to the Azure Confidential Ledger team.
99+
85100
## Constraints
86101

87102
- After a confidential ledger instance is created, you can't change the ledger type (private or public).

articles/dedicated-hsm/tutorial-deploy-hsm-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ After you configure your network, use these Azure CLI commands to provision your
104104
1. To see a current HSM, run the [az dedicated-hsm show](/cli/azure/dedicated-hsm#az-dedicated-hsm-show) command:
105105

106106
```azurecli
107-
az dedicated-hsm show --resource group myRG --name hsm1
107+
az dedicated-hsm show --resource-group myRG --name hsm1
108108
```
109109

110110
1. Provision the second HSM by using this command:

articles/defender-for-cloud/defender-for-storage-configure-malware-scan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ If you haven't enabled soft delete for blobs on the storage account, Defender fo
6262

6363
- If you turn on Versioning for Blobs on your storage account, see [Manage and restore soft delete for blobs](/azure/storage/blobs/soft-delete-blob-manage) to learn how to restore a soft deleted blob.
6464

65-
- For the *Soft Delete Malicious Blobs* feature to work on a Storage Account with Versioning turned on, you also need to enable the use of blob index tags for storing scan results. Ensure the parameter *Store scan results as blob index tags* is checked.
65+
- Blobs that are detected as malicious and soft deleted will always be marked with index tags. If you have selected to not store scan results in index tags, these tags will be removed upon restoring of the soft deleted blob.
6666

6767
- The retention period defaults to seven days if you turn on the soft delete malicious blobs feature, but you can change it (range: 1–365 days). You can change the default retention period in your storage account settings.
6868

articles/defender-for-cloud/defender-sensor-change-log.md

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,25 @@ To see the version of the sensor run:
1717

1818
`kubectl get -n kube-system daemonsets/microsoft-defender-collector-ds -o jsonpath='{.metadata.labels.app\.kubernetes\.io/version}'`
1919

20+
21+
## Defender for Containers – Sensor Support Policy
22+
23+
The support policy here applies to all Helm-based and multicloud installations. For scenarios where the sensor is deployed as part of AKS, please refer to: [Supported Kubernetes versions in Azure Kubernetes Service (AKS) - Azure Kubernetes Service | Microsoft Learn](/azure/aks/supported-kubernetes-versions?tabs=azure-cli)
24+
25+
|Version|Preview Date|GA Date|End of support|
26+
| -------- | -------- | -------- | -------- |
27+
|0.8| |Feb 2025|Feb 2027|
28+
|0.9|July 2025|Apr 2026|Apr 2027|
29+
|0.10|Feb 2026|Apr 2026|Apr 2027|
30+
|0.11|Apr 2026|Jul  2026|Jul 2027|
31+
32+
Each stable (GA) version is supported for 12 months from its GA release date. After the 12-month window ends, the version is no longer supported. Customers should upgrade to the latest stable or Public release to maintain support and access new capabilities.
33+
2034
## Sensor versions available per release
2135

2236
### Sensor v0.10 (deployed by Helm or Arc for K8s in Preview mode)
2337

24-
**Sensor v0.10.28 — Preview**
38+
**Sensor v0.10.3 — Preview**
2539

2640
- **Released:** March 2026
2741

@@ -195,18 +209,7 @@ To see the version of the sensor run:
195209
- Better memory efficiency and reduced CPU consumption
196210
- Bug fixes and security enhancements
197211

198-
## Defender for Containers – Sensor Support Policy
199-
200-
The support policy here applies to all Helm-based and multicloud installations. For scenarios where the sensor is deployed as part of AKS, please refer to: [Supported Kubernetes versions in Azure Kubernetes Service (AKS) - Azure Kubernetes Service | Microsoft Learn](/azure/aks/supported-kubernetes-versions?tabs=azure-cli)
201-
202-
|Version|Preview Date|GA Date|End of support|
203-
| -------- | -------- | -------- | -------- |
204-
|0.8| |Feb 2025|Feb 2027|
205-
|0.9|July 2025|Apr 2026|Apr 2027|
206-
|0.10|Feb 2026|Apr 2026|Apr 2027|
207-
|0.11|Apr 2026|Jul  2026|Jul 2027|
208212

209-
Each stable (GA) version is supported for 12 months from its GA release date. After the 12-month window ends, the version is no longer supported. Customers should upgrade to the latest stable or Public release to maintain support and access new capabilities.
210213

211214

212215

articles/defender-for-cloud/deploy-vulnerability-assessment-vm.md

Lines changed: 0 additions & 141 deletions
This file was deleted.

articles/defender-for-cloud/file-integrity-monitoring-enable-defender-endpoint.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn how to enable File Integrity Monitoring when you collect data
44
author: Elazark
55
ms.author: elkrieger
66
ms.topic: how-to
7-
ms.date: 06/25/2025
7+
ms.date: 03/22/2026
88
ms.custom: sfi-image-nochange
99
#customer intent: As a security administrator, I want to enable File Integrity Monitoring so that I can detect unauthorized changes to critical files.
1010
---
@@ -18,9 +18,9 @@ After you enable Defender for Servers Plan 2, follow the instructions in this ar
1818
> [!NOTE]
1919
>
2020
> - If you use a previous version of File Integrity Monitoring with the Log Analytics agent (Microsoft Monitoring agent (MMA)) or the Azure Monitor agent (AMA), you can [migrate to the new File Integrity Monitoring experience](migrate-file-integrity-monitoring.md).
21-
> - From June 2025 onwards, File Integrity Monitoring powered by Microsoft Defender for Endpoint requires a minimum version. [Update the agent](#verify-defender-for-endpoint-client-version) as needed.
22-
> - Windows: 10.8760 or later.
23-
> - Linux: 30.124082 or later.
21+
> - File Integrity Monitoring powered by Microsoft Defender for Endpoint requires a minimum agent version. [Update the agent](#verify-defender-for-endpoint-client-version) as needed.
22+
> - **Windows (legacy machines/downlevel clients)**: Defender for Servers Windows client (MDE agent) version 10.8799 or later.
23+
> - **Linux**: 30.124082 or later.
2424
2525
## Prerequisites
2626

0 commit comments

Comments
 (0)