Merge pull request #291575 from MicrosoftDocs/repo_sync_working_branch

Taojunshen · web-flow · commit e5db4d8da85f · 2024-12-07T01:31:51.000+08:00
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
diff --git a/articles/automation/automation-manage-send-joblogs-log-analytics.md b/articles/automation/automation-manage-send-joblogs-log-analytics.md
@@ -110,7 +110,7 @@ Azure Automation diagnostics create the following types of records in Azure Moni
 | Caller_s |Caller that initiated the operation. Possible values are either an email address or system for scheduled jobs. |
 | Tenant_g | GUID (globally unique identifier) that identifies the tenant for the caller. |
 | JobId_g |GUID that identifies the runbook job. |
-| ResultType |Status of the runbook job. Possible values are:<br>- New<br>- Created<br>- Started<br>- Stopped<br>- Suspended<br>- Failed<br>- Completed |
+| ResultType |Status of the runbook job. Possible values are:<br>- Created<br>- Started<br>- Stopped<br>- Suspended<br>- Failed<br>- Completed |
 | Category | Classification of the type of data. For Automation, the value is JobLogs. |
 | OperationName | Type of operation performed in Azure. For Automation, the value is Job. |
 | Resource | Name of the Automation account |
diff --git a/articles/backup/backup-azure-security-feature-cloud.md b/articles/backup/backup-azure-security-feature-cloud.md
@@ -130,20 +130,20 @@ Follow these steps:
 1. Identify the items that are in soft-deleted state.
 
    ```powershell
-   $vault = Get-AzRecoveryServicesVault -ResourceGroupName "yourResourceGroupName" -Name "yourVaultName"
-   Get-AzRecoveryServicesBackupItem -BackupManagementType AzureVM -WorkloadType AzureVM -VaultID $vault.ID | Where-Object {$_.DeleteState -eq "ToBeDeleted"}
+   $myVault = Get-AzRecoveryServicesVault -ResourceGroupName "yourResourceGroupName" -Name "yourVaultName"
+   Get-AzRecoveryServicesBackupItem -BackupManagementType AzureVM -WorkloadType AzureVM -VaultID $myVault.ID | Where-Object {$_.DeleteState -eq "ToBeDeleted"}
 
    Name                                     ContainerType        ContainerUniqueName                      WorkloadType         ProtectionStatus     HealthStatus         DeleteState
    ----                                     -------------        -------------------                      ------------         ----------------     ------------         -----------
    VM;iaasvmcontainerv2;selfhostrg;AppVM1    AzureVM             iaasvmcontainerv2;selfhostrg;AppVM1       AzureVM              Healthy              Passed               ToBeDeleted
 
-   $myBkpItem = Get-AzRecoveryServicesBackupItem -BackupManagementType AzureVM -WorkloadType AzureVM -VaultId $myVaultID -Name AppVM1
+   $myBkpItem = Get-AzRecoveryServicesBackupItem -BackupManagementType AzureVM -WorkloadType AzureVM -VaultId $myVault.ID -Name AppVM1
    ```
 
 2. Reverse the deletion operation that was performed when soft-delete was enabled.
 
    ```powershell
-   Undo-AzRecoveryServicesBackupItemDeletion -Item $myBKpItem -VaultId $myVaultID -Force
+   Undo-AzRecoveryServicesBackupItemDeletion -Item $myBKpItem -VaultId $myVault.ID -Force
 
    WorkloadName     Operation            Status               StartTime                 EndTime                   JobID
    ------------     ---------            ------               ---------                 -------                   -----
@@ -152,7 +152,7 @@ Follow these steps:
 3. As the soft-delete is disabled, the deletion operation immediately removes the backup data.
 
    ```powershell
-   Disable-AzRecoveryServicesBackupProtection -Item $myBkpItem -RemoveRecoveryPoints -VaultId $myVaultID -Force
+   Disable-AzRecoveryServicesBackupProtection -Item $myBkpItem -RemoveRecoveryPoints -VaultId $myVault.ID -Force
 
    WorkloadName     Operation            Status               StartTime                 EndTime                   JobID
    ------------     ---------            ------               ---------                 -------                   -----
@@ -172,4 +172,4 @@ Follow these steps:
 ## Next steps
 
 - [Overview of security features in Azure Backup](security-overview.md)
-- [Frequently asked questions](soft-delete-azure-backup-faq.yml).
+- [Frequently asked questions](soft-delete-azure-backup-faq.yml).
diff --git a/articles/backup/backup-azure-troubleshoot-blob-backup.md b/articles/backup/backup-azure-troubleshoot-blob-backup.md
@@ -79,7 +79,7 @@ This article provides troubleshooting information to address issues you encounte
 
 **Error message**: The required setting PITR is disabled on storage account.
 
-**Recommendation**: Enable that the point-in-restore setting on the storage account. [Learn more](../storage/blobs/point-in-time-restore-manage.md?tabs=portal#enable-and-configure-point-in-time-restore).
+**Recommendation**: Enable that the point-in-time restore setting on the storage account. [Learn more](../storage/blobs/point-in-time-restore-manage.md?tabs=portal#enable-and-configure-point-in-time-restore).
 
 ### UserErrorImmutabilityPolicyConfigured
 
diff --git a/articles/backup/backup-sql-server-azure-troubleshoot.md b/articles/backup/backup-sql-server-azure-troubleshoot.md
@@ -276,19 +276,19 @@ The total string size of files depends not only on the number of files but also
 ```sql
 SELECT mf.name AS LogicalName, Physical_Name AS Location FROM sys.master_files mf
                INNER JOIN sys.databases db ON db.database_id = mf.database_id
-               WHERE db.name = N'<Database Name>'"
+               WHERE db.name = N'<Database Name>'
 ```
 
 Now arrange them in the following format:
 
 ```json
-[{"path":"<Location>","logicalName":"<LogicalName>","isDir":false},{"path":"<Location>","logicalName":"<LogicalName>","isDir":false}]}
+[{"path":"<Location>","logicalName":"<LogicalName>","isDir":false},{"path":"<Location>","logicalName":"<LogicalName>","isDir":false}]
 ```
 
 Here's an example:
 
 ```json
-[{"path":"F:\\Data\\TestDB12.mdf","logicalName":"TestDB12","isDir":false},{"path":"F:\\Log\\TestDB12_log.ldf","logicalName":"TestDB12_log","isDir":false}]}
+[{"path":"F:\\Data\\TestDB12.mdf","logicalName":"TestDB12","isDir":false},{"path":"F:\\Log\\TestDB12_log.ldf","logicalName":"TestDB12_log","isDir":false}]
 ```
 
 If the string size of the content exceeds 20,000 bytes, the database files are stored differently. During recovery, you won't be able to set the target file path for restore. The files will be restored to the default SQL path provided by SQL Server.
@@ -336,7 +336,7 @@ In the preceding content, you can get the logical name of the database file by u
 ```sql
 SELECT mf.name AS LogicalName FROM sys.master_files mf
                 INNER JOIN sys.databases db ON db.database_id = mf.database_id
-                WHERE db.name = N'<Database Name>'"
+                WHERE db.name = N'<Database Name>'
 ```
 
 This file should be placed before you trigger the restore operation.
diff --git a/articles/backup/backup-vault-overview.md b/articles/backup/backup-vault-overview.md
@@ -24,7 +24,7 @@ A Backup vault is an entity that stores the backups and recovery points created
 
 - Azure Backup automatically handles storage for the vault. Choose the storage redundancy that matches your business needs when creating the Backup vault.
 
-- To learn more about storage redundancy, see these articles on [geo](../storage/common/storage-redundancy.md#geo-redundant-storage), [zonal (preview)](../storage/common/storage-redundancy.md#zone-redundant-storage), and [local](../storage/common/storage-redundancy.md#locally-redundant-storage) redundancy.
+- To learn more about storage redundancy, see these articles on [geo](../storage/common/storage-redundancy.md#geo-redundant-storage), [zonal](../storage/common/storage-redundancy.md#zone-redundant-storage), and [local](../storage/common/storage-redundancy.md#locally-redundant-storage) redundancy.
 
 ## Encryption settings in the Backup vault
 
diff --git a/articles/backup/selective-disk-backup-restore.md b/articles/backup/selective-disk-backup-restore.md
@@ -21,7 +21,7 @@ This is supported both for Enhanced Policy as well as Standard Policy.
 >[!Note]
 >- This is supported for both backup policies - [Enhanced policy](backup-azure-vms-enhanced-policy.md) and [Standard policy](backup-during-vm-creation.md#create-a-vm-with-backup-configured).
 >- The *Selective disk backup and restore in Enhanced policy* is available in all Azure regions including Public, Government, and Air-Gapped regions.
->- If you use selective disk backup with *Enhanced policy* on a Linux VM, ensure that *lsblk* and *lssci* are available in your distribution so that the disks are [excluded](selective-disk-backup-restore.md#enhanced-policy). 
+>- If you use selective disk backup with *Enhanced policy* on a Linux VM, ensure that *lsblk* and *lsscsi* are available in your distribution so that the disks are [excluded](selective-disk-backup-restore.md#enhanced-policy). 
 
 ## Scenarios
 
diff --git a/articles/business-continuity-center/business-continuity-center-overview.md b/articles/business-continuity-center/business-continuity-center-overview.md
@@ -31,7 +31,8 @@ Some of the key benefits you get with Azure Business Continuity Center include:
 
 ## What can I manage with ABC center? 
 
-Azure Business Continuity Center allows you to manage data sources protected across the solutions. You can manage these resources from different environments, such as Azure and on-premises. Learn about the [supported scenarios and limitations]().
+Azure Business Continuity center allows you to manage data sources protected across the solutions. You can manage these resources from different environments, such as Azure and on-premises. Learn about the [supported scenarios and limitations](business-continuity-center-support-matrix.md).
+
 
 ## Get started
 
diff --git a/articles/update-manager/deploy-manage-updates-using-updates-view.md b/articles/update-manager/deploy-manage-updates-using-updates-view.md
@@ -22,7 +22,7 @@ The Updates blade allows you to manage machines from an updates viewpoint. It im
 
 ## Classic use case
 
-This option is helpful when you discover a vulnerability and want to fix it by applying a specific update on all machines on which it was pending. For example, a vulnerability is discovered in software, which can potentially expose the customer's environment to risk like remote code extension. The Central IT team discovers this threat and want to secure their enterprise's environment by applying an update *abc* that would mitigate vulnerability. Using the Updates view, they can apply the update *abc* on all the impacted machines.
+This option is helpful when you discover a vulnerability and want to fix it by applying a specific update on all machines on which it was pending. For example, a vulnerability is discovered in software, which can potentially expose the customer's environment to risk like remote code execution. The Central IT team discovers this threat and want to secure their enterprise's environment by applying an update *abc* that would mitigate vulnerability. Using the Updates view, they can apply the update *abc* on all the impacted machines.
 
  ## Summarized view
 
@@ -68,4 +68,4 @@ You can use either the **Overview** blade or select the **Updates** blade that p
 * [Deploy updates now (on-demand) for single machine](deploy-updates.md)
 * [Schedule recurring updates](scheduled-patching.md)
 * [Manage update settings via Portal](manage-update-settings.md)
-* [Manage multiple machines using update Manager](manage-multiple-machines.md)
+* [Manage multiple machines using update Manager](manage-multiple-machines.md)
diff --git a/articles/update-manager/pre-post-events-schedule-maintenance-configuration.md b/articles/update-manager/pre-post-events-schedule-maintenance-configuration.md
@@ -86,8 +86,10 @@ In the **Event Subscription Details** section, provide an appropriate name.
     $EventSubscriptionName = "PreEventWebhook"
     
     $PreEventWebhookEndpoint = "<Webhook URL>"
-    
-    New-AzEventGridSystemTopicEventSubscription -ResourceGroupName $ResourceGroupForSystemTopic -SystemTopicName $SystemTopicName -EventSubscriptionName $EventSubscriptionName -Endpoint $PreEventWebhookEndpoint -IncludedEventType $IncludedEventTypes
+
+    $dest = New-AzEventGridWebHookEventSubscriptionDestinationObject -EndpointUrl $PreEventWebhookEndpoint
+   
+    New-AzEventGridSystemTopicEventSubscription -ResourceGroupName $ResourceGroupForSystemTopic -SystemTopicName $SystemTopicName -EventSubscriptionName $EventSubscriptionName -Endpoint $PreEventWebhookEndpoint -IncludedEventType $IncludedEventTypes -Destination $dest
     
     # Azure Function
     
@@ -268,8 +270,10 @@ In the **Event Subscription Details** section, provide an appropriate name.
     $EventSubscriptionName = "PreEventWebhook"
     
     $PreEventWebhookEndpoint = "<Webhook URL>"
+
+    $dest = New-AzEventGridWebHookEventSubscriptionDestinationObject -EndpointUrl $PreEventWebhookEndpoint
     
-    New-AzEventGridSystemTopicEventSubscription -ResourceGroupName $ResourceGroupForSystemTopic -SystemTopicName $SystemTopicName -EventSubscriptionName $EventSubscriptionName -Endpoint $PreEventWebhookEndpoint -IncludedEventType $IncludedEventTypes
+    New-AzEventGridSystemTopicEventSubscription -ResourceGroupName $ResourceGroupForSystemTopic -SystemTopicName $SystemTopicName -EventSubscriptionName $EventSubscriptionName -Endpoint $PreEventWebhookEndpoint -IncludedEventType $IncludedEventTypes -Destination $dest
  
     # Azure Function
     
diff --git a/articles/virtual-desktop/uri-scheme.md b/articles/virtual-desktop/uri-scheme.md
@@ -46,7 +46,7 @@ The *ms-avd* Uniform Resource Identifier scheme for Azure Virtual Desktop is now
 | workspaceid | Object ID (GUID). | Specify the object ID of a valid workspace.<br /><br />To get the object ID value using PowerShell, see [Retrieve the object ID of a host pool, workspace, application group, or application](powershell-module.md#retrieve-the-object-id-of-a-host-pool-workspace-application-group-or-application). You can also use [Desktop Virtualization REST APIs](/rest/api/desktopvirtualization). |
 | resourceid | Object ID (GUID). | Specify the object ID of a published resource contained in the workspace. The value can be for a desktop or RemoteApp.<br /><br />To get the object ID value using PowerShell, see [Retrieve the object ID of a host pool, workspace, application group, or application](powershell-module.md#retrieve-the-object-id-of-a-host-pool-workspace-application-group-or-application). You can also use [Desktop Virtualization REST APIs](/rest/api/desktopvirtualization). |
 | user | User Principal Name (UPN), for example `user@contoso.com`. | Specify a valid user with access to specified resource. |
-| env *(optional)* | **avdarm** (commercial Azure)<br />**avdgov** (Azure Government) | Specify the Azure cloud where resources are located. |
+| env *(optional)* | **avdarm** (commercial Azure)<br />**usgov** (Azure Government) | Specify the Azure cloud where resources are located. |
 | version | **0** | Specify the version of the connect URI scheme to use. |
 | launchpartnerid *(optional)*| GUID. | Specify the partner or customer-provided ID that you can use with [Azure Virtual Desktop Diagnostics](diagnostics-log-analytics.md) to help with troubleshooting. We recommend using a GUID, which you can generate with the [New-Guid](/powershell/module/microsoft.powershell.utility/new-guid) PowerShell cmdlet. |
 | peeractivityid *(optional)*| GUID. | Specify the partner or customer-provided ID that you can use with [Azure Virtual Desktop Diagnostics](diagnostics-log-analytics.md) to help with troubleshooting. We recommend using a GUID, which you can generate with the [New-Guid](/powershell/module/microsoft.powershell.utility/new-guid) PowerShell cmdlet. |
