Merge pull request #293840 from MicrosoftDocs/main

01/30/2025 AM Publishing

Author: v-alje

articles/api-management/how-to-deploy-self-hosted-gateway-kubernetes-opentelemetry.md

@@ -15,8 +15,6 @@ ms.date: 12/17/2021
 
 This article describes the steps for deploying the self-hosted gateway component of Azure API Management to a Kubernetes cluster and automatically send all metrics to an [OpenTelemetry Collector](https://opentelemetry.io/docs/collector/).
 
-[!INCLUDE [preview](./includes/preview/preview-callout-self-hosted-gateway-opentelemetry.md)]
-
 You learn how to:
 
 > [!div class="checklist"]
@@ -35,8 +33,6 @@ You learn how to:
 
 [OpenTelemetry](https://opentelemetry.io/) is a set of open-source tools and frameworks for logging, metrics, and tracing in a vendor-neutral way.
 
-[!INCLUDE [preview](./includes/preview/preview-callout-self-hosted-gateway-opentelemetry.md)]
-
 The self-hosted gateway can be configured to automatically collect and send metrics to an [OpenTelemetry Collector](https://opentelemetry.io/docs/concepts/components/#collector). This allows you to bring your own metrics collection and reporting solution for the self-hosted gateway.
 
 > [!NOTE]

articles/api-management/includes/preview/preview-callout-self-hosted-gateway-opentelemetry.md

@@ -236,7 +236,7 @@ The following list of VM attributes are supported and provide examples of config
 
 - Optional
 - The `acceleratorManufacturers` is specified as a list
-- Valid values are *AMD*, *Nvidia*, and *Xilinx*
+- Valid values are *AMD*, *NVIDIA*, and *Xilinx*
 - `acceleratorSupport` should be set to *Included* or *Required* to use this VM attribute
 - If `acceleratorSupport` is set to *Excluded*, this VM attribute can't be used
 - The default for `acceleratorManufacturers`, if not specified, is *ANY* of the valid values

articles/azure-compute-fleet/attribute-based-vm-selection.md

@@ -5,7 +5,7 @@ ms.topic: overview
 ms.service: azure-backup
 ms.custom:
   - ignite-2023
-ms.date: 01/21/2025
+ms.date: 01/30/2025
 author: jyothisuri
 ms.author: jsuri
 ---
@@ -120,5 +120,5 @@ Also, as part of the backup and restore operations, the following roles are assi
 - [About Azure Kubernetes Service backup](azure-kubernetes-service-backup-overview.md)
 - [Supported scenarios for Azure Kubernetes Service cluster backup](azure-kubernetes-service-cluster-backup-support-matrix.md)
 - Back up Azure Kubernetes Service cluster using [Azure portal](azure-kubernetes-service-cluster-backup.md), [Azure PowerShell](azure-kubernetes-service-cluster-backup-using-powershell.md)
-- Restore Azure Kubernetes Service cluster using [Azure portal](azure-kubernetes-service-cluster-restore.md), [Azure CLI](azure-kubernetes-service-cluster-restore-using-cli.md)
+- Restore Azure Kubernetes Service cluster using [Azure portal](azure-kubernetes-service-cluster-restore.md), [Azure CLI](azure-kubernetes-service-cluster-restore-using-cli.md), [Azure PowerShell](azure-kubernetes-service-cluster-restore-using-powershell.md)
 - [Manage Azure Kubernetes Service cluster backups](azure-kubernetes-service-cluster-manage-backups.md)

articles/backup/azure-kubernetes-service-cluster-backup-concept.md

@@ -3,7 +3,7 @@ title: Back up Azure Kubernetes Service (AKS) using Azure CLI
 description: This article explains how to back up Azure Kubernetes Service (AKS) using Azure CLI.
 ms.topic: how-to
 ms.service: azure-backup
-ms.date: 01/16/2025
+ms.date: 01/30/2025
 ms.custom:
   - devx-track-azurecli
   - ignite-2023
@@ -325,6 +325,6 @@ az dataprotection job list-from-resourcegraph --datasource-type AzureKubernetesS
 
 ## Next steps
 
-- [Restore Azure Kubernetes Service cluster using Azure CLI](azure-kubernetes-service-cluster-restore-using-cli.md)
+- Restore Azure Kubernetes Service cluster using [Azure CLI](azure-kubernetes-service-cluster-restore-using-cli.md), [Azure PowerShell](azure-kubernetes-service-cluster-restore-using-powershell.md)
 - [Manage Azure Kubernetes Service cluster backups](azure-kubernetes-service-cluster-manage-backups.md)
 - [About Azure Kubernetes Service cluster backup](azure-kubernetes-service-cluster-backup-concept.md)

articles/backup/azure-kubernetes-service-cluster-backup-using-cli.md

@@ -3,7 +3,7 @@ title: Back up Azure Kubernetes Service by using Azure Backup
 description: Learn how to back up Azure Kubernetes Service (AKS) by using Azure Backup.
 ms.topic: how-to
 ms.service: azure-backup
-ms.date: 01/16/2025
+ms.date: 01/30/2025
 author: jyothisuri
 ms.author: jsuri
 ---
@@ -212,6 +212,6 @@ To enable a backup hook as part of the backup configuration flow to back up MySQ
 
 ## Next steps
 
-- [Restore an Azure Kubernetes Service cluster](azure-kubernetes-service-cluster-restore.md)
+- Restore an Azure Kubernetes Service cluster using [Azure portal](azure-kubernetes-service-cluster-restore.md), [Azure PowerShell](azure-kubernetes-service-cluster-restore-using-powershell.md)
 - [Manage Azure Kubernetes Service cluster backups](azure-kubernetes-service-cluster-manage-backups.md)
 - [About Azure Kubernetes Service cluster backup](azure-kubernetes-service-cluster-backup-concept.md)

articles/backup/azure-kubernetes-service-cluster-backup.md

@@ -3,7 +3,7 @@ title: Restore Azure Kubernetes Service (AKS) using Azure CLI
 description: This article explains how to restore backed-up Azure Kubernetes Service (AKS) using Azure CLI.
 ms.topic: how-to
 ms.service: azure-backup
-ms.date: 01/21/2025
+ms.date: 01/30/2025
 ms.custom:
   - devx-track-azurecli
   - ignite-2023
@@ -14,7 +14,7 @@ ms.author: jsuri
 
 # Restore Azure Kubernetes Service using Azure CLI 
 
-This article describes how to restore Azure Kubernetes cluster from a restore point created by Azure Backup using Azure CLI.
+This article describes how to restore Azure Kubernetes cluster from a restore point created by Azure Backup using Azure CLI. You can also restore AKS cluster using [Azure PowerShell](azure-kubernetes-service-cluster-restore-using-powershell.md).
 
 Azure Backup now allows you to back up AKS clusters (cluster resources and persistent volumes attached to the cluster) using a backup extension, which must be installed in the cluster. Backup vault communicates with the cluster via this Backup Extension to perform backup and restore operations. 
 

articles/backup/azure-kubernetes-service-cluster-restore-using-cli.md

@@ -1,9 +1,9 @@
 ---
-title: Restore Azure Kubernetes Service (AKS) using PowerShell
+title: Restore Azure Kubernetes Service (AKS) via PowerShell using Azure Backup
 description: This article explains how to restore backed-up Azure Kubernetes Service (AKS) using Azure PowerShell.
 ms.topic: how-to
 ms.service: azure-backup
-ms.date: 05/13/2024
+ms.date: 01/30/2025
 ms.custom:
   - devx-track-azurepowershell
   - ignite-2023
@@ -16,14 +16,26 @@ ms.author: jsuri
 
 This article describes how to restore Azure Kubernetes cluster from a restore point created by Azure Backup using Azure PowerShell.
 
-Azure Backup now allows you to back up AKS clusters (cluster resources and persistent volumes attached to the cluster) using a backup extension, which must be installed in the cluster. Backup vault communicates with the cluster via this Backup Extension to perform backup and restore operations. 
+Azure Backup supports backing up AKS clusters, including cluster resources and attached persistent volumes, using a backup extension. This extension must be installed in the cluster, enabling the Backup Vault to communicate with it to perform backup and restore operations.
 
-You can perform both *Original-Location Recovery (OLR)* (restoring in the AKS cluster that was backed up) and *Alternate-Location Recovery (ALR)* (restoring in a different AKS cluster). You can also select the items to be restored from the backup that is Item-Level Recovery (ILR).
+You can perform *Original-Location Recovery (OLR)* in the same AKS cluster or *Alternate-Location Recovery (ALR)* in a different AKS cluster. Item-Level Recovery (ILR) lets you select specific items to restore from the backup.
 
 >[!Note]
->Before you initiate a restore operation, the target cluster should have Backup Extension installed and Trusted Access enabled for the Backup vault. [Learn more](azure-kubernetes-service-cluster-backup-using-powershell.md#prepare-aks-cluster-for-backup).
+>Before you initiate a restore operation, ensure that the target cluster has Backup Extension installed and Trusted Access enabled for the Backup vault. [Learn more](azure-kubernetes-service-cluster-backup-using-powershell.md#prepare-aks-cluster-for-backup).
 
-Initialize the variables with required details related to each resource to be used in commands:
+## Prerequisites
+
+Before you restore an AKS cluster, ensure that you meet the following prerequisites:
+
+- AKS backup allows you to restore to original AKS cluster (that was backed up) and to an alternate AKS cluster. AKS backup allows you to perform a full restore and item-level restore. You can utilize [restore configurations](#restore-to-an-aks-cluster) to define parameters based on the cluster resources for restore.
+
+- You must [install the Backup Extension](azure-kubernetes-service-cluster-manage-backups.md#install-backup-extension) in the target AKS cluster. Also, you must [enable Trusted Access](azure-kubernetes-service-cluster-manage-backups.md#trusted-access-related-operations) between the Backup vault and the AKS cluster.
+
+For more information on the limitations and supported scenarios, see the [support matrix](azure-kubernetes-service-cluster-backup-support-matrix.md).
+
+## Initialize Variables for Resource Commands
+
+Here, provide the necessary details for each resource to be used in your commands.
 
 - Subscription ID of the Backup Vault
 
@@ -47,95 +59,93 @@ Initialize the variables with required details related to each resource to be us
     $restoreLocation = "vaultRegion" #example eastus
     ```
 
-- ID of the target AKS cluster, in case the restore will be performed to an alternate AKS cluster
+- ID of the target AKS cluster, in case the restore is performed to an alternate AKS cluster
 
     ```azurepowershell
     $targetAKSClusterId = "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx/resourceGroups/targetrg/providers/Microsoft.ContainerService/managedClusters/PSAKSCluster2"
     ```
 
-## Before you start
-
-- AKS backup allows you to restore to original AKS cluster (that was backed up) and to an alternate AKS cluster. AKS backup allows you to perform a full restore and item-level restore. You can utilize [restore configurations](#restore-to-an-aks-cluster) to define parameters based on the cluster resources that will be restored.
-
-- You must [install the Backup Extension](azure-kubernetes-service-cluster-manage-backups.md#install-backup-extension) in the target AKS cluster. Also, you must [enable Trusted Access](azure-kubernetes-service-cluster-manage-backups.md#trusted-access-related-operations) between the Backup vault and the AKS cluster.
-
-For more information on the limitations and supported scenarios, see the [support matrix](azure-kubernetes-service-cluster-backup-support-matrix.md).
-
 ## Restore to an AKS cluster 
 
 ### Fetch the relevant recovery point
 
-Fetch all instances using the `Get-AzDataProtectionBackupInstance` cmdlet and identify the relevant instance.
+To fetch the relevant recovery points, run the following cmdlets:
 
-```azurepowershell
-$AllInstances = Get-AzDataProtectionBackupInstance -ResourceGroupName $vaultRgName -VaultName $vaultName
-```
+1. Fetch all instances using the `Get-AzDataProtectionBackupInstance` cmdlet and identify the relevant instance.
+
+    ```azurepowershell
+    $AllInstances = Get-AzDataProtectionBackupInstance -ResourceGroupName $vaultRgName -VaultName $vaultName
+    ```
 
-You can also use `Az.Resourcegraph` and `Search-AzDataProtectionBackupInstanceInAzGraph` cmdlets to search across instances in multiple vaults and subscriptions.
+ To search across instances in multiple vaults and subscriptions, use `Az.Resourcegraph` and `Search-AzDataProtectionBackupInstanceInAzGraph` cmdlets.
 
-```azurepowershell
-$AllInstances = Search-AzDataProtectionBackupInstanceInAzGraph -Subscription $vaultSubId -ResourceGroup $vaultRgName -Vault $vaultName -DatasourceType AzureKubernetesService  -ProtectionStatus ProtectionConfigured
-```
+   ```azurepowershell
+    $AllInstances = Search-AzDataProtectionBackupInstanceInAzGraph -Subscription $vaultSubId -ResourceGroup $vaultRgName -Vault $vaultName -DatasourceType AzureKubernetesService  -ProtectionStatus ProtectionConfigured
+   ```
 
-Once the instance is identified, fetch the relevant recovery point. Supposedly, from the output array of the above command, third backup instance is to be restored.
+2. Once the instance is identified, fetch the relevant recovery point. From the output array of the given cmdlet, third backup instance is to be restored.
 
-```azurepowershell
-$rp = Get-AzDataProtectionRecoveryPoint -ResourceGroupName $vaultRgName -VaultName $vaultName -BackupInstanceName $AllInstances[2].BackupInstanceName
-```
+    ```azurepowershell
+    $rp = Get-AzDataProtectionRecoveryPoint -ResourceGroupName $vaultRgName -VaultName $vaultName -BackupInstanceName $AllInstances[2].BackupInstanceName
+    ```
 
 ### Prepare the restore request
 
-Use the `New-AzDataProtectionRestoreConfigurationClientObject` cmdlet to prepare the restore configuration and defining the items to be restored to the target AKS cluster.
+To prepare the restore request, run the following cmdlets:
 
-```azurepowershell
-$aksRestoreCriteria = New-AzDataProtectionRestoreConfigurationClientObject -DatasourceType AzureKubernetesService  -PersistentVolumeRestoreMode RestoreWithVolumeData  -IncludeClusterScopeResource $true -NamespaceMapping  @{"sourceNamespace"="targetNamespace"}
-```
+1. Prepare the restore configuration and define the items to be restored to the target AKS cluster by using the `New-AzDataProtectionRestoreConfigurationClientObject` cmdlet.
 
-Then, use the `Initialize-AzDataProtectionRestoreRequest` cmdlet to prepare the restore request with all relevant details.
+    ```azurepowershell
+    $aksRestoreCriteria = New-AzDataProtectionRestoreConfigurationClientObject -DatasourceType AzureKubernetesService  -PersistentVolumeRestoreMode RestoreWithVolumeData  -IncludeClusterScopeResource $true -NamespaceMapping  @{"sourceNamespace"="targetNamespace"}
+    ```
 
-In case you want to perform restore to the original AKS cluster backedup, use the below format for the cmdlet
+2. Prepare the restore request with all relevant details by using the `Initialize-AzDataProtectionRestoreRequest` cmdlet.
 
-```azurepowershell
-$aksRestoreRequest = Initialize-AzDataProtectionRestoreRequest -DatasourceType AzureKubernetesService  -SourceDataStore OperationalStore -RestoreLocation $restoreLocation -RestoreType OriginalLocation -RecoveryPoint $rp[0].Property.RecoveryPointId -RestoreConfiguration $aksRestoreCriteria -BackupInstance $AllInstances[2]
-```
-In case you want to perform restore to an alternate AKS cluster, use the below format for the cmdlet
+   For restore to the original AKS cluster, use the following cmdlet  format:
 
-```azurepowershell
-$aksRestoreRequest = Initialize-AzDataProtectionRestoreRequest -DatasourceType AzureKubernetesService  -SourceDataStore OperationalStore -RestoreLocation $restoreLocation -RestoreType AlternateLocation -TargetResourceId $targetAKSClusterId -RecoveryPoint $rp[0].Property.RecoveryPointId -RestoreConfiguration $aksRestoreCriteria -BackupInstance $AllInstances[2]
-```
+    ```azurepowershell
+    $aksRestoreRequest = Initialize-AzDataProtectionRestoreRequest -DatasourceType AzureKubernetesService  -SourceDataStore OperationalStore -RestoreLocation $restoreLocation -RestoreType OriginalLocation -RecoveryPoint $rp[0].Property.RecoveryPointId -RestoreConfiguration $aksRestoreCriteria -BackupInstance $AllInstances[2]
+    ```
+   For restore to an alternate AKS cluster, use the following cmdlet format:
+
+    ```azurepowershell
+    $aksRestoreRequest = Initialize-AzDataProtectionRestoreRequest -DatasourceType AzureKubernetesService  -SourceDataStore OperationalStore -RestoreLocation $restoreLocation -RestoreType AlternateLocation -TargetResourceId $targetAKSClusterId -RecoveryPoint $rp[0].Property.RecoveryPointId -RestoreConfiguration $aksRestoreCriteria -BackupInstance $AllInstances[2]
+    ```
 
 ## Trigger the restore
 
-Before you trigger the restore operation, validate the restore request created earlier.
+To trigger the restore operation, run the following cmdlets:
 
-```azurepowershell
-$validateRestore = Test-AzDataProtectionBackupInstanceRestore -SubscriptionId $vaultSubId  -ResourceGroupName $vaultRgName -VaultName $vaultName -RestoreRequest $aksRestoreRequest -Name $AllInstances[2].BackupInstanceName
-```
+1. Validate the restore request created earlier.
 
->[!Note]
->During the restore operation, the Backup vault and the AKS cluster need to have certain roles assigned to perform the restore:
+    ```azurepowershell
+    $validateRestore = Test-AzDataProtectionBackupInstanceRestore -SubscriptionId $vaultSubId  -ResourceGroupName $vaultRgName -VaultName $vaultName -RestoreRequest $aksRestoreRequest -Name $AllInstances[2].BackupInstanceName
+    ```
 
-1. *Target AKS* cluster should have *Contributor* role on the *Snapshot Resource Group*.
-2. The *User Identity* attached with the Backup Extension should have *Storage Account Contributor* roles on the *storage account* where backups are stored. 
-3. The *Backup vault* should have a *Reader* role on the *Target AKS cluster* and *Snapshot Resource Group*.
+   >[!Note]
+   >During the restore operation, the Backup vault and the AKS cluster need to have certain roles assigned to perform the restore:
 
-Now, use the `Start-AzDataProtectionBackupInstanceRestore` cmdlet to trigger the restore operation with the request prepared earlier.
+   - *Target AKS* cluster should have *Contributor* role on the *Snapshot Resource Group*.
+   - The *User Identity* attached with the Backup Extension should have *Storage Account Contributor* roles on the *storage account* where backups are stored. 
+   - The *Backup vault* should have a *Reader* role on the *Target AKS cluster* and *Snapshot Resource Group*.
 
-```azurepowershell
-$restoreJob = Start-AzDataProtectionBackupInstanceRestore -SubscriptionId $vaultSubId  -ResourceGroupName $vaultRgName -VaultName $vaultName -BackupInstanceName $AllInstances[2].BackupInstanceName -Parameter $aksRestoreRequest
-```
+2. To trigger the restore operation with the request prepared earlier by using the `Start-AzDataProtectionBackupInstanceRestore` cmdlet.
+
+    ```azurepowershell
+    $restoreJob = Start-AzDataProtectionBackupInstanceRestore -SubscriptionId $vaultSubId  -ResourceGroupName $vaultRgName -VaultName $vaultName -BackupInstanceName $AllInstances[2].BackupInstanceName -Parameter $aksRestoreRequest
+    ```
 
-## Tracking job
+## Track the restore job
 
-Track all the jobs using the `Get-AzDataProtectionJob` cmdlet. You can list all jobs and fetch a particular job detail. You can also use `Az.ResourceGraph` to track all jobs across all Backup vaults.
+Track all the jobs using the `Get-AzDataProtectionJob` cmdlet. You can list all jobs and fetch a particular job detail. Alternatively, use Az.ResourceGraph to track jobs across all Backup vaults.
 
-Use the `Search-AzDataProtectionJobInAzGraph` cmdlet to get the relevant job, which can be across any Backup vault.
+To get the relevant job across any Backup vault, use the `Search-AzDataProtectionJobInAzGraph` cmdlet.
 
 ```azurepowershell
 $job = Search-AzDataProtectionJobInAzGraph -Subscription -SubscriptionId $vaultSubId -ResourceGroup $vaultRgName -Vault $vaultName -DatasourceType AzureKubernetesService -Operation Restore
 ```
 
 ## Next steps
 
-- [Manage Azure Kubernetes Service cluster backups](azure-kubernetes-service-cluster-manage-backups.md)
-- [About Azure Kubernetes Service cluster backup](azure-kubernetes-service-cluster-backup-concept.md)
+- [Management of  Azure Kubernetes Service cluster backups](azure-kubernetes-service-cluster-manage-backups.md).
+- [Azure Kubernetes Service cluster backup overview](azure-kubernetes-service-cluster-backup-concept.md).