Skip to content

Commit f0e9ed8

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into us370875-cli-posh-nat
2 parents 263fb63 + 67dd5a8 commit f0e9ed8

14 files changed

+49
-44
lines changed

articles/container-apps/manage-secrets.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: container-apps
55
author: craigshoemaker
66
ms.service: azure-container-apps
77
ms.topic: how-to
8-
ms.date: 02/03/2025
8+
ms.date: 02/28/2025
99
ms.author: cshoe
1010
ms.custom: devx-track-azurecli, devx-track-azurepowershell, build-2023
1111
---
@@ -136,6 +136,9 @@ To grant access to Key Vault secrets, [create an access policy](/azure/key-vault
136136

137137
1. In the *System assigned* tab, set the *Status* to **On**.
138138

139+
> [!NOTE]
140+
> You can also use a user-assigned managed identity, which can be reused across multiple resources and persists independently of the app lifecycle. To use it, select the *User assigned* tab and choose an existing identity.
141+
139142
1. Select **Save** to enable system assigned managed identity.
140143

141144
1. A popup appears to confirm that you want to enable system assigned managed identity and register your container app with Microsoft Entra ID. Select **Yes**.
@@ -209,7 +212,7 @@ Secrets Key Vault references aren't supported in PowerShell.
209212
---
210213

211214
> [!NOTE]
212-
> If you're using [UDR With Azure Firewall](networking.md#user-defined-routes-udr), you will need to add the `AzureKeyVault` service tag and the *login.microsoft.com* FQDN to the allow list for your firewall. Refer to [configuring UDR with Azure Firewall](networking.md#configuring-udr-with-azure-firewall) to decide which additional service tags you need.
215+
> If you're using [UDR With Azure Firewall](networking.md#user-defined-routes-udr), you need to add the `AzureKeyVault` service tag and the *login.microsoft.com* FQDN to the allow list for your firewall. Refer to [configuring UDR with Azure Firewall](networking.md#configuring-udr-with-azure-firewall) to decide which additional service tags you need.
213216
214217
#### Key Vault secret URI and secret rotation
215218

articles/digital-twins/how-to-manage-twin.md

Lines changed: 25 additions & 25 deletions
Large diffs are not rendered by default.
1005 Bytes
Loading

articles/iot-operations/connect-to-cloud/howto-configure-fabric-real-time-intelligence.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ Azure Key Vault is the recommended way to sync the connection string to the Kube
6262
| Host | The hostname of the Event Stream Custom Endpoint in the format `*.servicebus.windows.net:9093`. Use the bootstrap server address noted previously. |
6363
| Authentication method | *SASL* is the currently the only supported authentication method. |
6464
| SASL type | Choose *Plain* |
65-
| Synced secret name | Create or select a Key Vault secret where the secret's value is exactly the text **$ConnectionString** (literal string, not an environment variable reference). |
65+
| Synced secret name | Enter a name for the syned secret. A Kubernetes secret with this name will be created on the cluster. |
66+
| Username reference of token secret | Create a new or choose an existing Key Vault reference. The secret value must be exactly the text **$ConnectionString** (literal string, not an environment variable reference). |
6667
| Password reference of token secret | Create a new or choose an existing Key Vault reference. The secret value must be the Custom Endpoint connection string noted earlier. |
6768

6869
1. Select **Apply** to provision the endpoint.
@@ -83,4 +84,4 @@ The advanced settings for this endpoint are identical to the [advanced settings
8384

8485
## Next steps
8586

86-
To learn more about data flows, see [Create a data flow](howto-create-dataflow.md).
87+
To learn more about data flows, see [Create a data flow](howto-create-dataflow.md).

articles/reliability/reliability-elastic-san.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Deploying a ZRS Elastic SAN provides more reliability than an LRS Elastic SAN, b
4343

4444
### Availability zone migration
4545

46-
To migrate an Elastic SAN on LRS to ZRS, snapshot your Elastic SAN volumes, export them to managed disk snapshots, deploy an Elastic SAN on ZRS, and then create volumes on the SAN on ZRS using those disk snapshots. To learn how to use snapshots (preview), see [Snapshot Azure Elastic SAN volumes (preview)](../storage/elastic-san/elastic-san-snapshots.md).
46+
To migrate an Elastic SAN on LRS to ZRS, snapshot your Elastic SAN volumes, export them to managed disk snapshots, deploy an Elastic SAN on ZRS, and then create volumes on the SAN on ZRS using those disk snapshots. To learn how to use snapshots, see [Snapshot Azure Elastic SAN volumes](../storage/elastic-san/elastic-san-snapshots.md).
4747

4848
## Disaster recovery and business continuity
4949

@@ -64,4 +64,4 @@ Microsoft and its customers operate under the [Shared Responsibility Model](./co
6464
## Next steps
6565

6666
- [Plan for deploying an Elastic SAN](../storage/elastic-san/elastic-san-planning.md)
67-
- [Snapshot Azure Elastic SAN volumes (preview)](../storage/elastic-san/elastic-san-snapshots.md)
67+
- [Snapshot Azure Elastic SAN volumes](../storage/elastic-san/elastic-san-snapshots.md)

articles/sentinel/data-connector-connection-rules-reference.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ The CCP supports the following authentication types:
8686
- [Basic](#basic-auth)
8787
- [APIKey](#apikey)
8888
- [OAuth2](#oauth2)
89-
- [Jwt](#jwt)
89+
- [JWT](#jwt)
9090

9191
> [!NOTE]
9292
> CCP OAuth2 implementation does not support client certificate credentials.
@@ -215,7 +215,7 @@ OAuth2 `client_credentials` grant type
215215
}
216216
```
217217

218-
#### Jwt
218+
#### JWT
219219

220220
Example:
221221
JSON web token (JWT)

articles/storage/elastic-san/elastic-san-introduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ The status of items in this table might change over time.
7474
| Private endpoints | ✔️ |
7575
| Grant network access to specific Azure virtual networks| ✔️ |
7676
| Soft delete ||
77-
| Snapshots (preview) | ✔️ |
77+
| Snapshots | ✔️ |
7878

7979
## Next steps
8080

articles/synapse-analytics/spark/tutorial-spark-pool-filesystem-spec.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,13 @@ Run the following code.
135135

136136
> [!NOTE]
137137
> Update the file URL in this script before running it.
138+
> Please ensure you import pandas when using the below code snippet. This is critical for proper handling of access tokens.
138139
139140
```PYSPARK
140141
# Import libraries
141142
import fsspec
142143
import os
144+
import pandas
143145
144146
# Set variables
145147
local_file_name = "<local_file_name>"

includes/digital-twins-bulk-delete-note.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ author: baanders
33
description: include file with a note about using the bulk delete API
44
ms.service: azure-digital-twins
55
ms.topic: include
6-
ms.date: 10/3/2023
6+
ms.date: 03/04/2025
77
ms.author: baanders
88
---
99

includes/digital-twins-defaultazurecredential-note.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ author: baanders
33
description: include file for adding a note about the known issue with DefaultAzureCredential
44
ms.service: azure-digital-twins
55
ms.topic: include
6-
ms.date: 2/21/2022
6+
ms.date: 03/04/2025
77
ms.author: baanders
88
---
99

1010
>[!NOTE]
11-
>There's currently a known issue affecting the `DefaultAzureCredential` wrapper class that may result in an error while authenticating. If you encounter this issue, you can try instantiating `DefaultAzureCredential` with the following optional parameter to resolve it: `new DefaultAzureCredential(new DefaultAzureCredentialOptions { ExcludeSharedTokenCacheCredential = true });`
11+
>There's currently a known issue affecting the `DefaultAzureCredential` wrapper class that might result in an error while authenticating. If you encounter this issue, you can try instantiating `DefaultAzureCredential` with the following optional parameter to resolve it: `new DefaultAzureCredential(new DefaultAzureCredentialOptions { ExcludeSharedTokenCacheCredential = true });`
1212
>
1313
>For more information about this issue, see [Azure Digital Twins known issues](../articles/digital-twins/troubleshoot-known-issues.md#issue-with-default-azure-credential-authentication-on-azureidentity-130).

0 commit comments

Comments
 (0)