Skip to content

Commit 9c503b6

Browse files
author
Pat Altimore
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into patricka-dataflow-cli
2 parents bf78ef3 + bd6a639 commit 9c503b6

File tree

80 files changed

+950
-745
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+950
-745
lines changed

articles/api-management/api-management-region-availability.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: dlepow
66

77
ms.service: azure-api-management
88
ms.topic: concept-article
9-
ms.date: 05/28/2025
9+
ms.date: 06/17/2025
1010
ms.author: danlep
1111
ms.custom:
1212
- references_regions
@@ -34,7 +34,7 @@ Information in the following table is updated regularly. Capacity availability i
3434
| Central India ||| | |
3535
| East Asia ||| ||
3636
| East US ||| | |
37-
| East US 2 ||| ||
37+
| East US 2 ||| ||
3838
| France Central ||| ||
3939
| Germany West Central |||||
4040
| Japan East ||| ||

articles/api-management/self-hosted-gateway-enable-dapr.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Dapr integration in API Management enables operations teams to directly expose D
1818

1919
## About Dapr
2020

21-
Dapr is a portable runtime for building stateless and stateful microservices-based applications with any language or framework. It codifies the common microservice patterns, like service discovery and invocation with build-in retry logic, publish-and-subscribe with at-least-once delivery semantics, or pluggable binding resources to ease composition using external services. Go to [dapr.io](https://dapr.io) for detailed information and instruction on how to get started with Dapr.
21+
Dapr is a portable runtime for building stateless and stateful microservices-based applications with any language or framework. It codifies the common microservice patterns, like service discovery and invocation with built-in retry logic, publish-and-subscribe with at-least-once delivery semantics, or pluggable binding resources to ease composition using external services. Go to [dapr.io](https://dapr.io) for detailed information and instruction on how to get started with Dapr.
2222

2323
## Enable Dapr support
2424

articles/azure-signalr/signalr-howto-use-management-sdk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.author: lianwei
1010

1111
# Use Azure SignalR Management SDK
1212

13-
Azure SignalR Management SDK helps you to manage SignalR clients through Azure SignalR Service directly such as broadcast messages. Therefore, this SDK could be but not limited to be used in [serverless](https://azure.microsoft.com/solutions/serverless/) environments. You could use this SDK to manage SignalR clients connected to your Azure SignalR Service in any environment, such as in a console app, in an Azure function or in a web server.
13+
Azure SignalR Management SDK helps you to manage SignalR clients through Azure SignalR Service directly such as broadcast messages. Therefore, this SDK can be used in [serverless](https://azure.microsoft.com/solutions/serverless/) environments, but it is not limited to them. You could use this SDK to manage SignalR clients connected to your Azure SignalR Service in any environment, such as in a console app, in an Azure function or in a web server.
1414

1515
> [!NOTE]
1616
>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Troubleshoot Azure Kubernetes Service backup
33
description: Symptoms, causes, and resolutions of the Azure Kubernetes Service backup and restore operations.
44
ms.topic: troubleshooting
5-
ms.date: 04/30/2025
5+
ms.date: 06/18/2025
66
ms.service: azure-backup
77
ms.custom:
88
- ignite-2023
@@ -65,6 +65,9 @@ The extension pods aren't exempt, and require the Microsoft Entra pod identity t
6565

6666
3. To assign the *Storage Blob Data Contributor* role to the extension identity, run the following command:
6767

68+
>[!Note]
69+
>Ensure that you use the latest Terraform script version. [Learn more](quick-kubernetes-backup-terraform.md#prerequisites).
70+
6871
```azurecli-interactive
6972
az role assignment create --assignee-object-id $(az k8s-extension show --name azure-aks-backup --cluster-name aksclustername --resource-group aksclusterresourcegroup --cluster-type managedClusters --query aksAssignedIdentity.principalId --output tsv) --role 'Storage Blob Data Contributor' --scope /subscriptions/subscriptionid/resourceGroups/storageaccountresourcegroup/providers/Microsoft.Storage/storageAccounts/storageaccountname
7073
```

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.custom:
77
- devx-track-azurecli
88
- ignite-2023
99
- ignite-2024
10-
ms.date: 01/16/2025
10+
ms.date: 06/18/2025
1111
author: jyothisuri
1212
ms.author: jsuri
1313
---
@@ -22,8 +22,9 @@ In addition, it helps to describe how to manage backup for the Azure Kubernetes
2222

2323
## Resource provider registrations
2424

25-
- You must register these resource providers on the subscription before initiating any backup and restore operation.
26-
- Once the registration is complete, you can perform backup and restore operations on all the cluster under the subscription.
25+
Resource Provider registration is required for installing the Backup Extension, and initiating any backup and restore operation. You can do this registration as a Subscription Owner. Generally, the Resource Provider is already registered in an Azure subscription. If not, register the `Microsoft.KubernetesConfiguration` resource provider.
26+
27+
After the registration is complete, you can perform backup and restore operations on all the cluster under the subscription.
2728

2829
### Register the Backup Extension
2930

articles/backup/backup-azure-arm-restore-vms.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Restore VMs by using the Azure portal using Azure Backup
33
description: Restore an Azure virtual machine from a recovery point by using the Azure portal, including the Cross Region Restore feature.
44
ms.reviewer: nikhilsarode
55
ms.topic: how-to
6-
ms.date: 06/12/2025
6+
ms.date: 06/18/2025
77
ms.service: azure-backup
88
author: jyothisuri
99
ms.author: jsuri
@@ -121,7 +121,8 @@ As one of the [restore options](#restore-options), you can create a VM quickly w
121121
1. Select **Restore** to trigger the restore operation.
122122

123123
>[!Note]
124-
>Before you modify any NSG settings, ensure the VM restore operation is complete. Learn about [tracking the restore operation](#track-the-restore-operation).
124+
>- Before you modify any NSG settings, ensure the VM restore operation is complete. Learn about [tracking the restore operation](#track-the-restore-operation).
125+
>- During an Alternate Location Restore (Create new VM), the restored VM retains the same SKU as the original VM at the time of the recovery point creation. Any SKU changes made after the backup date don't reflect in the restored VM.
125126
126127
## Restore disks
127128

articles/backup/backup-azure-enhanced-soft-delete-tutorial.md

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Tutorial - Recover soft deleted data and recovery points using enhanced soft delete in Azure Backup
33
description: Learn how to enable enhanced soft delete and recover your data and recover backups, if they're deleted.
44
ms.topic: tutorial
5-
ms.date: 09/11/2023
5+
ms.date: 06/18/2025
66
ms.service: azure-backup
77
author: jyothisuri
88
ms.author: jsuri
@@ -17,8 +17,10 @@ This tutorial describes how to enable enhanced soft delete and recover your data
1717
>[!Note]
1818
>Once you enable the *always-on* state for soft delete, you can't disable it for that vault.
1919
20-
## Before you start
20+
## Considerations
2121

22+
Before you start using the Enhanced soft delete feature, review the following considetations:
23+
2224
- Enhanced soft delete is supported for Recovery Services vaults and Backup vaults.
2325
- Enhanced soft delete applies to all vaulted workloads alike in Recovery Services vaults and Backup vaults. However, it currently doesn't support operational tier workloads, such as Azure Files backup, Operational backup for Blobs, and Disk and VM snapshot backups.
2426
- For hybrid backups (using MARS, DPM, or MABS), enabling always-on soft delete will disallow server deregistration and deletion of backups via the Azure portal. If you don't want to retain the backed-up data, we recommend you not to enable the *always-on soft-delete* for the vault or perform *stop protection with delete data* before the server is decommissioned.
@@ -32,7 +34,7 @@ Soft delete is enabled by default for all new vaults you create. To make enabled
3234

3335
# [Recovery Services vault](#tab/recovery-services-vault)
3436

35-
Follow these steps:
37+
To enable soft delete with always-on state on a Recovery Services vault, follow these steps:
3638

3739
1. Go to **Recovery Services vault** > **Properties**.
3840

@@ -64,7 +66,7 @@ Follow these steps:
6466

6567
# [Backup vault](#tab/backup-vault)
6668

67-
Follow these steps:
69+
To enable soft delete with always-on state on a Backup vault, follow these steps:
6870

6971
1. Go to **Backup vault** > **Properties**.
7072

@@ -100,7 +102,7 @@ You can delete backup items/instances even if the soft delete settings are enabl
100102

101103
# [Recovery Services vault](#tab/recovery-services-vault)
102104

103-
Follow these steps:
105+
To delete a backup item from a Recovery Services vault, follow these steps:
104106

105107
1. Go to the *backup item* that you want to delete.
106108
1. Select **Stop backup**.
@@ -120,7 +122,7 @@ Follow these steps:
120122
121123
# [Backup vault](#tab/backup-vault)
122124

123-
Follow these steps:
125+
To delete a backup item from a Backup vault, follow these steps:
124126

125127
1. In the **Backup center**, go to the *backup instance* that you want to delete.
126128

@@ -150,7 +152,7 @@ If a backup item/ instance is soft deleted, you can recover it before it's perma
150152

151153
# [Recovery Services vault](#tab/recovery-services-vault)
152154

153-
Follow these steps:
155+
To recover a soft-deleted backup item to a Recovery Services vault, follow these steps:
154156

155157
1. Go to the *backup item* that you want to retrieve from the *soft deleted* state.
156158

@@ -166,7 +168,7 @@ Follow these steps:
166168

167169
# [Backup vault](#tab/backup-vault)
168170

169-
Follow these steps:
171+
To recover a soft-deleted backup item to a Backup vault, follow these steps:
170172

171173
1. Go to the *deleted backup instance* that you want to recover.
172174

@@ -188,7 +190,7 @@ Follow these steps:
188190

189191
>- MUA for soft delete is currently supported for Recovery Services vaults only.
190192
191-
## Next steps
193+
## Related content
192194

193-
- Learn more about [enhanced soft delete for Azure Backup](backup-azure-enhanced-soft-delete-about.md).
194-
- Learn more about [soft delete of recovery points](backup-azure-enhanced-soft-delete-about.md#soft-delete-of-recovery-points).
195+
- [About enhanced soft delete for Azure Backup](backup-azure-enhanced-soft-delete-about.md).
196+
- [About soft delete of recovery points](backup-azure-enhanced-soft-delete-about.md#soft-delete-of-recovery-points).

articles/backup/backup-azure-manage-mars.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Manage and monitor MARS Agent backups
33
description: Learn how to manage and monitor Microsoft Azure Recovery Services (MARS) Agent backups by using the Azure Backup service.
44
ms.reviewer: srinathv
55
ms.topic: how-to
6-
ms.date: 11/27/2024
6+
ms.date: 06/18/2025
77
ms.service: azure-backup
88
ms.custom: engagement-fy23
99
author: jyothisuri
@@ -332,5 +332,5 @@ To list recovery points for a data source, follow these steps:
332332
## Next steps
333333

334334
- For information about supported scenarios and limitations, refer to the [Support Matrix for the MARS Agent](./backup-support-matrix-mars-agent.md).
335-
- Learn more about [On demand backup policy retention behavior](backup-windows-with-mars-agent.md#set-up-on-demand-backup-policy-retention-behavior).
335+
- Learn more about [On demand backup policy retention behavior](backup-windows-with-mars-agent.md#on-demand-backup-policy-retention-behavior).
336336
- For more frequently asked questions, see the [MARS agent FAQ](backup-azure-file-folder-backup-faq.yml).

articles/backup/backup-azure-restore-files-from-vm.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Recover files and folders from Azure VM backup
33
description: In this article, learn how to recover files and folders from an Azure virtual machine recovery point.
44
ms.topic: how-to
5-
ms.date: 10/16/2024
5+
ms.date: 06/18/2025
66
ms.custom: references_regions
77
ms.service: azure-backup
88
author: jyothisuri
@@ -141,6 +141,7 @@ If you run the script on a computer with restricted access, ensure there's acces
141141
- `https://pod01-rec2.GEO-NAME.backup.windowsazure.us` (For Azure US Government) or `AzureBackup` service tag in NSG
142142
- `https://pod01-rec2.GEO-NAME.backup.windowsazure.de` (For Azure Germany) or `AzureBackup` service tag in NSG
143143
- Public DNS resolution on port 53 (outbound)
144+
- The access requirement of the Microsoft Entra ID are `*.microsoft.com`, `*.windowsazure.com`, and `*.windows.net` on port 443 (outbound).
144145

145146
> [!NOTE]
146147
> Proxies may not support iSCSI protocol or give access to port 3260. Hence it is strongly recommended to run this script on machines which have direct access as required above and not on the machines which will redirect to proxy.

articles/backup/backup-windows-with-mars-agent.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,25 @@
22
title: Back up Windows machines by using the MARS agent
33
description: Use the Microsoft Azure Recovery Services (MARS) agent to back up Windows machines.
44
ms.topic: how-to
5-
ms.date: 08/18/2023
5+
ms.date: 06/18/2025
66
author: jyothisuri
77
ms.author: jsuri
88
ms.custom: engagement-fy23
99
---
1010

1111
# Back up Windows Server files and folders to Azure
1212

13-
This article describes how to back up Windows machines by using the [Azure Backup](backup-overview.md) service and the Microsoft Azure Recovery Services (MARS) agent. MARS is also known as the Azure Backup agent.
13+
This article describes how to back up Windows machines by using the [Azure Backup](backup-overview.md) service and the Microsoft Azure Recovery Services (MARS) agent or Azure Backup agent.
1414

15-
## Before you start
15+
## Prerequisites
1616

17-
* Learn how [Azure Backup uses the MARS agent to back up Windows machines](backup-architecture.md#architecture-direct-backup-of-on-premises-windows-server-machines-or-azure-vm-files-or-folders).
18-
* Learn about the [backup architecture](backup-architecture.md#architecture-back-up-to-dpmmabs) that runs the MARS agent on a secondary MABS or Data Protection Manager server.
19-
* Review [what's supported and what you can back up](backup-support-matrix-mars-agent.md) by the MARS agent.
17+
Before you back up Windows Server files and folders to Azure, review the following prerequisites:
18+
19+
* Understand how [Azure Backup uses the MARS agent to back up Windows machines](backup-architecture.md#architecture-direct-backup-of-on-premises-windows-server-machines-or-azure-vm-files-or-folders).
20+
* Review the [backup architecture](backup-architecture.md#architecture-back-up-to-dpmmabs) that runs the MARS agent on a secondary MABS or Data Protection Manager server.
21+
* Check the [supported backup scenarios](backup-support-matrix-mars-agent.md) by the MARS agent.
2022
* [Verify internet access](install-mars-agent.md#verify-internet-access) on the machines that you want to back up.
21-
* If the MARS agent isn't installed, learn how to install it [here](install-mars-agent.md).
23+
* [Install the MARS agent](install-mars-agent.md), if not done.
2224

2325
## Create a backup policy
2426

@@ -139,7 +141,7 @@ To run an on-demand backup, follow these steps:
139141

140142
After the initial backup finishes, the **Job completed** status appears in the Backup console.
141143

142-
## Set up on-demand backup policy retention behavior
144+
## On-demand backup policy retention behavior
143145

144146
The following table shows the data retention duration for various backup schedules:
145147

0 commit comments

Comments
 (0)