Skip to content

Commit c6e916f

Browse files
Merge pull request #313594 from MicrosoftDocs/main
Auto Publish – main to live - 2026-03-24 11:00 UTC
2 parents 454c79d + c34f7a8 commit c6e916f

6 files changed

Lines changed: 23 additions & 22 deletions

articles/app-service/samples-terraform.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,20 @@ ms.custom: devx-track-terraform
66

77
ms.assetid: 1e5ecfa8-4ab1-47d3-ab23-97abf723516d
88
ms.topic: sample
9-
ms.date: 06/25/2024
9+
ms.date: 03/16/2026
1010
author: ericgre
1111
ms.author: ericg
1212
ms.service: azure-app-service
1313
---
14+
1415
# Terraform samples for Azure App Service
1516

1617
The following table includes links to Terraform scripts.
1718

1819
| Script | Description |
1920
|-|-|
2021
|**Create app**||
21-
| [Create two apps and connect securely with Private Endpoint and VNet integration](./scripts/terraform-secure-backend-frontend.md)| Creates two App Service apps and connect apps together with Private Endpoint and VNet integration. |
22+
| [Create two apps and connect them securely with Private Endpoint and VNet integration](./scripts/terraform-secure-backend-frontend.md)| Creates two App Service apps and connects the apps together with Private Endpoint and virtual network integration. |
2223
| [Provision App Service and use slot swap to deploy](/azure/developer/terraform/provision-infrastructure-using-azure-deployment-slots)| Provision App Service infrastructure with Azure deployment slots. |
2324
| [Create an Azure Windows web app with a backup](./scripts/terraform-backup.md)| Create an Azure Windows web app with a backup schedule. |
2425
| [Create a Windows container app on App Service](/azure/app-service/provision-resource-terraform?tabs=windows-container)| Create an Azure Windows web app with a backup schedule. |

articles/app-service/scripts/powershell-deploy-private-endpoint.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
title: 'PowerShell: Deploy Private Endpoint for Web App with PowerShell'
3-
description: Learn how to use PowerShell to deploy Private Endpoint for your Web App.
3+
description: Use this sample PowerShell script to deploy Private Endpoint for your Web App.
44
author: ericgre
55
ms.assetid: e1cc08d5-91cf-49d7-8d0a-c0e7bd2046ac
66
ms.topic: sample
7-
ms.date: 12/06/2022
7+
ms.date: 03/16/2026
88
ms.author: ericg
99
ms.service: azure-app-service
1010
ms.custom: devx-track-azurepowershell

articles/app-service/scripts/template-deploy-private-endpoint.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
title: 'Use an Azure Resource Manager template to deploy a private endpoint for a web app'
3-
description: Learn how to use ARM template to deploy a private endpoint for your web app.
3+
description: Learn how to use an ARM template to deploy a private endpoint for your web app.
44
author: ericgre
55
ms.assetid: 49e460d0-7759-4ceb-b5a4-f1357e4fde56
66
ms.topic: sample
7-
ms.date: 07/08/2020
7+
ms.date: 03/16/2026
88
ms.author: ericg
99
ms.service: azure-app-service
1010
ms.custom: devx-track-arm-template
@@ -32,14 +32,14 @@ This template creates a private endpoint for an Azure web app.
3232

3333
Here's how to deploy the Azure Resource Manager template to Azure:
3434

35-
1. To sign in to Azure and open the template, select this link: [Deploy to Azure](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2Fquickstarts%2Fmicrosoft.web%2Fprivate-endpoint-webapp%2Fazuredeploy.json). The template creates the virtual network, the web app, the private endpoint, and the private DNS zone.
36-
2. Select or create your resource group.
37-
3. Enter the name of your web app, Azure App Service plan, and private endpoint.
38-
5. Read the statement about terms and conditions. If you agree, select **I agree to the terms and conditions stated above** > **Purchase**. The deployment can take several minutes to finish.
35+
1. To sign in to Azure and open the template, select this link: [Deploy to Azure](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2Fquickstarts%2Fmicrosoft.web%2Fprivate-endpoint-webapp%2Fazuredeploy.json). The template creates the virtual network, the web app, the private endpoint, and the private DNS zone.
36+
1. Select or create your resource group.
37+
1. Enter the name of your web app, Azure App Service plan, and private endpoint.
38+
1. Read the statement about terms and conditions. If you agree, select **I agree to the terms and conditions stated above** > **Purchase**. The deployment can take several minutes to finish.
3939

4040
## Clean up resources
4141

42-
When you no longer need the resources that you created with the private endpoint, delete the resource group. This removes the private endpoint and all the related resources.
42+
When you no longer need the resources that you created with the private endpoint, delete the resource group. By removing the resource group, you remove the private endpoint and all the related resources.
4343

4444
To delete the resource group, call the `Remove-AzResourceGroup` cmdlet:
4545

articles/data-factory/automatic-connector-upgrade.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.topic: concept-article
99
ms.custom:
1010
- references_regions
1111
- build-2025
12-
ms.date: 01/08/2026
12+
ms.date: 03/24/2026
1313
---
1414

1515
# Automatic connector upgrade
@@ -73,7 +73,7 @@ You can find more details from the table below on the connector list that is pla
7373
| [Greenplum](connector-greenplum.md) | If your pipeline runs on self-hosted integration runtime, it requires SHIR version 5.56 or above. |
7474
| [Hive](connector-hive.md) | Scenario that doesn't rely on below capability in Hive (version 1.0):<br><br>• Use Username authentication type.<br>• Thrift transport protocol:<br>&nbsp;&nbsp;• HiveServer1<br>• Service discovery mode: True<br>• Use native query: True <br><br>If your pipeline runs on self-hosted integration runtime, it requires SHIR version 5.59 or above.|
7575
| [Impala](connector-impala.md) | Scenario that doesn't rely on below capability in Impala (version 1.0):<br><br>• Use SASL Username authentication type.<br><br>If your pipeline runs on self-hosted integration runtime, it requires SHIR version 5.59 or above. |
76-
| [Jira](connector-jira.md) | Scenario that doesn't rely on below capability in Jira (version 1.0):<br><br>• Use `useEncryptedEndpoints`, `useHostVerification` and `usePeerVerification` as connection properties. <br>• Use `query`. <br><br>The following Jira tables are supported for automatic upgrade:<br>&nbsp;&nbsp;Platform.Api_Groups_Picker, Platform.Api_Issue_Type, Platform.Api_Project, Platform.Api_Field, Platform.Api_Status, Platform.Api_Status_Category, Platform.Api_Project_Type, Platform.Api_Resolution, Platform.Api_Priority, Platform.ApiAllUsers, Platform.Api_Issue_Link_Type, Platform.Api_Role, Platform.Api_Project_Versions, Platform.Api_Component, Platform.Api_Project_IssueTypes, Agile.Agile_Board_Epic, Agile.Agile_Board, Agile.Agile_Board_Sprint, Agile.Agile_Board_Issue, Agile.Agile_Board_Epic_Issue. <br><br>If your pipeline runs on self-hosted integration runtime, it requires SHIR version 5.63 or above. |
76+
| [Jira](connector-jira.md) | Scenario that doesn't rely on below capability in Jira (version 1.0):<br><br>• Use `useEncryptedEndpoints`, `useHostVerification` and `usePeerVerification` as connection properties. <br>• Use `query`. <br><br>The following Jira tables are supported for automatic upgrade:<br>&nbsp;&nbsp;Platform.Api_Groups_Picker, Platform.Api_Issue_Type, Platform.Api_Project, Platform.Api_Field, Platform.Api_Status, Platform.Api_Status_Category, Platform.Api_Project_Type, Platform.Api_Resolution, Platform.Api_Priority, Platform.ApiAllUsers, Platform.Api_Issue_Link_Type, Platform.Api_Role, Platform.Api_Project_Versions, Platform.Api_Component, Platform.Api_Project_IssueTypes, Platform.Api_Issue, Agile.Agile_Board_Epic, Agile.Agile_Board, Agile.Agile_Board_Sprint, Agile.Column_Config_Columns, Agile.Agile_Board_Issue_Fields_Components, Agile.Agile_Board_Issue_Fields_Closed_Sprints, Agile.AgileBoardProjects. <br><br>If your pipeline runs on self-hosted integration runtime, it requires SHIR version 5.64 or above. |
7777
| [MariaDB](connector-mariadb.md) | If your pipeline runs on self-hosted integration runtime, it requires SHIR version 5.58 or above. |
7878
| [MySQL](connector-mysql.md) | If your pipeline runs on self-hosted integration runtime, it requires SHIR version 5.58 or above. |
7979
| [Netezza](connector-netezza.md) | If your pipeline runs on self-hosted integration runtime, it requires SHIR version 5.59 or above. |

articles/hdinsight/hdinsight-component-retirements-and-action-required.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ HDInsight bundles open-source components and HDInsight platform into a package t
4444
|-|-|-|-|
4545
|[Basic and Standard A-series VMs Retirement](https://azure.microsoft.com/updates/basic-and-standard-aseries-vms-on-hdinsight-will-retire-on-31-august-2024/) |August 31, 2024 |[Av1-series retirement - Azure Virtual Machines](/azure/virtual-machines/sizes/migration-guides/av1-series-retirement) |Y|
4646
|[Azure Monitor experience (preview)](https://azure.microsoft.com/updates/v2/hdinsight-azure-monitor-experience-retirement/) | February 01, 2025 |[Azure Monitor Agent (AMA) migration guide for Azure HDInsight clusters](./azure-monitor-agent.md) |Y|
47-
| Dv2-series VM unavailability in Azure HDInsight | March 31, 2026 | Migrate existing HDInsight clusters to newer VM series such as [Eadsv5-series](/azure/virtual-machines/eav5-eadsv5-series) or [Easv4-series](/azure/virtual-machines/easv4-series). |Y|
47+
| Dv2-series VM unavailability in Azure HDInsight | March 31, 2026 | Migrate existing HDInsight clusters to newer VM series such as [Eadsv5-series](/azure/virtual-machines/sizes/memory-optimized/eadsv5-series) or [Easv4-series](/azure/virtual-machines/sizes/memory-optimized/easv4-series). |Y|
4848
|[Enterprise Security Package](https://azure.microsoft.com/updates?id=497263) | July 31, 2026 | Migrate to alternative Azure offerings such as Microsoft Fabric |N/A|
4949

5050

articles/migrate/tutorial-migrate-vmware.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.custom: vmware-scenario-422, mvc, engagement-fy23
1414

1515
# Migrate VMware VMs to Azure (agentless)
1616

17-
This article shows you how to migrate on-premises VMware or Azure VMware Solution VMs to Azure, using the [Migration and modernization](migrate-services-overview.md) tool, with agentless migration. You can also migrate VMware VMs using agent-based migration. [Compare](server-migrate-overview.md) the methods.
17+
This article shows you how to migrate on-premises VMware or Azure VMware Solution (AVS) VMs to Azure, using the [Migration and modernization](migrate-services-overview.md) tool, with agentless migration. You can also migrate VMware VMs using agent-based migration. [Compare](server-migrate-overview.md) the methods.
1818

1919
This tutorial is the third in a series that demonstrates how to assess and migrate VMware VMs to Azure.
2020

@@ -150,7 +150,7 @@ Enable replication as follows:
150150
Replication occurs as follows: <br /><br />
151151
- When the Start Replication job finishes successfully, the machines begin their initial replication to Azure. <br /><br />
152152
- During initial replication, a VM snapshot is created. Disk data from the snapshot is replicated to replica managed disks in Azure. <br /><br />
153-
- After initial replication finishes, delta replication begins. Incremental changes to on-premises disks are periodically replicated to the replica disks in Azure. <br /><br />
153+
- After initial replication finishes, delta replication begins. Incremental changes to the source disks are periodically replicated to the replica disks in Azure. <br /><br />
154154

155155
3. Use PowerShell to view **Time Remaining** across **all stages of server migration** in Azure Migrate. This helps you monitor replication progress and plan cutover accurately. You can use PowerShell, Windows PowerShell, or Cloud Shell on Azure portal.
156156
4. Open the **Azure portal**, then select the **Cloud Shell** at the top. Select **PowerShell** when prompted.
@@ -219,7 +219,7 @@ Get-AzMigrateServerMigrationStatus -ProjectName "<your-project-name>" -Resou
219219

220220
When delta replication begins, you can run a test migration for the VMs, before running a full migration to Azure. We highly recommend that you do this at least once for each machine, before you migrate it.
221221

222-
- Running a test migration checks that migration works as expected, without impacting the on-premises machines, which remain operational, and continue replicating.
222+
- Running a test migration checks that migration works as expected, without impacting the source (on-premises or AVS) machines, which remain operational, and continue replicating.
223223
- Test migration simulates the migration by creating an Azure VM using replicated data (usually migrating to a non-production VNet in your Azure subscription).
224224
- You can use the replicated test Azure VM to validate the migration, perform app testing, and address any issues before full migration.
225225

@@ -251,15 +251,15 @@ Do a test migration as follows:
251251
252252
## Migrate VMs
253253

254-
After you've verified that the test migration works as expected, you can migrate the on-premises machines.
254+
After you've verified that the test migration works as expected, you can migrate the source (on-premises or AVS) machines.
255255

256256
1. In the Azure Migrate project > **Servers, databases and web apps** > **Migration and modernization**, select numerical value next to **Azure VM**.
257257

258258
![Replicating servers](./media/tutorial-migrate-vmware/replicate-servers.png)
259259

260260
2. In **Replicating machines**, right-click the VM > **Migrate**.
261261
3. In **Migrate** > **Shut down virtual machines and perform a planned migration with no data loss**, select **Yes** > **OK**.
262-
- By default Azure Migrate shuts down the on-premises VM, and runs an on-demand replication to synchronize any VM changes that occurred since the last replication occurred. This ensures no data loss.
262+
- By default Azure Migrate shuts down the source (on-premises or AVS) VM, and runs an on-demand replication to synchronize any VM changes that occurred since the last replication occurred. This ensures no data loss.
263263
- If you don't want to shut down the VM, select **No**
264264
4. You have an option to upgrade the Windows Server OS during migration. To upgrade, select the **Upgrade available** option. In the pane that appears, select the target OS version that you want to upgrade to and select **Apply**. [Learn more](./how-to-upgrade-windows.md).
265265
5. If you already have a capacity reservation for the VM SKU in the target subscription and location, specify it here for this deployment. Capacity reservations ensure that the required VM SKU is available when you start migration. The capacity reservation for the SKU can be in any resource group within the target subscription and location. [Learn more](/azure/virtual-machines/capacity-reservation-create).
@@ -268,14 +268,14 @@ After you've verified that the test migration works as expected, you can migrate
268268

269269
## Complete the migration
270270

271-
1. After the migration is done, right-click the VM > **Complete migration**. This stops replication for the on-premises machine, and cleans up replication state information for the VM.
271+
1. After the migration is done, right-click the VM > **Complete migration**. This stops replication for the source (on-premises or AVS) machine, and cleans up replication state information for the VM.
272272
1. We automatically install the VM agent for Windows VMs and Linux during migration.
273273
1. Verify and [troubleshoot any Windows activation issues on the Azure VM.](/troubleshoot/azure/virtual-machines/troubleshoot-activation-problems)
274274
1. Perform any post-migration app tweaks, such as updating host names, database connection strings, and web server configurations.
275275
1. Perform final application and migration acceptance testing on the migrated application now running in Azure.
276276
1. Cut over traffic to the migrated Azure VM instance.
277-
1. Remove the on-premises VMs from your local VM inventory.
278-
1. Remove the on-premises VMs from local backups.
277+
1. Remove the source (on-premises or AVS) VMs from your local VM inventory.
278+
1. Remove the source (on-premises or AVS) VMs from local backups.
279279
1. Update any internal documentation to show the new location and IP address of the Azure VMs.
280280

281281
## Post-migration best practices

0 commit comments

Comments
 (0)