Skip to content

Commit 4cb803a

Browse files
committed
fixed merge
2 parents 3df47d0 + 3a0060d commit 4cb803a

File tree

8 files changed

+63
-59
lines changed

8 files changed

+63
-59
lines changed

articles/application-gateway/configuration-infrastructure.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,11 @@ Depending on whether you're creating new resources or using existing ones, add t
8383

8484
|Resource | Resource status | Required Azure permissions |
8585
|---|---|---|
86-
| Subnet | Create new| Microsoft.Network/virtualNetworks/subnets/write<br>Microsoft.Network/virtualNetworks/subnets/join/action |
87-
| Subnet | Use existing| Microsoft.Network/virtualNetworks/subnets/read<br>Microsoft.Network/virtualNetworks/subnets/join/action |
88-
| IP addresses| Create new| Microsoft.Network/publicIPAddresses/write<br>Microsoft.Network/publicIPAddresses/join/action |
89-
| IP addresses | Use existing| Microsoft.Network/publicIPAddresses/read<br>Microsoft.Network/publicIPAddresses/join/action |
90-
| ApplicationGatewayWebApplicationFirewallPolicies | Create new / Update existing | Microsoft.Network/ApplicationGatewayWebApplicationFirewallPolicies/write
91-
Microsoft.Network/ApplicationGatewayWebApplicationFirewallPolicies/read
92-
Microsoft.Network/ApplicationGatewayWebApplicationFirewallPolicies/join/action |
86+
| Subnet | Create new| `Microsoft.Network/virtualNetworks/subnets/write' <br> 'Microsoft.Network/virtualNetworks/subnets/join/action` |
87+
| Subnet | Use existing| `Microsoft.Network/virtualNetworks/subnets/read` <br> `Microsoft.Network/virtualNetworks/subnets/join/action` |
88+
| IP addresses| Create new| `Microsoft.Network/publicIPAddresses/write` <br> `Microsoft.Network/publicIPAddresses/join/action` |
89+
| IP addresses | Use existing| `Microsoft.Network/publicIPAddresses/read` <br> `Microsoft.Network/publicIPAddresses/join/action` |
90+
| ApplicationGatewayWebApplicationFirewallPolicies | Create new / Update existing | `Microsoft.Network/ApplicationGatewayWebApplicationFirewallPolicies/write` <br> `Microsoft.Network/ApplicationGatewayWebApplicationFirewallPolicies/read` <br> `Microsoft.Network/ApplicationGatewayWebApplicationFirewallPolicies/join/action` |
9391

9492
For more information, see [Azure permissions for Networking](../role-based-access-control/permissions/networking.md) and [Virtual network permissions](../virtual-network/virtual-network-manage-subnet.md#permissions).
9593
## Roles scope

articles/azure-vmware/includes/hosts-minimum-initial-deployment-statement.md

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -21,47 +21,47 @@ The Azure VMware Solution management and control plane have the following resour
2121

2222
| **Area** | **Description** | **Provisioned vCPUs** | **Provisioned vRAM (GB)** | **Provisioned vDisk (GB)** | **Typical CPU Usage (GHz)** | **Typical vRAM Usage (GB)** | **Typical Raw vSAN Datastore Usage (GB)** |
2323
| :-- | :-- | :-- | :-- | :-- | :-- | :-- | :-- |
24-
| VMware vSphere | vCenter Server | 8 | 28 | 915 | 1.1 | 3.9 | 1,854 |
25-
| VMware vSphere | vSphere Cluster Service VM 1 | 1 | 0.1 | 2 | 0.1 | 0.1 | 5 |
26-
| VMware vSphere | vSphere Cluster Service VM 2 | 1 | 0.1 | 2 | 0.1 | 0.1 | 5 |
27-
| VMware vSphere | vSphere Cluster Service VM 3 | 1 | 0.1 | 2 | 0.1 | 0.1 | 5 |
28-
| VMware vSphere | ESXi node 1 | N/A | N/A | N/A | 5.1 | 0.2 | N/A |
29-
| VMware vSphere | ESXi node 2 | N/A | N/A | N/A | 5.1 | 0.2 | N/A |
30-
| VMware vSphere | ESXi node 3 | N/A | N/A | N/A | 5.1 | 0.2 | N/A |
31-
| VMware vSAN | vSAN System Usage | N/A | N/A | N/A | N/A | N/A | 5,458 |
32-
| VMware NSX | NSX Unified Appliance Node 1 | 12 | 48 | 300 | 2.5 | 13.5 | 613 |
33-
| VMware NSX | NSX Unified Appliance Node 2 | 12 | 48 | 300 | 2.5 | 13.5 | 613 |
34-
| VMware NSX | NSX Unified Appliance Node 3 | 12 | 48 | 300 | 2.5 | 13.5 | 613 |
35-
| VMware NSX | NSX Edge VM 1 | 8 | 32 | 200 | 1.3 | 0.6 | 409 |
36-
| VMware NSX | NSX Edge VM 2 | 8 | 32 | 200 | 1.3 | 0.6 | 409 |
37-
| VMware HCX (Optional Add-On) | HCX Manager | 4 | 12 | 65 | 1 | 2.5 | 140 |
38-
| VMware Site Recovery Manager (Optional Add-On) | SRM Appliance | 4 | 12 | 33 | 1 | 1 | 79 |
39-
| VMware vSphere (Optional Add-On) | vSphere Replication Manager Appliance | 4 | 8 | 33 | 1 | 0.6 | 75 |
40-
| VMware vSphere (Optional Add-On) | vSphere Replication Server Appliance | 2 | 1 | 33 | 1 | 0.3 | 68 |
41-
| | Total | 77 vCPUs | 269.3 GB | 2,385 GB | 30 GHz | 50.4 GB | 10,346 GB (9,032 GB with expected 1.2x Data Reduction ratio) |
42-
43-
The Azure VMware Solution management and control plane have the following resource requirements that need to be accounted for during solution sizing of a **stretched clusters private cloud**. VMware SRM isn't included in the table since it currently isn't supported.
24+
| VMware vSphere | vCenter Server | 8 | 30 | 915 | 1.5 | 3.3 | 1,830 |
25+
| VMware vSphere | vSphere Cluster Service VM 1 | 1 | 0.1 | 2 | 0.1 | 0.1 | 1 |
26+
| VMware vSphere | vSphere Cluster Service VM 2 | 1 | 0.1 | 2 | 0.1 | 0.1 | 1 |
27+
| VMware vSphere | vSphere Cluster Service VM 3 | 1 | 0.1 | 2 | 0.1 | 0.1 | 1 |
28+
| VMware vSphere | ESXi node 1 | N/A | N/A | N/A | 2.4 | 48 | N/A |
29+
| VMware vSphere | ESXi node 2 | N/A | N/A | N/A | 2.4 | 48 | N/A |
30+
| VMware vSphere | ESXi node 3 | N/A | N/A | N/A | 2.4 | 48 | N/A |
31+
| VMware vSAN | vSAN System Usage | N/A | N/A | N/A | N/A | N/A | 12,441 |
32+
| VMware NSX | NSX Unified Appliance Node 1 | 6 | 24 | 300 | 3.4 | 13.9 | 613 |
33+
| VMware NSX | NSX Unified Appliance Node 2 | 6 | 24 | 300 | 3.4 | 13.9 | 613 |
34+
| VMware NSX | NSX Unified Appliance Node 3 | 6 | 24 | 300 | 3.4 | 13.9 | 613 |
35+
| VMware NSX | NSX Edge VM 1 | 8 | 32 | 196 | 1.4 | 0.7 | 401 |
36+
| VMware NSX | NSX Edge VM 2 | 8 | 32 | 196 | 1.4 | 0.7 | 401 |
37+
| VMware HCX (Optional Add-On) | HCX Manager | 4 | 12 | 64 | 0.4 | 2.8 | 174 |
38+
| VMware Site Recovery Manager (Optional Add-On) | SRM Appliance | 4 | 12 | 33 | 1 | 1 | 66 |
39+
| VMware vSphere (Optional Add-On) | vSphere Replication Manager Appliance | 4 | 12 | 33 | 1 | 3.1 | 66 |
40+
| VMware vSphere (Optional Add-On) | vSphere Replication Server Appliance | 2 | 1 | 33 | 1 | 0.8 | 66 |
41+
| | Total | 59 vCPUs | 203.3 GB | 2,376 GB | 25.4 GHz | 198.3 GB | 17,287 GB (15,401 GB with Data Reduction ratio) |
42+
43+
The Azure VMware Solution management and control plane have the following resource requirements that need to be accounted for during solution sizing of a **stretched clusters private cloud**. VMware SRM isn't included in the table since it currently isn't supported. The vSAN Witness appliance is not included in the table either, because it is managed by Microsoft in the third Availability Zone.
4444

4545
| **Area** | **Description** | **Provisioned vCPUs** | **Provisioned vRAM (GB)** | **Provisioned vDisk (GB)** | **Typical CPU Usage (GHz)** | **Typical vRAM Usage (GB)** | **Typical Raw vSAN Datastore Usage (GB)** |
4646
| :-- | :-- | :-- | :-- | :-- | :-- | :-- | :-- |
47-
| VMware vSphere | vCenter Server | 8 | 28 | 915 | 1.1 | 3.9 | 3,708 |
48-
| VMware vSphere | vSphere Cluster Service VM 1 | 1 | 0.1 | 2 | 0.1 | 0.1 | 5 |
49-
| VMware vSphere | vSphere Cluster Service VM 2 | 1 | 0.1 | 2 | 0.1 | 0.1 | 5 |
50-
| VMware vSphere | vSphere Cluster Service VM 3 | 1 | 0.1 | 2 | 0.1 | 0.1 | 5 |
51-
| VMware vSphere | ESXi node 1 | N/A | N/A | N/A | 5.1 | 0.2 | N/A |
52-
| VMware vSphere | ESXi node 2 | N/A | N/A | N/A | 5.1 | 0.2 | N/A |
53-
| VMware vSphere | ESXi node 3 | N/A | N/A | N/A | 5.1 | 0.2 | N/A |
54-
| VMware vSphere | ESXi node 4 | N/A | N/A | N/A | 5.1 | 0.2 | N/A |
55-
| VMware vSphere | ESXi node 5 | N/A | N/A | N/A | 5.1 | 0.2 | N/A |
56-
| VMware vSphere | ESXi node 6 | N/A | N/A | N/A | 5.1 | 0.2 | N/A |
57-
| VMware vSAN | vSAN System Usage | N/A | N/A | N/A | N/A | N/A | 10,722 |
58-
| VMware NSX | NSX Unified Appliance Node 1 | 12 | 48 | 300 | 2.5 | 13.5 | 1,229 |
59-
| VMware NSX | NSX Unified Appliance Node 2 | 12 | 48 | 300 | 2.5 | 13.5 | 1,229 |
60-
| VMware NSX | NSX Unified Appliance Node 3 | 12 | 48 | 300 | 2.5 | 13.5 | 1,229 |
61-
| VMware NSX | NSX Edge VM 1 | 8 | 32 | 200 | 1.3 | 0.6 | 817 |
62-
| VMware NSX | NSX Edge VM 2 | 8 | 32 | 200 | 1.3 | 0.6 | 817 |
63-
| VMware HCX (Optional Add-On) | HCX Manager | 4 | 12 | 65 | 1 | 2.5 | 270 |
64-
| | Total | 67 vCPUs | 248.3 GB | 2,286 GB | 42.3 GHz | 49.1 GB | 20,036 GB (17,173 GB with expected 1.2x Data Reduction ratio) |
47+
| VMware vSphere | vCenter Server | 8 | 30 | 915 | 1.1 | 3.9 | 3,662 |
48+
| VMware vSphere | vSphere Cluster Service VM 1 | 1 | 0.1 | 2 | 0.1 | 0.1 | 1 |
49+
| VMware vSphere | vSphere Cluster Service VM 2 | 1 | 0.1 | 2 | 0.1 | 0.1 | 1 |
50+
| VMware vSphere | vSphere Cluster Service VM 3 | 1 | 0.1 | 2 | 0.1 | 0.1 | 1 |
51+
| VMware vSphere | ESXi node 1 | N/A | N/A | N/A | 2.4 | 48 | N/A |
52+
| VMware vSphere | ESXi node 2 | N/A | N/A | N/A | 2.4 | 48 | N/A |
53+
| VMware vSphere | ESXi node 3 | N/A | N/A | N/A | 2.4 | 48 | N/A |
54+
| VMware vSphere | ESXi node 4 | N/A | N/A | N/A | 2.4 | 48 | N/A |
55+
| VMware vSphere | ESXi node 5 | N/A | N/A | N/A | 2.4 | 48 | N/A |
56+
| VMware vSphere | ESXi node 6 | N/A | N/A | N/A | 2.4 | 48 | N/A |
57+
| VMware vSAN | vSAN System Usage | N/A | N/A | N/A | N/A | N/A | 11,223 |
58+
| VMware NSX | NSX Unified Appliance Node 1 | 6 | 24 | 300 | 3.4 | 13.9 | 1,229 |
59+
| VMware NSX | NSX Unified Appliance Node 2 | 6 | 24 | 300 | 3.4 | 13.9 | 1,229 |
60+
| VMware NSX | NSX Unified Appliance Node 3 | 6 | 24 | 300 | 3.4 | 13.9 | 1,229 |
61+
| VMware NSX | NSX Edge VM 1 | 8 | 32 | 196 | 1.4 | 0.7 | 800 |
62+
| VMware NSX | NSX Edge VM 2 | 8 | 32 | 196 | 1.4 | 0.7 | 800 |
63+
| VMware HCX (Optional Add-On) | HCX Manager | 4 | 12 | 64 | 0.4 | 2.8 | 256 |
64+
| | Total | 49 vCPUs | 178.4 GB | 2,277 GB | 29.9 GHz | 338.1 GB | 20,430 GB (17,459 GB with Data Reduction ratio) |
6565

6666
These resource requirements only apply to the first cluster deployed in an Azure VMware Solution private cloud. Subsequent clusters only need to account for the vSphere Cluster Service, ESXi resource requirements and vSAN System Usage in solution sizing.
6767

articles/bastion/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
- name: Azure Networking blog
141141
href: https://techcommunity.microsoft.com/category/azure/blog/azurenetworkingblog
142142
- name: Microsoft Q&A question page - Azure Bastion
143-
href: https://learn.microsoft.com/answers/tags/119/azure-bastion
143+
href: /answers/tags/119/azure-bastion
144144
- name: Networking feedback
145145
href: https://feedback.azure.com/d365community/forum/8ae9bf04-8326-ec11-b6e6-000d3a4f0789
146146
- name: Pricing

articles/cost-management-billing/costs/pricing-calculator.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Estimate costs with the Azure pricing calculator
33
description: This article explains how to use the Azure pricing calculator to turn anticipated usage into an estimated cost, which makes it easier to plan and budget for your Azure usage.
44
author: bandersmsft
55
ms.author: banders
6-
ms.date: 01/07/2025
6+
ms.date: 03/04/2025
77
ms.topic: how-to
88
ms.service: cost-management-billing
99
ms.subservice: cost-management
@@ -16,7 +16,7 @@ The Azure pricing calculator helps you turn anticipated usage into an estimated
1616

1717
>[!NOTE]
1818
> - You can also use Azure [Total Cost of Ownership (TCO) Calculator](https://azure.microsoft.com/pricing/tco/calculator/) to estimate the cost savings you can achieve by migrating your application workloads to Microsoft Azure.
19-
> - Prices shown in this article are examples to help you understand how the calculator works. They are not actual prices.
19+
> - Prices shown in this article are examples to help you understand how the calculator works. They aren't actual prices.
2020
2121
## Access the Azure pricing calculator
2222

@@ -73,7 +73,7 @@ Since it's your first time, you start with an empty estimate.
7373
- Monthly costs are incurred after the product is consumed.
7474
7. Although optional, we recommend that you give the configuration a unique name. Finding a particular configuration in a large estimate is easier when it has a unique name.
7575
8. Repeat the steps to add more products to an estimate.
76-
9. Finally, don't forget to add a support plan. Choose from Basic, Developer, Standard or Professional Direct. For more information, see [Compare support plans](https://azure.microsoft.com/support/plans/).
76+
9. Finally, don't forget to add a support plan. Choose from Basic, Developer, Standard, or Professional Direct. For more information, see [Compare support plans](https://azure.microsoft.com/support/plans/).
7777

7878
Here's an example of a virtual machine configuration:
7979

@@ -130,7 +130,7 @@ After you log in (not sign-in at the top of the page that takes you to the Azure
130130
- New Commerce Cloud Solution Provider (CSP)
131131
- Microsoft Online Service Agreement (MOSA)
132132

133-
If you have negotiated pricing associated with an MCA Billing Account:
133+
To view negotiated pricing associated with an MCA Billing Account:
134134

135135
1. Select the **Microsoft Customer Agreement (MCA)** option in the licensing program.
136136
2. Select **None selected (change)**.
@@ -142,7 +142,9 @@ If you have negotiated pricing associated with an MCA Billing Account:
142142

143143
Your calculator estimate updates with your MCA price sheet information.
144144

145-
If you have negotiated pricing associated with an EA billing account:
145+
To view negotiated pricing associated with an EA billing account:
146+
147+
Your EA administrator must have both **Department admins can view charges (DA view charges)** and **Account owners can view charges (AO view charges)** enabled. For more information about enabling access, see [Enable EA access to costs](assign-access-acm-data.md#enable-ea-access-to-costs). After the settings are updated, it can up to 48 hours for the changes to take effect.
146148

147149
1. Select the **Enterprise Agreement (EA)** option in the licensing program list.
148150
:::image type="content" source="./media/pricing-calculator/select-program-offer-enterprise-agreement.png" alt-text="Screenshot showing the Enterprise Agreement (EA) list item." lightbox="./media/pricing-calculator/select-program-offer-enterprise-agreement.png" :::
@@ -155,7 +157,7 @@ If you want to change your selected enrollment, select the **Selected agreement*
155157

156158
:::image type="content" source="./media/pricing-calculator/selected-agreement-enterprise-agreement-change.png" alt-text="Screenshot showing the Selected Agreement option." lightbox="./media/pricing-calculator/selected-agreement-enterprise-agreement-change.png" :::
157159

158-
If you're a Cloud Solution Provider (CSP) partner who has transitioned to the new commerce experience, you can view your estimate by selecting the Microsoft Customer Agreement (MCA) option in the licensing program.
160+
If you're a Cloud Solution Provider (CSP) partner that transitioned to the new commerce experience, you can view your estimate by selecting the Microsoft Customer Agreement (MCA) option in the licensing program.
159161

160162
>[!NOTE]
161163
> Partner Earned Credit (PEC) estimation isn't available in the calculator, so you need to manually apply your anticipated PEC to the monthly estimate.

articles/site-recovery/hyper-v-azure-common-questions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ For the Hyper-V host server what you need depends on the deployment scenario. Ch
4242

4343
### Can I protect VMs when Hyper-V is running on a client operating system?
4444

45-
No, VMs must be located on a Hyper-V host server that's running on a supported Windows server machine. If you need to protect a client computer you could replicate it as a physical machine to [Azure](physical-server-enable-replication.md) or a [secondary datacenter](https://learn.microsoft.com/windows-server/virtualization/hyper-v/manage/set-up-hyper-v-replica).
45+
No, VMs must be located on a Hyper-V host server that's running on a supported Windows server machine. If you need to protect a client computer you could replicate it as a physical machine to [Azure](physical-server-enable-replication.md) or a [secondary datacenter](/windows-server/virtualization/hyper-v/manage/set-up-hyper-v-replica).
4646

4747
### Do Hyper-V hosts need to be in VMM clouds?
4848

articles/virtual-desktop/includes/include-whats-new-client-windows-remote-desktop-msi.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ms.topic: include
33
author: sipastak
44
ms.author: sipastak
5-
ms.date: 02/28/2025
5+
ms.date: 03/04/2025
66
---
77

88
## Supported client versions
@@ -12,16 +12,20 @@ The following table lists the current versions available for the public and Insi
1212
| Release | Latest version | Download |
1313
|--|--|--|
1414
| Public | 1.2.6014 | [Windows 64-bit](https://go.microsoft.com/fwlink/?linkid=2139369) *(most common)*<br />[Windows 32-bit](https://go.microsoft.com/fwlink/?linkid=2139456)<br />[Windows Arm64](https://go.microsoft.com/fwlink/?linkid=2139370) |
15-
| Insider | 1.2.6072 | [Windows 64-bit](https://go.microsoft.com/fwlink/?linkid=2139233) *(most common)*<br />[Windows 32-bit](https://go.microsoft.com/fwlink/?linkid=2139144)<br />[Windows Arm64](https://go.microsoft.com/fwlink/?linkid=2139368) |
15+
| Insider | 1.2.6073 | [Windows 64-bit](https://go.microsoft.com/fwlink/?linkid=2139233) *(most common)*<br />[Windows 32-bit](https://go.microsoft.com/fwlink/?linkid=2139144)<br />[Windows Arm64](https://go.microsoft.com/fwlink/?linkid=2139368) |
1616

17-
## Updates for version 1.2.6072 (Insider)
17+
## Updates for version 1.2.6073 (Insider)
1818

19-
*Date published: February 25, 2025*
19+
*Date published: March 4, 2025*
2020

2121
Download: [Windows 64-bit](https://go.microsoft.com/fwlink/?linkid=2139233), [Windows 32-bit](https://go.microsoft.com/fwlink/?linkid=2139144), [Windows ARM64](https://go.microsoft.com/fwlink/?linkid=2139368)
2222

2323
- Fixed an issue with RemoteApps where a maximized window unexpectedly changes size.
2424
- Improved accessibility for the **More Options** menu.
25+
- General improvements and bug fixes.
26+
27+
> [!NOTE]
28+
> This version replaced the Insider version 1.2.6072. Changes noted above reflect all changes for these versions.
2529
2630
## Updates for version 1.2.6014
2731

articles/virtual-wan/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@
383383
- name: Azure Networking blog
384384
href: https://techcommunity.microsoft.com/category/azure/blog/azurenetworkingblog
385385
- name: Microsoft Q&A question page
386-
href: https://learn.microsoft.com/answers/tags/34/azure-virtual-wan
386+
href: /answers/tags/34/azure-virtual-wan
387387
- name: Networking feedback
388388
href: https://feedback.azure.com/d365community/forum/8ae9bf04-8326-ec11-b6e6-000d3a4f0789
389389
- name: Subscription and service limits

articles/vpn-gateway/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@
414414
- name: Azure Networking blog
415415
href: https://techcommunity.microsoft.com/category/azure/blog/azurenetworkingblog
416416
- name: Microsoft Q&A question page
417-
href: https://learn.microsoft.com/answers/tags/102/azure-vpn-gateway
417+
href: /answers/tags/102/azure-vpn-gateway
418418
- name: Networking feedback
419419
href: https://feedback.azure.com/d365community/forum/8ae9bf04-8326-ec11-b6e6-000d3a4f0789
420420
- name: Subscription and service limits

0 commit comments

Comments
 (0)