Skip to content

Commit 51620f5

Browse files
Merge pull request #312539 from MicrosoftDocs/main
Auto Publish – main to live - 2026-03-03 18:00 UTC
2 parents 3959302 + 5d707a1 commit 51620f5

5 files changed

Lines changed: 339 additions & 237 deletions

File tree

articles/azure-maps/azure-maps-qps-rate-limits.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ The following list shows the QPS usage limits for each Azure Maps service by Pri
3535
| Search service - Batch | 10 | 10 | Not Available |
3636
| Search service - single request | 500 | 500 | 50 |
3737
| Search service - single request reverse | 250 | 250 | 50 |
38+
| Search service - single request geocode autocomplete | 100 | Not Applicable | Not Applicable |
3839
| Timezone service | 50 | 50 | 50 |
3940
| Traffic service | 50 | 50 | 50 |
4041
| Weather service | 50 | 50 | 50 |

articles/azure-maps/how-to-search-for-address.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ The example in this section uses [Get Geocoding] to convert an address into lati
215215
1. Select the **GET** HTTP method in the **URL** drop-down list, then enter the following URL:
216216
217217
```http
218-
GET https://atlas.microsoft.com/geocode?api-version=2025-01-01&subscription-key={Your-Azure-Maps-Subscription-key}&query=400 Broad St, Seattle, WA 98109
218+
GET https://atlas.microsoft.com/geocode?api-version=2026-01-01&subscription-key={Your-Azure-Maps-Subscription-key}&query=400 Broad St, Seattle, WA 98109
219219
```
220220
221221
1. Select the **Create** button.
@@ -248,7 +248,7 @@ This example demonstrates how to use the Get Geocode Autocomplete API to search
248248
1. Select the **GET** HTTP method in the **URL** drop-down list, then enter the following URL:
249249
250250
```http
251-
https://atlas.microsoft.com/geocode:autocomplete?api-version=2025-06-01-preview&query=university of w&bbox=-168,-52,5,84&subscription-key={Your-Azure-Maps-Subscription-key}
251+
https://atlas.microsoft.com/geocode:autocomplete?api-version=2026-01-01&query=university of w&bbox=-168,-52,5,84&subscription-key={Your-Azure-Maps-Subscription-key}
252252
```
253253
254254
1. Select the run button, then review the response body.
@@ -271,7 +271,7 @@ Next, narrow down the area included in your search to the United States, using t
271271
1. Select the **GET** HTTP method in the **URL** drop-down list, then enter the following URL:
272272
273273
```http
274-
https://atlas.microsoft.com/geocode:autocomplete?api-version=2025-06-01-preview&query=university of w&bbox=-168,-52,5,84&countryRegion=us&subscription-key={Your-Azure-Maps-Subscription-key}
274+
https://atlas.microsoft.com/geocode:autocomplete?api-version=2026-01-01&query=university of w&bbox=-168,-52,5,84&countryRegion=us&subscription-key={Your-Azure-Maps-Subscription-key}
275275
```
276276
277277
1. Select the run button, then review the response body.
@@ -294,7 +294,7 @@ Next, focus your search to include more results in a specific area within the de
294294
1. Select the **GET** HTTP method in the **URL** drop-down list, then enter the following URL:
295295
296296
```http
297-
https://atlas.microsoft.com/geocode:autocomplete?api-version=2025-06-01-preview&query=university of w&bbox=-168,-52,5,84&countryRegion=us&coordinates=-122.136791,47.642232&subscription-key={Your-Azure-Maps-Subscription-key}
297+
https://atlas.microsoft.com/geocode:autocomplete?api-version=2026-01-01&query=university of w&bbox=-168,-52,5,84&countryRegion=us&coordinates=-122.136791,47.642232&subscription-key={Your-Azure-Maps-Subscription-key}
298298
```
299299
300300
1. Select the run button, then review the response body.
@@ -322,7 +322,7 @@ The examples in this section demonstrate the difference between searching for a
322322
1. Select the **GET** HTTP method in the **URL** drop-down list, then enter the following URL:
323323
324324
```http
325-
https://atlas.microsoft.com/geocode:autocomplete?api-version=2025-06-01-preview&query=dis&coordinates=-117.920219,33.809570&subscription-key={Your-Azure-Maps-Subscription-key}
325+
https://atlas.microsoft.com/geocode:autocomplete?api-version=2026-01-01&query=dis&coordinates=-117.920219,33.809570&subscription-key={Your-Azure-Maps-Subscription-key}
326326
```
327327
328328
1. Select the run button, then review the response body.
@@ -341,7 +341,7 @@ The examples in this section demonstrate the difference between searching for a
341341
1. When no values are provided for the `resultTypeGroups` parameter, queries can return both place and address values. If your only interested in searching for addresses, include `resultTypeGroups=address` in your request:
342342
343343
```http
344-
https://atlas.microsoft.com/geocode:autocomplete?api-version=2025-06-01-preview&query=dis&coordinates=-117.920219,33.809570&resultTypeGroups=address&subscription-key={Your-Azure-Maps-Subscription-key}
344+
https://atlas.microsoft.com/geocode:autocomplete?api-version=2026-01-01&query=dis&coordinates=-117.920219,33.809570&resultTypeGroups=address&subscription-key={Your-Azure-Maps-Subscription-key}
345345
```
346346
347347
Notice that the response contains *address* values that include:
@@ -371,15 +371,15 @@ This example demonstrates making reverse searches using a few of the optional pa
371371
1. Select the **GET** HTTP method in the **URL** drop-down list, then enter the following URL:
372372
373373
```http
374-
https://atlas.microsoft.com/reverseGeocode?api-version=2025-01-01&subscription-key={Your-Azure-Maps-Subscription-key}&coordinates=-122.332700,47.591180
374+
https://atlas.microsoft.com/reverseGeocode?api-version=2026-01-01&subscription-key={Your-Azure-Maps-Subscription-key}&coordinates=-122.332700,47.591180
375375
```
376376
377377
1. Select the run button, and review the response body. You should see one query result. The response includes key address information about T-Mobile Park.
378378
379379
1. Next, add the following parameter to the request: `resultTypes=Postcode1`
380380
381381
```http
382-
https://atlas.microsoft.com/reverseGeocode?api-version=2025-01-01&subscription-key={Your-Azure-Maps-Subscription-key}&coordinates=-122.332700,47.591180&resultTypes=Postcode1
382+
https://atlas.microsoft.com/reverseGeocode?api-version=2026-01-01&subscription-key={Your-Azure-Maps-Subscription-key}&coordinates=-122.332700,47.591180&resultTypes=Postcode1
383383
```
384384
385385
1. Select the run button, and compare the results to the results returned previously. Because the requested result type is now `Postcode1`, the response doesn't include street address information, just the zip code.
@@ -395,7 +395,7 @@ This example demonstrates how to search for a cross street based on the coordina
395395
1. Select the **GET** HTTP method in the **URL** drop-down list, then enter the following URL:
396396
397397
```http
398-
https://atlas.microsoft.com/reverseGeocode?api-version=2025-01-01&coordinates=-122.12429011774091,47.61697905124655&subscription-key={Your-Azure-Maps-Subscription-key}
398+
https://atlas.microsoft.com/reverseGeocode?api-version=2026-01-01&coordinates=-122.12429011774091,47.61697905124655&subscription-key={Your-Azure-Maps-Subscription-key}
399399
```
400400
401401
1. Select the run button, and review the response body.

articles/azure-netapp-files/customer-managed-keys-cross-tenant.md

Lines changed: 87 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: b-ahibbard
66
ms.service: azure-netapp-files
77
ms.topic: how-to
88
ms.custom: devx-track-azurecli, devx-track-azurepowershell
9-
ms.date: 09/03/2025
9+
ms.date: 02/17/2026
1010
ms.author: anfdocs
1111
# Customer intent: As an IT administrator managing Azure resources across multiple tenants, I want to configure cross-tenant customer-managed keys for volume encryption in Azure NetApp Files, so that I can enhance security and control over encryption keys used for sensitive data.
1212
---
@@ -91,10 +91,22 @@ The configuration process for cross-tenant customer-managed keys has portions th
9191

9292
### Configure the NetApp account to use your keys
9393

94-
>[!NOTE]
95-
>Using the `az rest` command is the only supported way to configure your NetApp account to use CMK in a different tenant.
94+
> [!IMPORTANT]
95+
> If the NetApp account is configured with same-tenant customer-managed keys, you must switch the account back to Microsoft-managed keys before configuring cross-tenant CMK. To switch, navigate to **Encryption** in the Azure portal and change the encryption key source to **Microsoft-managed key**.
9696
97-
<!-- check API version preview -->
97+
#### [Portal](#tab/portal-configure)
98+
99+
1. In the Azure portal, navigate to your NetApp account and select **Encryption**.
100+
1. Select **Customer-managed key** as the encryption key source.
101+
1. Under **Key URI**, select **Enter key URI** and provide the URI of the encryption key.
102+
1. Under **Identity type**, select **User-assigned**.
103+
1. Select **Select an identity**, then choose the user-assigned managed identity.
104+
1. Under **Federated client ID**, enter the application (client) ID of the multitenant application.
105+
1. Select **Save**.
106+
107+
Verify that `federatedClientId` is present in the encryption properties.
108+
109+
#### [Azure CLI](#tab/cli-configure)
98110

99111
1. With the `az rest` command, configure the NetApp account to use CMK in a different tenant:
100112

@@ -120,17 +132,84 @@ The configuration process for cross-tenant customer-managed keys has portions th
120132
```
121133
Once you have sent the `az rest` command, your NetApp Account has been successfully configured with cross-tenant CMK.
122134
135+
Verify the configuration by running:
136+
137+
```azurecli
138+
az netappfiles account show --resource-group <resourceGroupName> --name <NetAppAccountName> --query "{encryption: properties.encryption}" -o json
139+
```
140+
141+
The output should include `federatedClientId` in the encryption identity properties.
142+
143+
---
144+
123145
### Create a volume
124146
125-
>[!NOTE]
126-
>To create a volume using cross-tenant CMK, you must use the Azure CLI.
147+
#### [Portal](#tab/portal-volume)
148+
149+
1. In the Azure portal, select **Volumes** and then select **Add volume**.
150+
1. Follow the instructions in [Configure network features for an Azure NetApp Files volume](configure-network-features.md):
151+
* [Set the Network Features option in volume creation page](configure-network-features.md#set-the-network-features-option).
152+
* The network security group for the volume's delegated subnet must allow incoming traffic from NetApp's storage VM.
153+
1. For a NetApp account configured with cross-tenant customer-managed keys, perform the following steps:
154+
* Select **Customer-Managed Key** in the **Encryption Key Source** dropdown menu.
155+
* Select **Standard** as the **Network features** option.
156+
* Select a **key vault private endpoint**.
157+
1. Continue to complete the volume creation process. Refer to:
158+
* [Create an NFS volume](azure-netapp-files-create-volumes.md)
159+
* [Create an SMB volume](azure-netapp-files-create-volumes-smb.md)
160+
* [Create a dual-protocol volume](create-volumes-dual-protocol.md)
161+
162+
#### [Azure CLI](#tab/cli-volume)
127163
128-
1. Create the volume using the CLI:
164+
Create the volume using the CLI:
129165
130166
```azurecli
131167
az netappfiles volume create -g <resource group name> --account-name <NetApp account name> --pool-name <pool name> --name <volume name> -l southcentralus --service-level premium --usage-threshold 100 --file-path "<file path>" --vnet <virtual network name> --subnet default --network-features Standard --encryption-key-source Microsoft.KeyVault --kv-private-endpoint-id <full resource ID to the private endpoint to the customer's vault> --debug
132168
```
133169

170+
---
171+
172+
## Troubleshoot cross-tenant customer-managed keys
173+
174+
This section describes issues encountered when configuring cross-tenant CMK and the information to resolve them.
175+
176+
### Verify cross-tenant CMK configuration
177+
178+
To confirm whether a NetApp account is correctly configured for cross-tenant CMK, check for the presence of `federatedClientId` in the account's encryption properties.
179+
180+
#### [Portal](#tab/portal-CMK)
181+
182+
Navigate to your NetApp account, select **Overview**, then select **JSON View**.
183+
184+
If cross-tenant CMK is correctly configured, the encryption properties should include `federatedClientId`.
185+
186+
#### [Azure CLI](#tab/cli-CMK)
187+
188+
Run the following command:
189+
190+
```azurecli
191+
az netappfiles account show \
192+
--resource-group <resourceGroupName> \
193+
--name <NetAppAccountName> \
194+
--query "{keySource: encryption.keySource, federatedClientId: encryption.identity.federatedClientId, userAssignedIdentity: encryption.identity.userAssignedIdentity}" \
195+
-o json
196+
```
197+
If `federatedClientId` is missing, the account is configured with the same-tenant CMK and not with cross-tenant CMK.
198+
199+
---
200+
201+
### Missing Key URI or Encryption Key Source option
202+
203+
**Symptom:** When creating a volume in the Azure portal, the **Encryption Key Source** dropdown menu doesn't show **Customer-Managed Key**, or fields for **Key URI**, **subscription**, or **identity type** aren't visible.
204+
205+
**Resolution:**
206+
1. Verify if the NetApp account is correctly configured for cross-tenant CMK as described in [Verify cross-tenant CMK configuration](#verify-cross-tenant-cmk-configuration).
207+
1. If the account does not have `federatedClientId`, switch the account to Microsoft-managed keys:
208+
1. In the Azure portal, navigate to the **Encryption** page.
209+
1. Change the encryption key source to **Microsoft-managed key**.
210+
1. Select **Save**.
211+
1. Reconfigure the account for cross-tenant CMK by following the steps in [Configure the NetApp account to use your keys](#configure-the-netapp-account-to-use-your-keys).
212+
134213
## Next steps
135214
* [Configure customer-managed keys](configure-customer-managed-keys.md)
136-
* [Understand data encryption in Azure NetApp Files](understand-data-encryption.md)
215+
* [Understand data encryption in Azure NetApp Files](understand-data-encryption.md)

0 commit comments

Comments
 (0)