Skip to content

Commit ab7dad6

Browse files
authored
Merge pull request #286821 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 7d83169 + 4f0af9e commit ab7dad6

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

articles/logic-apps/logic-apps-pricing.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,9 @@ In single-tenant Azure Logic Apps, a logic app and its workflows follow the [**S
8282
When you create or deploy logic apps with the **Logic App (Standard)** resource type, and you select any Azure region for deployment, you'll also select a Workflow Standard hosting plan. However, if you select an existing **App Service Environment v3** resource for your deployment location, you must then select an [App Service Plan](../app-service/overview-hosting-plans.md).
8383

8484
> [!IMPORTANT]
85-
> The following plans and resources are no longer available or supported with the public release of the **Logic App (Standard)** resource type in Azure regions:
86-
> Functions Premium plan, App Service Environment v1, and App Service Environment v2. Except with ASEv3, the App Service Plan is unavailable and unsupported.
85+
> The following plans and resources are no longer available or supported with the public release of Standard
86+
> logic app workflows in single-tenant Azure Logic Apps: Functions Premium plan, App Service Environment v1,
87+
> and App Service Environment v2. The App Service Plan is available and supported only with App Service Environment v3 (ASE v3).
8788
8889
The following table summarizes how the Standard model handles metering and billing for the following components when used with a logic app and a workflow in single-tenant Azure Logic Apps:
8990

articles/migrate/common-questions-server-migration.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ While you can create assessments for multiple regions in an Azure Migrate projec
6363

6464
Yes, you can migrate to multiple subscriptions (same Azure tenant) in the same target region for an Azure Migrate project. You can select the target subscription while enabling replication for a machine or a set of machines. The target region is locked post first replication for agentless VMware migrations and during the replication appliance and Hyper-V provider installation for agent-based migrations and agentless Hyper-V migrations respectively.
6565

66+
### Does Azure Migrate support Azure Resource Graph?
67+
Currently, Azure Migrate isn't integrated with Azure Resource Graph. It does support performing ARG-related queries.
68+
6669
### How is the data transmitted from on-premises environment to Azure? Is it encrypted before transmission?
6770

6871
The Azure Migrate appliance in the agentless replication case compresses data and encrypts before uploading. Data is transmitted over a secure communication channel over https and uses TLS 1.2 or later. Additionally, Azure Storage automatically encrypts your data when it's persisted it to the cloud (encryption-at-rest).
@@ -142,15 +145,15 @@ The Migration and modernization tool is application agnostic and works for most
142145

143146
### Can I upgrade my OS while migrating?
144147

145-
The Migration and modernization tool only supports like-for-like migrations currently. The tool doesn’t support upgrading the OS version during migration. The migrated machine will have the same OS as the source machine.
148+
The Migration and modernization tool now supports Windows OS upgrade during Migration. For Linux this option is currently not available. More details on [Windows OS upgrade](how-to-upgrade-windows.md).
146149

147150
### Do I need VMware vCenter to migrate VMware VMs?
148151

149152
To [migrate VMware VMs](server-migrate-overview.md) using VMware agent-based or agentless migration, ESXi hosts on which VMs are located must be managed by vCenter Server. If you don't have vCenter Server, you can migrate VMware VMs by migrating them as physical servers. [Learn more](migrate-support-matrix-physical-migration.md).
150153

151154
### Can I consolidate multiple source VMs into one VM while migrating?
152155

153-
Migration and modernization capabilities support like-for-like migrations currently. We don't support consolidating servers or upgrading the operating system as part of the migration.
156+
Migration and modernization capabilities support like-for-like migrations currently. We don't support consolidating servers as part of the migration.
154157

155158
### Will Windows Server 2008 and 2008 R2 be supported in Azure after migration?
156159

articles/virtual-network/create-peering-different-deployment-models-subscriptions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ The steps to create a virtual network peering are different, depending on whethe
2424
|[Both Resource Manager](create-peering-different-subscriptions.md) |Different|
2525
|[One Resource Manager, one classic](create-peering-different-deployment-models.md) |Same|
2626

27-
A virtual network peering cannot be created between two virtual networks deployed through the classic deployment model. This tutorial uses virtual networks that exist in the same region. This tutorial peers virtual networks in the same region. You can also peer virtual networks in different [supported regions](virtual-network-manage-peering.md#cross-region). It's recommended that you familiarize yourself with the [peering requirements and constraints](virtual-network-manage-peering.md#requirements-and-constraints) before peering virtual networks.
27+
A virtual network peering cannot be created between two virtual networks deployed through the classic deployment model. This tutorial peers virtual networks in the same region. You can also peer virtual networks in different [supported regions](virtual-network-manage-peering.md#cross-region). It's recommended that you familiarize yourself with the [peering requirements and constraints](virtual-network-manage-peering.md#requirements-and-constraints) before peering virtual networks.
2828

29-
When creating a virtual network peering between virtual networks that exist in different subscriptions, the subscriptions can associated to the same Microsoft Entra tenant. If you don't already have a Microsoft Entra tenant, you can quickly [create one](../active-directory/develop/quickstart-create-new-tenant.md?toc=%2fazure%2fvirtual-network%2ftoc.json#create-a-new-azure-ad-tenant).
29+
When creating a virtual network peering between virtual networks that exist in different subscriptions, the subscriptions can be associated to the same Microsoft Entra tenant. If you don't already have a Microsoft Entra tenant, you can quickly [create one](../active-directory/develop/quickstart-create-new-tenant.md?toc=%2fazure%2fvirtual-network%2ftoc.json#create-a-new-azure-ad-tenant).
3030

3131
You can use the [Azure portal](#portal), the [Azure CLI](#cli), or [Azure PowerShell](#powershell) to create a virtual network peering. Click any of the previous tool links to go directly to the steps for creating a virtual network peering using your tool of choice.
3232

0 commit comments

Comments
 (0)