Skip to content

Commit f359148

Browse files
committed
Merge branch 'main' into release-aio-2507
2 parents cba65f7 + 47d7517 commit f359148

21 files changed

+140
-111
lines changed

articles/azure-netapp-files/snapshots-introduction.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: azure-netapp-files
55
author: b-hchen
66
ms.service: azure-netapp-files
77
ms.topic: concept-article
8-
ms.date: 01/28/2025
8+
ms.date: 07/17/2025
99
ms.author: anfdocs
1010
# Customer intent: As a data administrator, I want to create and manage snapshots in Azure NetApp Files, so that I can ensure efficient data protection, quick recovery options, and scalable storage management for my organization's critical data.
1111
---
@@ -104,7 +104,7 @@ The following diagram shows how snapshot data is transferred from the Azure NetA
104104

105105
The Azure NetApp Files backup functionality is designed to keep a longer history of backups as indicated in this simplified example. Notice how the backup repository on the right contains more and older snapshots than the protected volume and snapshots on the left.
106106

107-
Most use cases require that you keep online snapshots on the Azure NetApp Files volume for a relatively short amount of time (usually several months) to serve the most common recoveries of lost data due to application or user error. The Azure NetApp Files backup functionality is used to extend the data-protection period to a year or longer by sending the snapshots over to cost-efficient Azure storage. As indicated by the blue color in the diagram, the very first transfer is the baseline, which copies all consumed data blocks in the source Azure NetApp Files volume and snapshots. Consecutive backups use the snapshot mechanism to update the backup repository with only block-incremental updates.
107+
Most use cases require that you keep online snapshots on the Azure NetApp Files volume for a relatively short amount of time (usually several days, maybe weeks) to serve the most common recoveries of lost data due to application or user error. The Azure NetApp Files backup functionality is used to extend the data-protection period to a year or longer by sending the snapshots over to cost-efficient Azure storage. As indicated by the blue color in the diagram, the very first transfer is the baseline, which copies all consumed data blocks in the source Azure NetApp Files volume and snapshots. Consecutive backups use the snapshot mechanism to update the backup repository with only block-incremental updates.
108108

109109
## Ways to restore data from snapshots
110110

articles/azure-vmware/native-connect-on-premises.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Connectivity to on-premises is performed using a standard ExpressRoute connectio
3131
## Related topics
3232

3333
- [Connectivity to an Azure Virtual Network](native-network-connectivity.md)
34-
(native-internet-connectivity-design-considerations.md)
34+
- [Internet connectivity options](native-internet-connectivity-design-considerations.md)
3535
- [Connect multiple Gen 2 private clouds](native-connect-multiple-private-clouds.md)
3636
- [Connect Gen 2 private clouds and Gen 1 private clouds](native-connect-private-cloud-previous-edition.md)
3737
- [Public and Private DNS forward lookup zone configuration](native-dns-forward-lookup-zone.md)

articles/azure-vmware/native-internet-connectivity-design-considerations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Internet connectivity using Azure Firewall is similar to the way Azure virtual n
3030

3131
1. Have or create Azure Firewall or a third-party Network Virtual Appliance in the virtual network local to the private cloud or in the peered virtual network.
3232
2. Define an Azure route table with a 0.0.0.0/0 route pointing to the next-hop type Virtual Appliance with the next-hop IP address of the Azure Firewall private IP or IP of the Network Virtual Appliance.
33-
3. Associate the route table to the Azure VMware Solution specific virtual network subnets named “esx-lrnsxuplink” and “esx-lrnsxuplink-1”, which are part of the virtual network associated with private cloud.
33+
3. Associate the route table to the Azure VMware Solution specific virtual network subnets named “avs-nsx-gw-1” and “avs-nsx-gw-2”, which are part of the virtual network associated with private cloud.
3434
>[!Note]
3535
>The Azure route tables (UDR), associated with private cloud uplink subnets, and private cloud VNet need to be in the same Azure resource group.
3636
4. Have necessary firewall rules to allow traffic to and from the internet.

articles/azure-vmware/native-network-design-consideration.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ The following functionality is limited during this time. These limitations will
2929
- Virtual Network Service Endpoints direct connectivity from Azure VMware Solution workloads is not supported.
3030
- **vCloud Director** using Private Endpoints is supported. However, vCloud Director using Public Endpoints is not supported.
3131
- **vSAN Stretched Clusters** is not supported.
32-
- Public IP down to the VMware NSX Microsoft Edge for configuring internet will not be supported.
32+
- Public IP down to the VMware NSX Microsoft Edge for configuring internet will not be supported. You can find what internet options are supported in [Internet connectivity options](native-internet-connectivity-design-considerations.md)
3333
- Support for **AzCLI**, **PowerShell**, and **.NET SDK** are not available during Public Preview.
3434
- **Run commands** interacting with customer segments aren't supported, including Zerto, JetStream, and other 3rd-party integrations.
3535

@@ -64,11 +64,11 @@ Example /22 CIDR network address block **10.31.0.0/22** is divided into the foll
6464
| :-- | :-- | :-- | :-- |
6565
| VMware NSX Network | /27 | NSX Manager network. | 10.31.0.0/27 |
6666
| vCSA Network | /27 | vCenter Server network. | 10.31.0.32/27 |
67-
| esx-cust-fdc | /27 | The management appliances (vCenter Server and NSX manager) are behind the "esx-cust-fdc” subnet, programmed as secondary IP ranges on this subnet. | 10.31.0.64/27 |
68-
| cust-fds | /27 | Used by Azure VMware Solution Gen 2 to program routes created in VMware NSX into the virtual network. | 10.31.0.96/27 |
69-
| services | /27 | Used for Azure VMware Solution Gen 2 provider services. Also used to configure private DNS resolution for your private cloud. | 10.31.0.160/27 |
70-
| esx-lrnsxuplink, esx-lrnsxuplink-1 | /28 | Subnets off each of the T0 Gateways per edge. These subnets are used to program VMware NSX network segments as secondary IPs addresses. | 10.31.0.224/28, 10.31.0.240/28 |
71-
| esx-cust-vmk1 | /24 | vmk1 is the management interface used by customers to access the host. IPs from the vmk1 interface come from these subnets. All of the vmk1 traffic for all hosts comes from this subnet range. | 10.31.1.0/24 |
67+
| avs-mgmt| /27 | The management appliances (vCenter Server and NSX manager) are behind the "avs-mgmt” subnet, programmed as secondary IP ranges on this subnet. | 10.31.0.64/27 |
68+
| avs-vnet-sync| /27 | Used by Azure VMware Solution Gen 2 to program routes created in VMware NSX into the virtual network. | 10.31.0.96/27 |
69+
| avs-services | /27 | Used for Azure VMware Solution Gen 2 provider services. Also used to configure private DNS resolution for your private cloud. | 10.31.0.160/27 |
70+
|avs-nsx-gw-1, avs-nsx-gw-2| /28 | Subnets off each of the T0 Gateways per edge. These subnets are used to program VMware NSX network segments as secondary IPs addresses. | 10.31.0.224/28, 10.31.0.240/28 |
71+
| esx-mgmt-vmk1 | /24 | vmk1 is the management interface used by customers to access the host. IPs from the vmk1 interface come from these subnets. All of the vmk1 traffic for all hosts comes from this subnet range. | 10.31.1.0/24 |
7272
| esx-vmotion-vmk2 | /24 | vMotion VMkernel interfaces. | 10.31.2.0/24 |
7373
| esx-vsan-vmk3 | /24 | vSAN VMkernel interfaces and node communication. | 10.31.3.0/24 |
7474
| Reserved | /27 | Reserved Space. | 10.31.0.128/27 |

articles/backup/backup-architecture.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Architecture Overview
33
description: Provides an overview of the architecture, components, and processes used by the Azure Backup service.
44
ms.topic: overview
5-
ms.date: 04/14/2025
5+
ms.date: 07/17/2025
66
ms.service: azure-backup
77
author: jyothisuri
88
ms.author: jsuri
@@ -241,6 +241,9 @@ This robust approach ensures that even in a compromised environment, existing ba
241241
- [Back up Windows machines directly](tutorial-backup-windows-server-to-azure.md), without a backup server.
242242
- [Set up MABS](backup-azure-microsoft-azure-backup.md) for backup to Azure, and then back up workloads to MABS.
243243
- [Set up DPM](backup-azure-dpm-introduction.md) for backup to Azure, and then back up workloads to DPM.
244+
- [Back up a SharePoint farm on Azure Stack](backup-mabs-sharepoint-azure-stack.md).
245+
- [Back up SQL Server on Azure Stack](backup-mabs-sql-azure-stack.md).
246+
244247

245248
[green]: ./media/backup-architecture/green.png
246249
[yellow]: ./media/backup-architecture/yellow.png

articles/backup/backup-azure-dpm-azure-server-faq.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ metadata:
55
ms.reviewer: srinathv
66
ms.topic: faq
77
ms.service: azure-backup
8-
ms.date: 06/27/2025
9-
author: jyothisuri
10-
ms.author: jsuri
8+
ms.date: 07/17/2025
9+
author: AbhishekMallick-MS
10+
ms.author: v-mallicka
1111

1212
title: Azure Backup Server and DPM - FAQ
1313
summary: |
@@ -98,3 +98,8 @@ additionalContent: |
9898
9999
- [Learn more](backup-support-matrix-mabs-dpm.md) about Azure Backup Server and DPM support matrix.
100100
- [Learn more](backup-azure-mabs-troubleshoot.md) about the Azure Backup Server and DPM troubleshooting guidelines.
101+
102+
## Related content
103+
104+
- [Back up a SharePoint farm on Azure Stack](backup-mabs-sharepoint-azure-stack.md).
105+
- [Back up SQL Server on Azure Stack](backup-mabs-sql-azure-stack.md).

articles/backup/backup-mabs-protection-matrix.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: MABS (Azure Backup Server) V4 protection matrix
33
description: This article provides a support matrix listing all workloads, data types, and installations that Azure Backup Server v4 protects.
4-
ms.date: 07/15/2025
4+
ms.date: 07/17/2025
55
ms.topic: reference
66
ms.service: azure-backup
77
ms.custom: linux-related-content, engagement-fy24
@@ -156,4 +156,7 @@ MABS doesn't support protecting the following data types:
156156

157157
## Related content
158158

159-
[Run an unattended installation of MABS](backup-mabs-unattended-install.md).
159+
- [Run an unattended installation of MABS](backup-mabs-unattended-install.md).
160+
- [Back up a SharePoint farm on Azure Stack](backup-mabs-sharepoint-azure-stack.md).
161+
- [Back up SQL Server on Azure Stack](backup-mabs-sql-azure-stack.md).
162+
- [Azure Backup Server V3 RTM protection matrix](microsoft-azure-backup-server-protection-v3.md).

articles/backup/backup-support-matrix-mabs-dpm.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: MABS & System Center DPM support matrix
33
description: This article summarizes Azure Backup support when you use Microsoft Azure Backup Server (MABS) or System Center DPM to back up on-premises and Azure VM resources.
44
ms.service: azure-backup
5-
ms.date: 09/11/2024
5+
ms.date: 07/17/2025
66
ms.topic: reference
77
author: jyothisuri
88
ms.author: jsuri
@@ -222,3 +222,5 @@ Deduplication support for MABS depends on operating system support.
222222
- [Review](backup-support-matrix-mars-agent.md) what's supported for the MARS agent.
223223
- [Set up](backup-azure-microsoft-azure-backup.md) a MABS server.
224224
- [Set up DPM](/system-center/dpm/install-dpm).
225+
- [Back up a SharePoint farm on Azure Stack](backup-mabs-sharepoint-azure-stack.md).
226+
- [Back up SQL Server on Azure Stack](backup-mabs-sql-azure-stack.md).

articles/backup/microsoft-azure-backup-server-protection-v3-ur1.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: MABS (Azure Backup Server) V3 UR1 protection matrix
33
description: This article provides a support matrix listing all workloads, data types, and installations that Azure Backup Server protects.
4-
ms.date: 07/14/2025
4+
ms.date: 07/17/2025
55
ms.topic: reference
66
ms.custom: engagement-fy24, linux-related-content
77
ms.service: azure-backup
@@ -169,4 +169,4 @@ MABS doesn't support protecting the following data types:
169169

170170
- [Support matrix for backup with Microsoft Azure Backup Server or System Center DPM](backup-support-matrix-mabs-dpm.md).
171171
- [Manage telemetry settings in MABS](manage-telemetry.md).
172-
172+
- [Azure Backup Server V3 RTM protection matrix](microsoft-azure-backup-server-protection-v3.md).

articles/event-grid/event-schema-service-bus.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ This article provides the properties and schema for Service Bus events. For an
2121
| [Azure Service Bus to Event Grid integration](../service-bus-messaging/service-bus-to-event-grid-integration-concept.md) | Overview of integrating Service Bus with Event Grid. |
2222

2323
> [!NOTE]
24-
> When a failover occurs for a Service Bus namespace that's Geo-DR enabled, the secondary namespace doesn't emit events to Event Grid. You need to manually add the Event Grid subscription for the secondary namespace.
24+
> When a failover occurs for a Service Bus namespace that's Geo-DR enabled, the secondary namespace doesn't emit events to Event Grid. You need to manually add the Event Grid subscription for the secondary namespace.
25+
>
26+
> Check the [Service Bus Geo-Replication documentation](/azure/service-bus-messaging/service-bus-geo-replication) to understand what happens for a Service Bus namespace that's Geo-Replication enabled.
2527
2628
## Next steps
2729

0 commit comments

Comments
 (0)