Skip to content

Commit 0707be1

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into patricka-uuf-quickstart
2 parents 4f98641 + 1872967 commit 0707be1

File tree

75 files changed

+788
-386
lines changed

Some content is hidden

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

75 files changed

+788
-386
lines changed

articles/app-service/environment/how-to-migrate.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,20 @@ ASE_ID=$(az appservice ase show --name $ASE_NAME --resource-group $ASE_RG --quer
5454

5555
## 2. Validate that migration is supported
5656

57-
The following command checks whether your App Service Environment is supported for migration. If you receive an error or if your App Service Environment is in an unhealthy or suspended state, you can't migrate at this time. See the [troubleshooting](migrate.md#troubleshooting) section for descriptions of the potential error messages that you can get. If your environment [isn't supported for migration using the in-place migration feature](migrate.md#supported-scenarios) or you want to migrate to App Service Environment v3 without using the in-place migration feature, see the [manual migration options](migration-alternatives.md). This command also validates that your App Service Environment is on the supported build version for migration. If your App Service Environment isn't on the supported build version, an upgrade automatically starts. For more information on the premigration upgrade, see [Validate that migration is supported using the in-place migration feature for your App Service Environment](migrate.md#validate-that-migration-is-supported-using-the-in-place-migration-feature-for-your-app-service-environment).
57+
The following command checks whether your App Service Environment is supported for migration. If you receive an error or if your App Service Environment is in an unhealthy or suspended state, you can't migrate at this time. See the [troubleshooting](migrate.md#troubleshooting) section for descriptions of the potential error messages that you can get. If your environment [isn't supported for migration using the in-place migration feature](migrate.md#supported-scenarios) or you want to migrate to App Service Environment v3 without using the in-place migration feature, see the [manual migration options](migration-alternatives.md). This command also validates that your App Service Environment is on the supported build version for migration. If your App Service Environment isn't on the supported build version, you need to start the upgrade yourself. For more information on the premigration upgrade, see [Validate that migration is supported using the in-place migration feature for your App Service Environment](migrate.md#validate-that-migration-is-supported-using-the-in-place-migration-feature-for-your-app-service-environment).
5858

5959
```azurecli
6060
az rest --method post --uri "${ASE_ID}/migrate?api-version=2021-02-01&phase=validation"
6161
```
6262

6363
If there are no errors, your migration is supported, and you can continue to the next step.
6464

65+
If you need to start an upgrade to upgrade your App Service Environment to the supported build version, run the following command. Only run this command if you fail the validation step and you're instructed to upgrade your App Service Environment.
66+
67+
```azurecli
68+
az rest --method post --uri "${ASE_ID}/migrate?api-version=2021-02-01&phase=PreMigrationUpgrade"
69+
```
70+
6571
## 3. Generate IP addresses for your new App Service Environment v3 resource
6672

6773
Run the following command to create new IP addresses. This step takes about 15 minutes to complete. Don't scale or make changes to your existing App Service Environment during this time.
@@ -237,6 +243,8 @@ If your App Service Environment isn't supported for migration at this time or yo
237243

238244
:::image type="content" source="./media/migration/migration-not-supported.png" alt-text="Screenshot that shows an example portal message that says the migration feature doesn't support the App Service Environment.":::
239245

246+
If you need to start an upgrade to upgrade your App Service Environment to the supported build version, you're prompted to start the upgrade. Select **Upgrade** to start the upgrade. When the upgrade completes, you pass validation and can use the migration feature to start your migration.
247+
240248
If migration is supported for your App Service Environment, proceed to the next step in the process. The **Migration** page guides you through the series of steps to complete the migration.
241249

242250
:::image type="content" source="./media/migration/migration-ux-pre.png" alt-text="Screenshot that shows a sample migration page with unfinished steps in the process.":::

articles/app-service/environment/how-to-side-by-side-migrate.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,20 @@ ASE_ID=$(az appservice ase show --name $ASE_NAME --resource-group $ASE_RG --quer
6262

6363
## 3. Validate migration is supported
6464

65-
The following command checks whether your App Service Environment is supported for migration. If you receive an error or if your App Service Environment is in an unhealthy or suspended state, you can't migrate at this time. See the [troubleshooting](side-by-side-migrate.md#troubleshooting) section for descriptions of the potential error messages that you can get. If your environment [isn't supported for migration using the side-by-side migration feature](side-by-side-migrate.md#supported-scenarios) or you want to migrate to App Service Environment v3 without using the side-by-side migration feature, see the [manual migration options](migration-alternatives.md). This command also validates that your App Service Environment is on the supported build version for migration. If your App Service Environment isn't on the supported build version, an upgrade automatically starts. For more information on the premigration upgrade, see [Validate that migration is supported using the side-by-side migration feature for your App Service Environment](side-by-side-migrate.md#validate-that-migration-is-supported-using-the-side-by-side-migration-feature-for-your-app-service-environment).
65+
The following command checks whether your App Service Environment is supported for migration. If you receive an error or if your App Service Environment is in an unhealthy or suspended state, you can't migrate at this time. See the [troubleshooting](side-by-side-migrate.md#troubleshooting) section for descriptions of the potential error messages that you can get. If your environment [isn't supported for migration using the side-by-side migration feature](side-by-side-migrate.md#supported-scenarios) or you want to migrate to App Service Environment v3 without using the side-by-side migration feature, see the [manual migration options](migration-alternatives.md). This command also validates that your App Service Environment is on the supported build version for migration. If your App Service Environment isn't on the supported build version, you need to start the upgrade yourself. For more information on the premigration upgrade, see [Validate that migration is supported using the side-by-side migration feature for your App Service Environment](side-by-side-migrate.md#validate-that-migration-is-supported-using-the-side-by-side-migration-feature-for-your-app-service-environment).
6666

6767
```azurecli
6868
az rest --method post --uri "${ASE_ID}/NoDowntimeMigrate?phase=Validation&api-version=2022-03-01"
6969
```
7070

7171
If there are no errors, your migration is supported, and you can continue to the next step.
7272

73+
If you need to start an upgrade to upgrade your App Service Environment to the supported build version, run the following command. Only run this command if you fail the validation step and you're instructed to upgrade your App Service Environment.
74+
75+
```azurecli
76+
az rest --method post --uri "${ASE_ID}/NoDowntimeMigrate?phase=PreMigrationUpgrade&api-version=2022-03-01"
77+
```
78+
7379
## 4. Generate outbound IP addresses for your new App Service Environment v3
7480

7581
Create a file called *zoneredundancy.json* with the following details for your region and zone redundancy selection.

articles/app-service/environment/migrate.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Migrate to App Service Environment v3 by using the in-place migration fea
33
description: Overview of the in-place migration feature for migration to App Service Environment v3.
44
author: seligj95
55
ms.topic: article
6-
ms.date: 03/26/2024
6+
ms.date: 03/27/2024
77
ms.author: jordanselig
88
ms.custom: references_regions
99
---
@@ -101,7 +101,7 @@ In-place migration consists of a series of steps that must be followed in order.
101101

102102
The platform validates that your App Service Environment can be migrated using the in-place migration feature. If your App Service Environment doesn't pass all validation checks, you can't migrate at this time using the in-place migration feature. See the [troubleshooting](#troubleshooting) section for details of the possible causes of validation failure. If your environment is in an unhealthy or suspended state, you can't migrate until you make the needed updates. If you can't migrate using the in-place migration feature, see the [manual migration options](migration-alternatives.md).
103103

104-
The validation also checks if your App Service Environment is on the minimum build required for migration. The minimum build is updated periodically to ensure the latest bug fixes and improvements are available. If your App Service Environment isn't on the minimum build, an upgrade is automatically started. Your App Service Environment won't be impacted, but you won't be able to scale or make changes to your App Service Environment while the upgrade is in progress. You won't be able to migrate until the upgrade finishes. Upgrades can take 8-12 hours to complete or longer depending on the size of your environment. If you plan a specific time window for your migration, you should run the validation check 24-48 hours before your planned migration time to ensure you have time for an upgrade if one is needed.
104+
The validation also checks if your App Service Environment is on the minimum build required for migration. The minimum build is updated periodically to ensure the latest bug fixes and improvements are available. If your App Service Environment isn't on the minimum build, you need to start the upgrade yourself. This upgrade is a standard process where your App Service Environment isn't impacted, but you can't scale or make changes to your App Service Environment while the upgrade is in progress. You can't migrate until the upgrade finishes. Upgrades can take 8-12 hours to complete or longer depending on the size of your environment. If you plan a specific time window for your migration, you should run the validation check 24-48 hours before your planned migration time to ensure you have time for an upgrade if one is needed.
105105

106106
### Generate IP addresses for your new App Service Environment v3
107107

articles/app-service/environment/side-by-side-migrate.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Migrate to App Service Environment v3 by using the side-by-side migration
33
description: Overview of the side-by-side migration feature for migration to App Service Environment v3.
44
author: seligj95
55
ms.topic: article
6-
ms.date: 3/26/2024
6+
ms.date: 3/27/2024
77
ms.author: jordanselig
88
ms.custom: references_regions
99
---
@@ -120,7 +120,7 @@ Side-by-side migration consists of a series of steps that must be followed in or
120120

121121
The platform validates that your App Service Environment can be migrated using the side-by-side migration feature. If your App Service Environment doesn't pass all validation checks, you can't migrate at this time using the side-by-side migration feature. See the [troubleshooting](#troubleshooting) section for details of the possible causes of validation failure. If your environment is in an unhealthy or suspended state, you can't migrate until you make the needed updates. If you can't migrate using the side-by-side migration feature, see the [manual migration options](migration-alternatives.md).
122122

123-
The validation also checks if your App Service Environment is on the minimum build required for migration. The minimum build is updated periodically to ensure the latest bug fixes and improvements are available. If your App Service Environment isn't on the minimum build, an upgrade is automatically started. Your App Service Environment won't be impacted, but you won't be able to scale or make changes to your App Service Environment while the upgrade is in progress. You won't be able to migrate until the upgrade finishes. Upgrades can take 8-12 hours to complete or longer depending on the size of your environment. If you plan a specific time window for your migration, you should run the validation check 24-48 hours before your planned migration time to ensure you have time for an upgrade if one is needed.
123+
The validation also checks if your App Service Environment is on the minimum build required for migration. The minimum build is updated periodically to ensure the latest bug fixes and improvements are available. If your App Service Environment isn't on the minimum build, you need to start the upgrade yourself. This upgrade is a standard process where your App Service Environment isn't impacted, but you can't scale or make changes to your App Service Environment while the upgrade is in progress. You can't migrate until the upgrade finishes. Upgrades can take 8-12 hours to complete or longer depending on the size of your environment. If you plan a specific time window for your migration, you should run the validation check 24-48 hours before your planned migration time to ensure you have time for an upgrade if one is needed.
124124

125125
### Select and prepare the subnet for your new App Service Environment v3
126126

articles/azure-arc/data/includes/azure-arc-data-preview-release.md

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,16 @@ ms.topic: include
88
ms.date: 03/12/2024
99
---
1010

11+
<!---
1112
At this time, a test or preview build is not available for the next release.
13+
-->
1214

13-
<!---
14-
March, 2024 preview release is now available.
15+
April, 2024 test release is now available.
1516

1617
|Component|Value|
1718
|-----------|-----------|
1819
|Container images registry/repository |`mcr.microsoft.com/arcdata/preview`|
19-
|Container images tag |`v1.28.0_2024-03-12`|
20+
|Container images tag |`v1.29.0_2024-04-09`|
2021
|**CRD names and version:**| |
2122
|`activedirectoryconnectors.arcdata.microsoft.com`| v1beta1, v1beta2, v1, v2|
2223
|`datacontrollers.arcdata.microsoft.com`| v1beta1, v1 through v5|
@@ -33,18 +34,13 @@ March, 2024 preview release is now available.
3334
|`telemetrycollectors.arcdata.microsoft.com`| v1beta1 through v1beta5|
3435
|`telemetryrouters.arcdata.microsoft.com`| v1beta1 through v1beta5|
3536
|Azure Resource Manager (ARM) API version|2023-11-01-preview|
36-
|`arcdata` Azure CLI extension version|1.5.12 ([Download](https://aka.ms/az-cli-arcdata-ext))|
37-
|Arc-enabled Kubernetes helm chart extension version|1.28.0|
37+
|`arcdata` Azure CLI extension version|1.5.13 ([Download](https://aka.ms/az-cli-arcdata-ext))|
38+
|Arc-enabled Kubernetes helm chart extension version|1.29.0|
3839
|Azure Arc Extension for Azure Data Studio<br/>`arc`<br/>`azcli`|<br/>1.8.0 ([Download](https://aka.ms/ads-arcdata-ext))</br>1.8.0 ([Download](https://aka.ms/ads-azcli-ext))|
39-
|SQL Database version | 964 |
40+
|SQL Database version | 968 |
4041

4142
### Release notes
4243

43-
#### Arc-enabled SQL Server
44-
Arc SQL Server | Backups | Configure backups at DB level for Arc enabled SQL Server in Portal and CLI | Public Preview
44+
Arc SQL Server | Support for moving Arc-enabled SQL Server instances and child resources (DBs, AGs) across different subscriptions & resource groups | Public Preview
4545

46-
Arc SQL Server | Set feature flags via the Azure CLI | GA
47-
48-
Arc SQL Server | Billing | Support unlimited virtualization benefit for PAYG and Software Assurance customers | GA
49-
50-
-->
46+
Arc SQL Server | Allow the database inventory feature for all license types | GA

articles/azure-netapp-files/use-availability-zones.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.topic: conceptual
88
ms.date: 11/17/2022
99
ms.author: anfdocs
1010
---
11-
# Use availability zones for high availability in Azure NetApp Files (preview)
11+
# Use availability zones for high availability in Azure NetApp Files
1212

1313
Azure [availability zones](../availability-zones/az-overview.md#availability-zones) are physically separate locations within each supporting Azure region that are tolerant to local failures. Failures can range from software and hardware failures to events such as earthquakes, floods, and fires. Tolerance to failures is achieved because of redundancy and logical isolation of Azure services. To ensure resiliency, a minimum of three separate availability zones are present in all [availability zone-enabled regions](../availability-zones/az-overview.md#azure-regions-with-availability-zones).
1414

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

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

1717
## March 2024
1818

19+
* [Availability zone volume placement](manage-availability-zone-volume-placement.md) is now generally available (GA).
20+
21+
You can deploy new volumes in the logical availability zone of your choice to create cross-zone volumes to improve resiliency in case of zonal failures. This feature is available in all availability zone-enabled regions with Azure NetApp Files presence.
22+
23+
The [populate existing volume](manage-availability-zone-volume-placement.md#populate-an-existing-volume-with-availability-zone-information) feature is still in preview.
24+
1925
* [Capacity pool enhancement](azure-netapp-files-set-up-capacity-pool.md): The 1 TiB capacity pool feature is now generally available (GA).
2026

2127
The 1 TiB lower limit for capacity pools using Standard network features is now generally available (GA). You still must register the feature.

articles/container-registry/tasks-agent-pools.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ Task agent pools require access to the following Azure services. The following f
104104
> [!NOTE]
105105
> If your tasks require additional resources from the public internet, add the corresponding rules. For example, additional rules are needed to run a docker build task that pulls the base images from Docker Hub, or restores a NuGet package.
106106
107+
Customers basing their deployments with MCR can refer to [MCR/MAR firewall rules.](https://github.com/microsoft/containerregistry/blob/main/docs/client-firewall-rules.md)
108+
107109
### Create pool in VNet
108110

109111
The following example creates an agent pool in the *mysubnet* subnet of network *myvnet*:

0 commit comments

Comments
 (0)