Skip to content

Commit 2ff2abc

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into update-openai
2 parents 95f2f83 + 3e7b03d commit 2ff2abc

File tree

9 files changed

+160
-20
lines changed

9 files changed

+160
-20
lines changed

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,33 @@ services: azure-netapp-files
55
author: b-hchen
66
ms.service: azure-netapp-files
77
ms.topic: how-to
8-
ms.date: 03/16/2024
8+
ms.date: 08/30/2024
99
ms.author: anfdocs
1010
---
1111

1212
# Delete snapshots using Azure NetApp Files
1313

14-
You can delete snapshots that you no longer need to keep.
14+
You can delete snapshots that you no longer need.
1515

1616
> [!IMPORTANT]
17-
> The snapshot deletion operation cannot be undone. A deleted snapshot cannot be recovered.
17+
> You can't undo the snapshot deletion. You can't recover a deleted snapshot.
1818
1919
## Considerations
2020

21-
* You can't delete a snapshot if it is part of an active file-restore operation or if it is in the process of being cloned.
21+
* You can't delete a snapshot if it's part of an active file-restore operation or if it's in the process of being cloned.
2222
* You can't delete a replication generated snapshot that is used for volume baseline data replication.
2323

2424
## Steps
2525

26-
1. Go to the **Snapshots** menu of a volume. Right-click the snapshot you want to delete. Select **Delete**.
26+
1. Go to the **Snapshots** menu of a volume. Select the three dots at the end of the row of the snapshot want to delete. Select **Delete**.
2727

28-
![Screenshot that describes the right-click menu of a snapshot](./media/shared/snapshot-right-click-menu.png)
28+
![Screenshot illustrating the Snapshot overview menu.](./media/shared/snapshot-right-click-menu.png)
2929

30-
2. In the Delete Snapshot window, confirm that you want to delete the snapshot by clicking **Yes**.
30+
2. In the Delete Snapshot window, confirm that you want to delete the snapshot by selecting **Yes**.
3131

32-
![Screenshot that confirms snapshot deletion](./media/snapshots-delete/snapshot-confirm-delete.png)
32+
![Screenshot showing confirmed snapshot deletion.](./media/snapshots-delete/snapshot-confirm-delete.png)
3333

3434
## Next steps
3535

3636
* [Learn more about snapshots](snapshots-introduction.md)
37-
* [Azure NetApp Files Snapshot Overview](https://anfcommunity.com/2021/01/31/azure-netapp-files-snapshot-overview/)
37+
* [Azure NetApp Files snapshot overview](https://anfcommunity.com/2021/01/31/azure-netapp-files-snapshot-overview/)

articles/azure-netapp-files/whats-new.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,11 @@ Azure NetApp Files is updated regularly. This article provides a summary about t
4040

4141
* Availability zone volume placement enhancement - [**Populate existing volumes**](manage-availability-zone-volume-placement.md#populate-an-existing-volume-with-availability-zone-information) is now generally available (GA).
4242

43-
4443
* [Cross-zone replication](cross-zone-replication-introduction.md) is now generally available (GA).
4544

4645
Cross-zone replication allows you to replicate your Azure NetApp Files volumes asynchronously from one Azure availability zone (AZ) to another within the same region. Using technology similar to the cross-region replication feature and Azure NetApp Files availability zone volume placement feature, cross-zone replication replicates data in-region across different zones; only changed blocks are sent over the network in a compressed, efficient format. It helps you protect your data from unforeseeable zone failures without the need for host-based data replication. This feature minimizes the amount of data required to replicate across the zones, limiting data transfers required and shortens the replication time so you can achieve a smaller Restore Point Objective (RPO). Cross-zone replication doesn’t involve any network transfer costs and is highly cost-effective.
4746

48-
Cross-zone replication is available in all [AZ-enabled regions](../availability-zones/az-overview.md#azure-regions-with-availability-zones) with [Azure NetApp Files presence](https://azure.microsoft.com/explore/global-infrastructure/products-by-region/?products=netapp&regions=all&rar=true).
47+
Cross-zone replication is available in all [AZ-enabled regions](../reliability/availability-zones-service-support.md) with [Azure NetApp Files presence](https://azure.microsoft.com/explore/global-infrastructure/products-by-region/?products=netapp&regions=all&rar=true).
4948

5049
* [Transition a volume to customer-managed keys](configure-customer-managed-keys.md#transition) (Preview)
5150

@@ -278,7 +277,7 @@ Azure NetApp Files is updated regularly. This article provides a summary about t
278277

279278
This feature is now in public preview, currently available in [16 Azure regions](azure-netapp-files-network-topologies.md). It will roll out to other regions. Stay tuned for further information as more regions become available.
280279

281-
* [Azure Application Consistent Snapshot tool (AzAcSnap) 8 (GA)](azacsnap-introduction.md)
280+
* [Azure Application Consistent Snapshot tool (AzAcSnap) 8](azacsnap-introduction.md) is now generally available (GA)
282281

283282
Version 8 of the AzAcSnap tool is now generally available. [Azure Application Consistent Snapshot Tool](azacsnap-introduction.md) (AzAcSnap) is a command-line tool that enables you to simplify data protection for third-party databases in Linux environments. AzAcSnap 8 introduces the following new capabilities and improvements:
284283

@@ -293,7 +292,7 @@ Azure NetApp Files is updated regularly. This article provides a summary about t
293292

294293
* [Troubleshooting enhancement: break file locks](troubleshoot-file-locks.md)
295294

296-
In some cases you may encounter (stale) file locks on NFS, SMB, or dual-protocol volumes that need to be cleared. With this new Azure NetApp Files feature, you can now break these locks. You can break file locks for all files in a volume or break all file locks initiated by a specified client.
295+
You might sometimes encounter stale file locks on NFS, SMB, or dual-protocol volumes that need to be cleared. With this new Azure NetApp Files feature, you can now break these locks. You can break file locks for all files in a volume or break all file locks initiated by a specified client.
297296

298297
## April 2023
299298

@@ -500,7 +499,7 @@ Azure NetApp Files is updated regularly. This article provides a summary about t
500499

501500
* [Single-file snapshot restore](snapshots-restore-file-single.md) (Preview)
502501

503-
Azure NetApp Files provides ways to quickly restore data from snapshots (mainly at the volume level). See [How Azure NetApp Files snapshots work](snapshots-introduction.md). Options for user file self-restore are available via client-side data copy from the `~snapshot` (Windows) or `.snapshot` (Linux) folders. These operations require data (files and directories) to traverse the network twice (upon read and write). As such, the operations aren't time and resource efficient, especially with large data sets. If you don't want to restore the entire snapshot to a new volume, revert a volume, or copy large files across the network, you can use the single-file snapshot restore feature to restore individual files directly on the service from a volume snapshot without requiring data copy via an external client. This approach drastically reduces RTO and network resource usage when restoring large files.
502+
Azure NetApp Files provides ways to quickly restore data from snapshots (mainly at the volume level). See [How Azure NetApp Files snapshots work](snapshots-introduction.md). Options for user file self-restore are available via client-side data copy from the `~snapshot` (Windows) or `.snapshot` (Linux) folders. These operations require data (files and directories) to traverse the network twice (upon read and write). As such, the operations aren't time and resource efficient, especially with large data sets. If you don't want to restore the entire snapshot to a new volume, revert a volume, or copy large files across the network, you can use the single-file snapshot restore feature to restore individual files directly on the service from a volume snapshot without requiring data copy via an external client. This approach drastically reduces recovery time objective (RTO) and network resource usage when restoring large files.
504503

505504
* Features that are now generally available (GA)
506505

@@ -541,7 +540,7 @@ Azure NetApp Files is updated regularly. This article provides a summary about t
541540

542541
* [Azure NetApp Files backup](backup-introduction.md) (Preview)
543542

544-
Azure NetApp Files online snapshots now support backup of snapshots. With this new backup capability, you can vault your Azure NetApp Files snapshots to cost-efficient and ZRS-enabled Azure storage in a fast and cost-effective way. This approach further protects your data from accidental deletion.
543+
Azure NetApp Files online snapshots now support backup of snapshots. With this new backup capability, you can vault your Azure NetApp Files snapshots to cost-efficient and zone redundant Azure storage in a fast and cost-effective way. This approach further protects your data from accidental deletion.
545544

546545
Azure NetApp Files backup extends ONTAP's built-in snapshot technology. When snapshots are vaulted to Azure storage, only changed blocks relative to previously vaulted snapshots are copied and stored, in an efficient format. Vaulted snapshots are still represented in full. You can restore them to a new volume individually and directly, eliminating the need for an iterative, full-incremental recovery process. This advanced technology minimizes the amount of data required to store to and retrieve from Azure storage, therefore saving data transfer and storage costs. It also shortens the backup vaulting time, so you can achieve a smaller Restore Point Objective (RPO). You can keep a minimum number of snapshots online on the Azure NetApp Files service for the most immediate, near-instantaneous data-recovery needs. In doing so, you can build up a longer history of snapshots at a lower cost for long-term retention in the Azure NetApp Files backup vault.
547546

@@ -696,7 +695,7 @@ Azure NetApp Files is updated regularly. This article provides a summary about t
696695

697696
* [AES encryption for AD authentication](create-active-directory-connections.md#create-an-active-directory-connection) (Preview)
698697

699-
Azure NetApp Files now supports AES encryption on LDAP connection to DC to enable AES encryption for an SMB volume. This feature is currently in preview.
698+
Azure NetApp Files now supports AES encryption on LDAP connections to domain controllers (DC) to enable AES encryption for an SMB volume. This feature is currently in preview.
700699

701700
* New [metrics](azure-netapp-files-metrics.md):
702701

articles/azure-resource-manager/management/move-limitations/app-service-move-limitations.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ This article describes the steps to move App Service resources between resource
1212

1313
If you want to move App Services to a new region, see [Move an App Service resource to another region](../../../app-service/manage-move-across-regions.md).
1414

15+
You can move App Service resources to a new resource group or subscription but you need to delete and upload its TLS/SSL certificates to the new resource group or subscription. Also, you can't move a free App Service managed certificate. For that scenario, see [Move with free managed certificates](#move-with-free-managed-certificates).
16+
1517
## Move across subscriptions
1618

1719
When you move a Web App across subscriptions, the following guidance applies:
@@ -26,7 +28,6 @@ When you move a Web App across subscriptions, the following guidance applies:
2628
- App Service Environments can't be moved to a new resource group or subscription.
2729
- You can move a Web App and App Service plan hosted on an App Service Environment to a new subscription without moving the App Service Environment. The Web App and App Service plan that you move will always be associated with your initial App Service Environment. You can't move a Web App/App Service plan to a different App Service Environment.
2830
- If you need to move a Web App and App Service plan to a new App Service Environment, you'll need to recreate these resources in your new App Service Environment. Consider using the [backup and restore feature](../../../app-service/manage-backup.md) as way of recreating your resources in a different App Service Environment.
29-
- You can move a certificate bound to a web without deleting the TLS bindings, as long as the certificate is moved with all other resources in the resource group. However, you can't move a free App Service managed certificate. For that scenario, see [Move with free managed certificates](#move-with-free-managed-certificates).
3031
- App Service apps with private endpoints cannot be moved. Delete the private endpoint(s) and recreate it after the move.
3132
- App Service apps with virtual network integration cannot be moved. Remove the virtual network integration and reconnect it after the move.
3233
- App Service resources can only be moved from the resource group in which they were originally created. If an App Service resource is no longer in its original resource group, move it back to its original resource group. Then, move the resource across subscriptions. For help with finding the original resource group, see the next section.

articles/load-balancer/load-balancer-nat-pool-migration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ $slb | Set-AzLoadBalancer
139139

140140
## Migration with automation script for Virtual Machine Scale Set
141141

142-
142+
The migration process will reuse existing backend pools with membership matching the NAT Pools to be migrated; if no matching backend pool is found, the script will exit (without making changes). Alternatively, use the `-backendPoolReuseStrategy` parameter to either always create new backend pools (`NoReuse`) or create a new backend pool if a matching one doesn't exist (`OptionalFirstMatch`). Backend pools and NAT Rule associations can be updated post migration to match your preference.
143143
### Prerequisites
144144

145145
Before beginning the migration process, ensure the following prerequisites are met:

articles/migrate/migrate-support-matrix-physical.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ For Linux servers, based on the features you want to perform, you can create a u
8787
Operating system | Versions
8888
--- | ---
8989
Red Hat Enterprise Linux | 5.1, 5.3, 5.11, 6.x, 7.x, 8.x, 9.x
90-
Ubuntu | 12.04, 14.04, 16.04, 18.04, 20.04
90+
Ubuntu | 12.04, 14.04, 16.04, 18.04, 20.04, 22.04
9191
Oracle Linux | 6.1, 6.7, 6.8, 6.9, 7.2, 7.3, 7.4, 7.5, 7.6, 7.7, 7.8, 7.9, 8, 8.1, 8.3, 8.5
9292
SUSE Linux | 10, 11 SP4, 12 SP1, 12 SP2, 12 SP3, 12 SP4, 15 SP2, 15 SP3
9393
Debian | 7, 8, 9, 10, 11

articles/migrate/vmware/migrate-support-matrix-vmware.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ Support | Details
334334
--- | ---
335335
Supported servers | You can enable agentless dependency analysis on up to 1,000 servers (across multiple vCenter Servers) discovered per appliance.
336336
Windows servers | Windows Server 2022 <br/> Windows Server 2019<br /> Windows Server 2016<br /> Windows Server 2012 R2<br /> Windows Server 2012<br /> Windows Server 2008 R2 (64-bit)<br /> Windows Server 2008 (32-bit)
337-
Linux servers | Red Hat Enterprise Linux 5.1, 5.3, 5.11, 6.x, 7.x, 8.x <br /> Ubuntu 12.04, 14.04, 16.04, 18.04, 20.04 <br /> OracleLinux 6.1, 6.7, 6.8, 6.9, 7.2, 7.3, 7.4, 7.5, 7.6, 7.7, 7.8, 7.9, 8, 8.1, 8.3, 8.5 <br /> SUSE Linux 10, 11 SP4, 12 SP1, 12 SP2, 12 SP3, 12 SP4, 15 SP2, 15 SP3 <br /> Debian 7, 8, 9, 10, 11
337+
Linux servers | Red Hat Enterprise Linux 5.1, 5.3, 5.11, 6.x, 7.x, 8.x <br /> Ubuntu 12.04, 14.04, 16.04, 18.04, 20.04, 22.04 <br /> OracleLinux 6.1, 6.7, 6.8, 6.9, 7.2, 7.3, 7.4, 7.5, 7.6, 7.7, 7.8, 7.9, 8, 8.1, 8.3, 8.5 <br /> SUSE Linux 10, 11 SP4, 12 SP1, 12 SP2, 12 SP3, 12 SP4, 15 SP2, 15 SP3 <br /> Debian 7, 8, 9, 10, 11
338338
Server requirements | VMware Tools (10.2.1 and later) must be installed and running on servers you want to analyze.<br /><br /> Servers must have PowerShell version 2.0 or later installed.<br /><br /> WMI should be enabled and available on Windows servers.
339339
vCenter Server account | The read-only account used by Azure Migrate and Modernize for assessment must have privileges for guest operations on VMware VMs.
340340
Windows server access | A user account (local or domain) with administrator permissions on servers.

articles/operator-service-manager/TOC.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@
3535
items:
3636
- name: Get Started with Safe Upgrade Practices
3737
href: safe-upgrade-practices.md
38+
- name: Control rollback behavior on upgrade failure
39+
40+
href: safe-upgrades-nf-level-rollback.md
3841
- name: Quickstarts
3942
expanded: false
4043
items:

articles/operator-service-manager/index.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,18 @@ landingContent:
8181
- text: Troubleshoot common CLI Issues
8282
url: troubleshoot-cli-common-issues.md
8383

84+
# Card
85+
- title: Safe Upgrade Practices
86+
linkLists:
87+
- linkListType: overview
88+
links:
89+
- text: Get started with safe upgrades
90+
url: safe-upgrade-practices.md
91+
- linkListType: concept
92+
links:
93+
- text: Control rollback behavior on upgrade failure
94+
url: safe-upgrades-nf-level-rollback.md
95+
8496
# Card
8597
- title: Additional Resources
8698
linkLists:

0 commit comments

Comments
 (0)