Merge pull request #233047 from MicrosoftDocs/repo_sync_working_branch

Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)

Author: huypub

articles/aks/enable-host-encryption.md

@@ -47,7 +47,7 @@ If you want to create clusters without host-based encryption, you can do so by o
 You can enable host-based encryption on existing clusters by adding a new node pool to your cluster. Configure a new node pool to use host-based encryption by using the `--enable-encryption-at-host` parameter.
 
 ```azurecli
-az aks nodepool add --name hostencrypt --cluster-name myAKSCluster --resource-group myResourceGroup -s Standard_DS2_v2 -l westus2 --enable-encryption-at-host
+az aks nodepool add --name hostencrypt --cluster-name myAKSCluster --resource-group myResourceGroup -s Standard_DS2_v2 --enable-encryption-at-host
 ```
 
 If you want to create new node pools without the host-based encryption feature, you can do so by omitting the `--enable-encryption-at-host` parameter.

articles/aks/use-pod-sandboxing.md

@@ -234,7 +234,7 @@ To demonstrate the deployment of an untrusted application into the pod sandbox o
 
     ```output
     root@untrusted:/# uname -r
-    5.15.80.mshv2-hvl1.m2
+    5.15.48.1-8.cm2
     ```
 
 3. Start a shell session to the container of the *trusted* pod to verify the kernel output:
@@ -252,7 +252,8 @@ To demonstrate the deployment of an untrusted application into the pod sandbox o
    The following example resembles output from the VM that is running the *trusted* pod, which is a different kernel than the *untrusted* pod running within the pod sandbox:
 
     ```output
-    5.15.48.1-8.cm2
+    5.15.80.mshv2-hvl1.m2
+    ```
 
 ## Cleanup
 

articles/app-service/overview-disaster-recovery.md

@@ -19,7 +19,7 @@ For IT, business continuity plans are largely driven by two metrics:
 - Recovery Time Objective (RTO) – the time duration in which your application must come back online after an outage. 
 - Recovery Point Objective (RPO) – the acceptable amount of data loss in a disaster, expressed as a unit of time (for example, 1 minute of transactional database records). 
 
-Normally, maintaining an SLA around RTO is impractical for regional disasters, and you would typically design your disaster recovery strategy around RPO alone (i.e. focus on recovering data and not on minimizing interruption). With Azure, however, it's not only practical but could even be straightforward to deploy App Service for automatic geo-failovers. This lets you disaster-proof your applications further by take care of both RTO and RPO.
+Normally, maintaining an SLA around RTO is impractical for regional disasters, and you would typically design your disaster recovery strategy around RPO alone (i.e. focus on recovering data and not on minimizing interruption). With Azure, however, it's not only practical but could even be straightforward to deploy App Service for automatic geo-failovers. This lets you disaster-proof your applications further by taking care of both RTO and RPO.
 
 Depending on your desired RTO and RPO metrics, three disaster recovery architectures are commonly used, as shown in the following table:
 
@@ -155,4 +155,4 @@ Steps to create a passive-cold region without GRS and GZRS are summarized as fol
 
 ## Next steps
 
-[Tutorial: Create a highly available multi-region app in Azure App Service](tutorial-multi-region-app.md)
+[Tutorial: Create a highly available multi-region app in Azure App Service](tutorial-multi-region-app.md)

articles/azure-functions/monitor-functions.md

@@ -100,10 +100,10 @@ The following table lists common and recommended alert rules for Functions.
 | Metric | Average connections| When number of connections exceed a set value|
 | Metric | HTTP 404| When HTTP 404 responses exceed a set value|
 | Metric | HTTP Server Errors| When HTTP 5xx errors exceed a set value|
-| Activity Log | Create or Update Web App | When app is created or updated|
-| Activity Log | Delete Web App | When app is deleted|
-| Activity Log | Restart Web App| When app is restarted|
-| Activity Log | Stop Web App| When app is stopped|
+| Activity Log | Create or update function app | When app is created or updated|
+| Activity Log | Delete function app | When app is deleted|
+| Activity Log | Restart function app| When app is restarted|
+| Activity Log | Stop function app| When app is stopped|
 
 ## Next steps
 

articles/cosmos-db/nosql/how-to-manage-conflicts.md

@@ -117,15 +117,10 @@ const { container: lwwContainer } = await database.containers.createIfNotExists(
 ### <a id="create-custom-conflict-resolution-policy-lww-python"></a>Python SDK
 
 ```python
-udp_collection = {
-    'id': self.udp_collection_name,
-    'conflictResolutionPolicy': {
-        'mode': 'LastWriterWins',
-        'conflictResolutionPath': '/myCustomId'
-    }
-}
-udp_collection = self.try_create_document_collection(
-    create_client, database, udp_collection)
+database = client.get_database_client(database=database_id)
+lww_conflict_resolution_policy = {'mode': 'LastWriterWins', 'conflictResolutionPath': '/regionId'}
+lww_container = database.create_container(id=lww_container_id, partition_key=PartitionKey(path="/id"), 
+    conflict_resolution_policy=lww_conflict_resolution_policy)
 ```
 
 ## Create a custom conflict resolution policy using a stored procedure
@@ -314,15 +309,10 @@ After your container is created, you must create the `resolver` stored procedure
 ### <a id="create-custom-conflict-resolution-policy-stored-proc-python"></a>Python SDK
 
 ```python
-udp_collection = {
-    'id': self.udp_collection_name,
-    'conflictResolutionPolicy': {
-        'mode': 'Custom',
-        'conflictResolutionProcedure': 'dbs/' + self.database_name + "/colls/" + self.udp_collection_name + '/sprocs/resolver'
-    }
-}
-udp_collection = self.try_create_document_collection(
-    create_client, database, udp_collection)
+database = client.get_database_client(database=database_id)
+udp_custom_resolution_policy = {'mode': 'Custom' }
+udp_container = database.create_container(id=udp_container_id, partition_key=PartitionKey(path="/id"),
+    conflict_resolution_policy=udp_custom_resolution_policy)
 ```
 
 After your container is created, you must create the `resolver` stored procedure.
@@ -421,14 +411,10 @@ const {
 ### <a id="create-custom-conflict-resolution-policy-python"></a>Python SDK
 
 ```python
-database = client.ReadDatabase("dbs/" + self.database_name)
-manual_collection = {
-    'id': self.manual_collection_name,
-    'conflictResolutionPolicy': {
-        'mode': 'Custom'
-    }
-}
-manual_collection = client.CreateContainer(database['_self'], collection)
+database = client.get_database_client(database=database_id)
+manual_resolution_policy = {'mode': 'Custom'}
+manual_container = database.create_container(id=manual_container_id, partition_key=PartitionKey(path="/id"), 
+    conflict_resolution_policy=manual_resolution_policy)
 ```
 
 ## Read from conflict feed
@@ -509,7 +495,7 @@ const { result: conflicts } = await container.conflicts.readAll().toArray();
 ### <a id="read-from-conflict-feed-python"></a>Python
 
 ```python
-conflicts_iterator = iter(client.ReadConflicts(self.manual_collection_link))
+conflicts_iterator = iter(container.list_conflicts())
 conflict = next(conflicts_iterator, None)
 while conflict:
     # Do something with conflict

articles/machine-learning/how-to-manage-quotas.md

@@ -169,9 +169,6 @@ For more information, see [Container Instances limits](../azure-resource-manager
 ### Storage
 Azure Storage has a limit of 250 storage accounts per region, per subscription. This limit includes both Standard and Premium storage accounts.
 
-To increase the limit, make a request through [Azure Support](https://portal.azure.com/#blade/Microsoft_Azure_Support/HelpAndSupportBlade/newsupportrequest/). The Azure Storage team will review your case and can approve up to 250 storage accounts for a region.
-
-
 ## Workspace-level quotas
 
 Use workspace-level quotas to manage Azure Machine Learning compute target allocation between multiple [workspaces](concept-workspace.md) in the same subscription.

articles/site-recovery/how-to-migrate-run-as-accounts-managed-identity.md

@@ -52,6 +52,7 @@ You can configure your managed identities through:
 
 **To migrate your Azure Automation account authentication type from a Run As to a managed identity authentication, follow these steps:**
 
+
 1. In the [Azure portal](https://portal.azure.com), select the recovery services vault for which you want to migrate the runbooks.
 
 1. On the homepage of your recovery services vault page, do the following:
@@ -64,7 +65,12 @@ You can configure your managed identities through:
 
         :::image type="content" source="./media/how-to-migrate-from-run-as-to-managed-identities/extension-update-settings.png" alt-text="Screenshot of the Create Recovery Services vault page.":::
 
-1. After the successful migration of your automation account, the authentication type for the linked account details on the **Extension update settings** page is updated.
+
+> [!NOTE]
+> Ensure that the System assigned Managed Identity is turned off for the Automation account for the _"Migrate"_ button to appear. If the account is not migrated and the _"Migrate"_ button isn't appearing, turn off the Managed Identity for the Automation Account and try again.
+
+3. After the successful migration of your automation account, the authentication type for the linked account details on the **Extension update settings** page is updated.
+1. Once the _Migrate_ operation is completed, toggle the **Site Recovery to manage** button to turn it _On_ again.
 
 When you successfully migrate from a Run As to a Managed Identities account, the following changes are reflected on the Automation Run As Accounts :
 
@@ -99,8 +105,7 @@ To link an existing managed identity Automation account to your Recovery Service
     1. Select the **Select** option.
         :::image type="content" source="./media/how-to-migrate-from-run-as-to-managed-identities/select-mi.png" alt-text="Screenshot that shows select managed identity settings page.":::
 1. Select **Review + assign**.
-
-
+1. Navigate to the **Extension update settings** under the Recovery Services Vault, toggle the **Site Recovery to manage** button to turn it _On_ again.
 
 ## Next steps
 

articles/storage/files/storage-files-identity-multiple-forests.md

@@ -145,6 +145,11 @@ To use this method, complete the following steps:
 
 Now, from domain-joined clients, you should be able to use storage accounts joined to any forest.
 
+> [!NOTE]
+> Ensure hostname part of the FQDN matches the storage account name as described above. Otherwise you will get an access denied error: "The filename, directory name, or volume label syntax is incorrect." A network trace will show STATUS_OBJECT_NAME_INVALID (0xc0000033) message during the SMB session setup.
+
+
+
 ### Add custom name suffix and routing rule
 
 If you've already modified the storage account name suffix and added a CNAME record as described in the previous section, you can skip this step. If you'd rather not make DNS changes or modify the storage account name suffix, you can configure a suffix routing rule from **Forest 1** to **Forest 2** for a custom suffix of **file.core.windows.net**.

includes/functions-cosmosdb-input-settings-v4.md

@@ -7,7 +7,7 @@ ms.author: glenga
 ---
 |function.json property | Description|
 |---------|----------------------|
-|**type** | Must be set to `cosmosDBTrigger`. |
+|**type** | Must be set to `cosmosDB`. |
 |**direction** | Must be set to `in`. |
 |**name** | The variable name used in function code that represents the list of documents with changes. |
 |**connection** | The name of an app setting or setting container that specifies how to connect to the Azure Cosmos DB account being monitored. For more information, see [Connections](#connections).|
@@ -16,4 +16,4 @@ ms.author: glenga
 |**partitionKey**| Specifies the partition key value for the lookup. May include binding parameters. It is required for lookups in [partitioned](../articles/cosmos-db/partitioning-overview.md#logical-partitions) containers.|
 |**id**    | The ID of the document to retrieve. This property supports [binding expressions](../articles/azure-functions/functions-bindings-expressions-patterns.md). Don't set both the `id` and `sqlQuery` properties. If you don't set either one, the entire container is retrieved. |
 |**sqlQuery**  | An Azure Cosmos DB SQL query used for retrieving multiple documents. The property supports runtime bindings, as in this example: `SELECT * FROM c where c.departmentId = {departmentId}`. Don't set both the `id` and `sqlQuery` properties. If you don't set either one, the entire container is retrieved.|
-|**preferredLocations**| (Optional) Defines preferred locations (regions) for geo-replicated database accounts in the Azure Cosmos DB service. Values should be comma-separated. For example, `East US,South Central US,North Europe`. |
+|**preferredLocations**| (Optional) Defines preferred locations (regions) for geo-replicated database accounts in the Azure Cosmos DB service. Values should be comma-separated. For example, `East US,South Central US,North Europe`. |