Skip to content

Commit 981a328

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into compliance-standards
2 parents 82e28aa + 9558baa commit 981a328

26 files changed

+260
-332
lines changed

.whatsnew/.application-management.json

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

.whatsnew/.application-provisioning.json

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

.whatsnew/.application-proxy.json

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

.whatsnew/.external-identities-ciam.json

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

.whatsnew/.external-identities.json

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

.whatsnew/.microsoft-identity-platform.json

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

articles/automation/change-tracking/region-mappings-monitoring-agent.md

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Supported regions for Change tracking and inventory using Azure Monitoring Agent
33
description: This article describes the supported region mappings between an Automation account and monitoring agent workspace as it relates to certain features of Azure Automation.
4-
ms.date: 12/14/2022
4+
ms.date: 03/04/2024
55
services: automation
66
ms.topic: conceptual
77
ms.custom: references_regions
@@ -18,24 +18,26 @@ The following table shows the supported mappings:
1818

1919
|**Geography**| **Monitoring Agent workspace region**|
2020
|---| ---|
21-
|**US**| EastUS</br> EastUS2</br> WestUS </br> WestUS2 </br> NorthCentralUS </br> CentralUS </br> SouthCentralUS </br> WestCentralUS|
21+
|**Asia Pacific**| EastAsia </br> SoutheastAsia|
22+
|**Australia**| AustraliaEast </br> AustraliaSoutheast |
2223
|**Brazil**| BrazilSouth|
2324
|**Canada**| CanadaCentral|
24-
|**China**| ChinaEast2<sup>1</sup>|
25-
|**Asia Pacific**| EastAsia </br> SoutheastAsia|
25+
|**China**| ChinaEast2|
26+
|**Europe**| NorthEurope </br> WestEurope|
27+
|**France**| FranceCentral|
28+
|**Germany** | Germany WestCentral|
2629
|**India**| CentralIndia|
2730
|**Japan**| JapanEast|
28-
|**Australia**| AustraliaEast </br> AustraliaSoutheast </br> AustraliaSoutheast|
2931
|**Korea**| KoreaCentral|
3032
|**Norway**| NorwayEast|
31-
|**Europe**| NorthEurope </br> WestEurope|
32-
|**France**| FranceCentral|
33-
|**United Kingdom**| UKSouth|
33+
|**Sweden** | SwedenCentral|
3434
|**Switzerland**| SwitzerlandNorth|
3535
|**United Arab Emirates**| UAENorth|
36-
|**US Gov**| USGovVirginia </br> USGovArizona<sup>1</sup>|
36+
|**United Kingdom**| UKSouth|
37+
|**US Gov**| USGovVirginia </br> USGovArizona|
38+
|**US**| EastUS</br> EastUS2</br> WestUS </br> WestUS2 </br> NorthCentralUS </br> CentralUS </br> SouthCentralUS </br> WestCentralUS|
39+
3740

38-
<sup>1</sup> In this region, only Update Management is supported, and other features like Change Tracking and Inventory are not available at this time.
3941

4042

4143
## Next steps

articles/azure-netapp-files/azure-netapp-files-create-volumes-smb.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,11 @@ Before creating an SMB volume, you need to create an Active Directory connection
111111
* Select your **Active Directory** connection from the drop-down list.
112112
113113
* Specify a unique **share name** for the volume. This share name is used when you create mount targets. The requirements for the share name are as follows:
114-
- It must be unique within each subnet in the region.
115-
- It must start with an alphabetical character.
114+
- For volumes not in an availability zone or volumes in the same availability zone, it must be unique within each subnet in the region.
115+
- For volumes in availability zones, it must be unique within each availability zone. This feature is currently in **preview** and requires you to register the feature. For more information, see [Manage availability zone volume placement](manage-availability-zone-volume-placement.md#file-path-uniqueness).
116116
- It can contain only letters, numbers, or dashes (`-`).
117117
- The length must not exceed 80 characters.
118-
118+
119119
* <a name="smb3-encryption"></a>If you want to enable encryption for SMB3, select **Enable SMB3 Protocol Encryption**.
120120
121121
This feature enables encryption for in-flight SMB3 data. SMB clients not using SMB3 encryption will not be able to access this volume. Data at rest is encrypted regardless of this setting.

articles/azure-netapp-files/azure-netapp-files-create-volumes.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ This article shows you how to create an NFS volume. For SMB volumes, see [Create
106106
* Select **NFS** as the protocol type for the volume.
107107

108108
* Specify a unique **file path** for the volume. This path is used when you create mount targets. The requirements for the path are as follows:
109-
- It must be unique within each subnet in the region.
109+
- For volumes not in an availability zone or volumes in the same availability zone, it must be unique within each subnet in the region.
110+
- For volumes in availability zones, it must be unique within each availability zone. This feature is currently in **preview** and requires you to register the feature. For more information, see [Manage availability zone volume placement](manage-availability-zone-volume-placement.md#file-path-uniqueness).
110111
- It must start with an alphabetical character.
111112
- It can contain only letters, numbers, or dashes (`-`).
112113
- The length must not exceed 80 characters.

articles/azure-netapp-files/create-volumes-dual-protocol.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,18 +138,19 @@ You can also use [Azure CLI commands](/cli/azure/feature) `az feature register`
138138
139139
![Show advanced selection](./media/shared/volume-create-advanced-selection.png)
140140
141-
3. Click the **Protocol** tab, and then complete the following actions:
141+
3. Select the **Protocol** tab, and then complete the following actions:
142142
* Select **Dual-protocol** as the protocol type for the volume.
143143
144144
* Specify the **Active Directory** connection to use.
145145
146146
* Specify a unique **Volume Path**. This path is used when you create mount targets. The requirements for the path are as follows:
147147
148-
- It must be unique within each subnet in the region.
148+
- For volumes not in an availability zone or volumes in the same availability zone, the volume path must be unique within each subnet in the region.
149+
- For volumes in availability zones, the volume path must be unique within each availability zone. This feature is currently in **preview** and requires you to register the feature. For more information, see [Manage availability zone volume placement](manage-availability-zone-volume-placement.md#file-path-uniqueness).
149150
- It must start with an alphabetical character.
150151
- It can contain only letters, numbers, or dashes (`-`).
151152
- The length must not exceed 80 characters.
152-
153+
153154
* Specify the **versions** to use for dual protocol: **NFSv4.1 and SMB**, or **NFSv3 and SMB**.
154155
155156
* Specify the **Security Style** to use: NTFS (default) or UNIX.

0 commit comments

Comments
 (0)