Skip to content

Commit 5694b0b

Browse files
authored
Merge pull request #288146 from MicrosoftDocs/main
10/9/2024 PM Publish
2 parents 4cc1b13 + 7900921 commit 5694b0b

14 files changed

+103
-182
lines changed

articles/app-service/app-service-plan-manage.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ You can create an empty App Service plan, or you can create a plan as part of ap
5050

5151
## Move an app to another App Service plan
5252

53-
You can move an app to another App Service plan, as long as the source plan and the target plan are in the _same resource group and geographical region and of the same OS type_. Any change in type, such as Windows to Linux or any type that's different from the originating type, isn't supported.
53+
You can move an app to another App Service plan, as long as the source plan and the target plan are in the _same resource group and geographical region and of the same OS type_. Any change in type, such as Windows to Linux or any type that's different from the originating type, isn't supported.
54+
55+
Any VNET integration configured on the app must be disabled prior to changing App Service plans.
5456

5557

5658
> [!NOTE]

articles/azure-netapp-files/azure-netapp-files-delegate-subnet.md

Lines changed: 5 additions & 5 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: how-to
8-
ms.date: 09/28/2023
8+
ms.date: 10/09/2024
99
ms.author: anfdocs
1010
---
1111
# Delegate a subnet to Azure NetApp Files
@@ -14,20 +14,20 @@ You must delegate a subnet to Azure NetApp Files. When you create a volume, you
1414

1515
## Considerations
1616

17-
* When creating the delegated subnet for Azure NetApp Files, the size of the subnet matters. A subnet with a /28 network mask provides (only) 11 usable IP addresses, which might be insufficient for certain use cases. In that case, you should plan for a larger delegated subnet. For instance, a subnet with a /26 network mask provides 59 and a /24 network mask provides 251 available IP addresses respectively. You should consider even larger subnets (for example, /23 network mask) in scenarios where application volume group for SAP HANA is used and where many volumes and storage endpoints are anticipated. The network mask of the delegated network can't be changed after the initial creation. Make sure to plan your VNet and delegated subnet sizes consciously.
17+
* When creating the delegated subnet for Azure NetApp Files, the size of the subnet matters. A subnet with a /28 network mask provides (only) 11 usable IP addresses, which might be insufficient for certain use cases. In that case, you should plan for a larger delegated subnet. For instance, a subnet with a /26 network mask provides 59 and a /24 network mask provides 251 available IP addresses respectively. You should consider even larger subnets (for example, /23 network mask) in scenarios where application volume group for SAP HANA is used and where many volumes and storage endpoints are anticipated. The network mask of the delegated network can't be changed after the initial creation. Make sure to plan your virtual network (VNet) and delegated subnet sizes consciously.
1818
* In each VNet, only one subnet can be delegated to Azure NetApp Files.
1919
Azure enables you to create multiple delegated subnets in a VNet. However, any attempts to create a new volume would fail if you use more than one delegated subnet.
2020
You can have only a single delegated subnet in a VNet. A NetApp account can deploy volumes into multiple VNets, each having its own delegated subnet.
21-
* You can't designate a network security group or service endpoint in the delegated subnet. Doing so causes the subnet delegation to fail.
21+
* If you're using Basic network features, you can't designate a network security group (NSG) or service endpoint in the delegated subnet. Doing so causes the subnet delegation to fail. To designate an NSG or service endpoint, [upgrade to Standard network features](configure-network-features.md).
2222
* Access to a volume from a globally peered virtual network isn't currently supported using Basic networks features. Global VNet peering is supported with Standard network features. For more information, see [Supported network topologies](azure-netapp-files-network-topologies.md#supported-network-topologies).
2323
* For Azure NetApp Files support of [User-defined routes](../virtual-network/virtual-networks-udr-overview.md#custom-routes) (UDRs) and Network security groups (NSGs), see [Constraints in Guidelines for Azure NetApp Files network planning](azure-netapp-files-network-topologies.md#constraints).
2424
To establish routing or access control ***to*** the Azure NetApp Files delegated subnet, you can apply UDRs and NSGs to other subnets, even within the same VNet as the subnet delegated to Azure NetApp Files.
2525

2626
## Steps
2727

28-
1. Go to the **Virtual networks** blade in the Azure portal and select the virtual network that you want to use for Azure NetApp Files.
28+
1. Navigate to **Virtual networks** in the Azure portal. Select the virtual network that you want to use for Azure NetApp Files.
2929

30-
1. Select **Subnets** from the Virtual network blade and click the **+Subnet** button.
30+
1. From Virtual network, select **Subnets** then the **+Subnet** button.
3131

3232
1. Create a new subnet to use for Azure NetApp Files by completing the following required fields in the Add Subnet page:
3333
* **Name**: Specify the subnet name.

articles/azure-netapp-files/cross-region-replication-introduction.md

Lines changed: 4 additions & 3 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: conceptual
8-
ms.date: 10/01/2024
8+
ms.date: 10/09/2024
99
ms.author: anfdocs
1010
ms.custom: references_regions
1111
---
@@ -48,13 +48,14 @@ Azure NetApp Files volume replication is supported between various [Azure region
4848
| Geography | Regional Pair A | Regional Pair B |
4949
|:--- |:--- |:--- |
5050
| Australia/Southeast Asia | Australia East | Southeast Asia |
51+
| Israel/Sweden | Israel Central | Sweden Central |
52+
| Qatar/Europe | Qatar Central | West Europe |
5153
| France/Europe | France Central | West Europe |
5254
| Germany/UK | Germany West Central | UK South |
5355
| Germany/Europe | Germany West Central | West Europe |
5456
| Germany/France | Germany West Central | France Central |
55-
| Spain/Sweden | Spain Central | Sweden Central |
5657
| Sweden/Germany | Sweden Central | Germany West Central |
57-
| Qatar/Europe | Qatar Central | West Europe |
58+
| Spain/Sweden | Spain Central | Sweden Central |
5859
| North America | East US | East US 2 |
5960
| North America | East US 2| West US 2 |
6061
| North America | East US 2 | West US 3 |

articles/azure-vmware/request-host-quota-azure-vmware-solution.md

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,17 @@ You need an Azure account in an Azure subscription that adheres to one of the fo
3838
> If the *Problem Type* is not is not visible from the short-list offered, select **None of the Above**. *AVS Quota requests* will be in the offered list of *Problem Types*.
3939
4040
1. In the **Description** of the support ticket, on the **Details** tab, provide information for:
41-
41+
4242
- Region Name
4343
- Number of hosts
4444
- Host SKU type
45-
- Any other details, including Availability Zone requirements for integrating with other Azure services; for example, Azure NetApp Files, Azure Blob Storage.
46-
47-
>[!NOTE]
45+
- Any other details, including Stretched Cluster, Availability Zone requirements for integrating with other Azure services; for example, Azure NetApp Files, Azure Blob Storage.
46+
47+
> [!NOTE]
4848
> - Azure VMware Solution requires a minimum of three hosts and recommends redundancy of N+1 hosts.
49-
> - **New** The unused quota expires after 30 days. A new request will need to be submitted for any additional quota.
50-
49+
> - Any unused quota expires after 30 days. A new request will need to be submitted for any additional quota.
50+
> - **NEW** If requesting quota to leverage Portable [VMware Cloud Foundation (VCF)](/azure/azure-vmware/vmware-cloud-foundations-license-portability) pricing, add the following statement as is, by replacing \<N\> with the Number of VCF cores you have purchased from Broadcom for license portability to Azure VMware Solution.
51+
***"I acknowledge that I have procured portable VCF license from Broadcom for \<N\> cores to use with Azure VMware Solution."***
5152
1. Select **Review + Create** to submit the request.
5253

5354

@@ -95,14 +96,16 @@ Access the Azure portal using the **Admin On Behalf Of (AOBO)** procedure from P
9596

9697
- Region Name
9798
- Number of hosts
99+
- Host SKU type
98100
- Any other details, including Availability Zone requirements for integrating with other Azure services; for example, Azure NetApp Files, Azure Blob Storage.
99101
- Is intended to host multiple customers?
100-
101-
>[!NOTE]
102+
103+
> [!NOTE]
102104
> - Azure VMware Solution requires a minimum of three hosts and recommends redundancy of N+1 hosts.
103-
> - **New** The unused quota expires after 30 days. A new request will need to be submitted for any additional quota.
104-
105-
1. Select **Review + Create** to submit the request.
105+
> - Any unused quota expires after 30 days. A new request will need to be submitted for any additional quota.
106+
> - **NEW** If requesting quota to leverage Portable [VMware Cloud Foundation (VCF)](/azure/azure-vmware/vmware-cloud-foundations-license-portability) pricing, add the following statement as is, by replacing \<N\> with the Number of VCF cores you have purchased from Broadcom for license portability to Azure VMware Solution.
107+
***"I acknowledge that I have procured portable VCF license from Broadcom for \<N\> cores to use with Azure VMware Solution."***
108+
1. Select **Review + Create** to submit the request.
106109

107110

108111
## Next steps

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

Lines changed: 18 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ This article describes how to restore backed-up Azure Kubernetes Service (AKS).
1616

1717
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.
1818

19-
>[!Note]
20-
>Vaulted backup and Cross Region Restore for AKS using Azure Backup are currently in preview.
19+
> [!NOTE]
20+
> Vaulted backup and Cross Region Restore for AKS using Azure Backup are currently in preview.
2121
2222
## Before you start
2323

@@ -33,97 +33,37 @@ For more information on the limitations and supported scenarios, see the [suppor
3333

3434
To restore the backed-up AKS cluster, follow these steps:
3535

36-
1. Go to **Backup center** and select **Restore**.
37-
38-
:::image type="content" source="./media/azure-kubernetes-service-cluster-restore/start-kubernetes-cluster-restore.png" alt-text="Screenshot shows how to start the restore process.":::
39-
40-
2. On the next page, select **Select backup instance**, and then select the *instance* that you want to restore.
41-
42-
If the instance is available in both *Primary* and *Secondary Region*, select the *region to restore* too, and then select **Continue**.
43-
44-
:::image type="content" source="./media/azure-kubernetes-service-cluster-restore/select-backup-instance-for-restore.png" alt-text="Screenshot shows selection of backup instance for restore.":::
45-
46-
:::image type="content" source="./media/azure-kubernetes-service-cluster-restore/choose-instances-for-restore.png" alt-text="Screenshot shows choosing instances for restore.":::
47-
48-
:::image type="content" source="./media/azure-kubernetes-service-cluster-restore/starting-kubernetes-restore.png" alt-text="Screenshot shows starting restore.":::
49-
50-
3. Click **Select restore point** to select the *restore point* you want to restore.
51-
52-
If the restore point is available in both Vault and Operation datastore, select the one you want to restore from.
53-
54-
:::image type="content" source="./media/azure-kubernetes-service-cluster-restore/select-restore-points-for-kubernetes.png" alt-text="Screenshot shows how to view the restore points.":::
55-
56-
:::image type="content" source="./media/azure-kubernetes-service-cluster-restore/choose-restore-points-for-kubernetes.png" alt-text="Screenshot shows selection of a restore point.":::
57-
58-
:::image type="content" source="./media/azure-kubernetes-service-cluster-restore/open-restore-page.png" alt-text="Screenshot shows how to go to the Restore page.":::
59-
60-
61-
4. In the **Restore parameters** section, click **Select Kubernetes Service** and select the *AKS cluster* to which you want to restore the backup to.
62-
63-
:::image type="content" source="./media/azure-kubernetes-service-cluster-restore/parameter-selection.png" alt-text="Screenshot shows how to initiate parameter selection.":::
64-
65-
:::image type="content" source="./media/azure-kubernetes-service-cluster-restore/select-kubernetes-service-parameter.png" alt-text="Screenshot shows selection of parameter Kubernetes Service.":::
66-
67-
:::image type="content" source="./media/azure-kubernetes-service-cluster-restore/set-for-restore-after-parameter-selection.png" alt-text="Screenshot shows the Restore page with the selection of Kubernetes parameter.":::
68-
69-
5. To select the *backed-up cluster resources* for restore, click **Select resources**.
70-
71-
Learn more about [restore configurations](#restore-configurations).
72-
73-
:::image type="content" source="./media/azure-kubernetes-service-cluster-restore/select-resources-to-restore-page.png" alt-text="Screenshot shows the Select Resources to restore page.":::
74-
75-
6. If you selected a recovery point for restore from *Vault-standard datastore*, then provide a *snapshot resource group* and *storage account* as the staging location.
76-
77-
:::image type="content" source="./media/azure-kubernetes-service-cluster-restore/restore-parameters.png" alt-text="Screenshot shows the parameters to add for restore from Vault-standard storage.":::
78-
79-
:::image type="content" source="./media/azure-kubernetes-service-cluster-restore/restore-parameter-storage.png" alt-text="Screenshot shows the storage parameter to add for restore from Vault-standard storage.":::
80-
81-
>[!Note]
82-
>Currently, resources created in the staging location can't belong within a Private Endpoint. Ensure that you enable _public access_ on the storage account provided as a staging location.
83-
84-
7. Select **Validate** to run validation on the cluster selections for restore.
85-
86-
:::image type="content" source="./media/azure-kubernetes-service-cluster-restore/validate-restore-parameters.png" alt-text="Screenshot shows the validation of restore parameters.":::
87-
88-
89-
8. Once the validation is successful, select **Review + restore** and restore the backups to the selected cluster.
90-
91-
:::image type="content" source="./media/azure-kubernetes-service-cluster-restore/review-restore-tab.png" alt-text="Screenshot shows the Review + restore tab for restore.":::
36+
1. In the Azure portal, navigate to your AKS cluster resource.
37+
1. From the service menu, under **Settings**, select **Backup** > **Restore**.
38+
1. On the *Start: Restore* page, select **Select backup instance**, select the *instance* that you want to restore, and then select **Select** > **Continue**.
39+
1. On the *Basics* tab of the *Restore* page, select the *Restore Region* you want to restore the backup to, and then select **Next: Restore point**.
40+
1. Select **Select restore point**, select the *restore point* you want to restore from, and then select **Select** > **Next: Restore parameters**.
41+
1. On the *Restore parameters* tab, ensure that the *AKS cluster* is selected as the *restore target*, and then select **Validate**.
42+
1. Once the validation completes, select **Next: Review + restore** > **Restore**.
9243

9344
### Restore configurations
9445

95-
As part of item-level restore capability of AKS backup, you can utilize multiple restore configuration filters to perform restore.
46+
As part of item-level restore capability of AKS backup, you can utilize multiple restore configuration filters to perform restore.
9647

97-
- Select the *Namespaces* that you want to restore from the list. The list shows only the backed-up Namespaces.
48+
- On the *Restore parameters* tab, next to *Restore configuration*, select **Select resources**, and select the *Namespaces* that you want to restore from the list. The list shows only the backed-up namespaces.
9849

9950
:::image type="content" source="./media/azure-kubernetes-service-cluster-restore/select-namespace.png" alt-text="Screenshot shows selection of Namespace.":::
10051

101-
You can also select the checkboxes if you want to restore cluster scoped resources and persistent volumes (of Azure Disk only).
102-
103-
To restore specific cluster resources, use the labels attached to them in the textbox. Only resources with the entered labels are backed up.
104-
10552
- You can provide *API Groups* and *Kinds* to restore specific resource types. The list of *API Group* and *Kind* is available in the *Appendix*. You can enter *multiple API Groups*.
53+
- To restore a workload, such as Deployment from a backup via API Group, the entry should be:
10654

107-
:::image type="content" source="./media/azure-kubernetes-service-cluster-restore/use-api-for-restore.png" alt-text="Screenshot shows the usage of API for restore.":::
108-
109-
- To restore a workload, such as Deployment from a backup via API Group, the entry should be:
110-
111-
- **Kind**: Select **Deployment**.
112-
- **Group**: Select **Group**.
113-
- **Namespace Mapping**: To migrate the backed-up cluster resources to a different *Namespace*, select the *backed-up Namespace*, and then enter the *Namespace* to which you want to migrate the resources.
114-
115-
If the *Namespace* doesn't exist in the AKS cluster, it gets created. If a conflict occurs during the cluster resources restore, you can skip or patch the conflicting resources.
116-
117-
:::image type="content" source="./media/azure-kubernetes-service-cluster-restore/select-backed-up-namespace-for-migrate.png" alt-text="Screenshot shows the selection of namespace for migration.":::
55+
- **Kind**: Select **Deployment**.
56+
- **Group**: Select **Group**.
57+
- **Namespace Mapping**: To migrate the backed-up cluster resources to a different *Namespace*, select the *backed-up Namespace*, and then enter the *Namespace* to which you want to migrate the resources.
11858

11959
Azure Backup for AKS currently supports the following two options when doing a restore operation when resource clash happens (backed-up resource has the same name as the resource in the target AKS cluster). You can choose one of these options when defining the restore configuration.
12060

12161
- **Skip**: This option is selected by default. For example, if you backed up a PVC named *pvc-azuredisk* and you're restoring it in a target cluster that has the PVC with the same name, then the backup extension skips restoring the backed-up persistent volume claim (PVC). In such scenarios, we recommend you to delete the resource from the cluster, and then do the restore operation.
12262

123-
- **Patch**: This option allows the patching mutable variable in the backed-up resource on the resource in the target cluster. If you want to update the number of replicas in the target cluster, you can opt for patching as an operation.
63+
- **Patch**: This option allows the patching mutable variable in the backed-up resource on the resource in the target cluster. If you want to update the number of replicas in the target cluster, you can opt for patching as an operation.
12464

125-
>[!Note]
126-
>AKS backup currently doesn't delete and recreate resources in the target cluster if they already exist. If you attempt to restore Persistent Volumess in the original location, delete the existing Persistent Volumes, and then do the restore operation.
65+
> [!NOTE]
66+
> AKS backup currently doesn't delete and recreate resources in the target cluster if they already exist. If you attempt to restore Persistent Volumes in the original location, delete the existing Persistent Volumes, and then do the restore operation.
12767
12868
## Restore in secondary region (preview)
12969

0 commit comments

Comments
 (0)