Skip to content

Commit a0125cb

Browse files
authored
Merge branch 'MicrosoftDocs:main' into cosmos-quickstarts-refresh
2 parents def9982 + 07d918a commit a0125cb

21 files changed

+82
-64
lines changed

articles/aks/image-cleaner.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ms.author: nickoman
55
author: nickomang
66
ms.topic: article
77
ms.custom: devx-track-azurecli
8-
ms.date: 10/22/2023
8+
ms.date: 01/05/2024
99
---
1010

1111
# Use Image Cleaner to clean up stale images on your Azure Kubernetes Service (AKS) cluster
@@ -188,7 +188,8 @@ kubectl logs -n kube-system <worker-pod-name> -c trivy-scanner
188188
kubectl logs -n kube-system <worker-pod-name> -c remover
189189
```
190190

191-
- when `eraser-aks-xxxxx` was deleted, you can follow these steps to enable the [Azure Monitor add-on](./monitor-aks.md) and use the Container Insights pod log table to view historical pod logs.
191+
- `eraser-aks-xxxxx` pod will be deleted in 10 minutes after work completion. You can follow these steps to enable the [Azure Monitor add-on](./monitor-aks.md) and use the Container Insights pod log table. After that, historical logs will be stored and you can review them even `eraser-aks-xxxxx` is deleted
192+
192193
1. Ensure Azure Monitoring is enabled on your cluster. For detailed steps, see [Enable Container Insights on AKS clusters](../azure-monitor/containers/container-insights-enable-aks.md#existing-aks-cluster).
193194

194195
2. Get the Log Analytics resource ID using the [`az aks show`][az-aks-show] command.

articles/azure-vmware/includes/add-network-segment-steps.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ title: Add an NSX-T network segment
33
description: Steps to add an NSX-T network segment for Azure VMware Solution in NSX-T Manager.
44
ms.topic: include
55
ms.service: azure-vmware
6-
ms.date: 03/13/2021
6+
ms.date: 01/03/2024
77
author: suzizuber
88
ms.author: v-szuber
9+
ms.custom: engagement-fy23
910
---
1011

1112
<!-- Used in configure-dhcp-azure-vmware-solution.md and tutorial-nsx-t-network-segment.md -->
@@ -18,7 +19,7 @@ ms.author: v-szuber
1819

1920
1. Select the Tier-1 Gateway (TNTxx-T1) as the **Connected Gateway** and leave the **Type** as Flexible.
2021

21-
1. Select the pre-configured overlay **Transport Zone** (TNTxx-OVERLAY-TZ) and then select **Set Subnets**.
22+
1. Select the preconfigured overlay **Transport Zone** (TNTxx-OVERLAY-TZ) and then select **Set Subnets**.
2223

2324
:::image type="content" source="../media/nsxt/nsxt-create-segment-specs.png" alt-text="Screenshot showing the Segments details for adding a new NSX-T network segment.":::
2425

articles/azure-vmware/includes/azure-vmware-solution-networking-description.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@ description: Azure VMware Solution networking and connectivity description.
44
ms.topic: include
55
ms.service: azure-vmware
66
ms.custom: engagement-fy23
7-
ms.date: 11/04/2022
7+
ms.date: 01/03/2024
88
author: suzizuber
99
ms.author: v-szuber
10+
ms.custom: engagement-fy23
1011
---
1112

1213
<!-- Used in introduction.md and concepts-networking.md -->
1314

1415
Azure VMware Solution offers a private cloud environment accessible from on-premises sites and Azure-based resources. Services such as Azure ExpressRoute, VPN connections, or Azure Virtual WAN deliver the connectivity. However, these services require specific network address ranges and firewall ports for enabling the services.
1516

16-
When you deploy a private cloud; private networks for management, provisioning, and vMotion get created. You'll use these private networks to access VMware vCenter Server and VMware NSX-T Data Center NSX-T Manager and virtual machine vMotion or deployment.
17+
When you deploy a private cloud, private networks for management, provisioning, and vMotion get created. You use these private networks to access VMware vCenter Server and VMware NSX-T Data Center NSX-T Manager and virtual machine vMotion or deployment.
1718

1819
[!INCLUDE [expressroute-global-reach](expressroute-global-reach.md)]
1920

articles/azure-vmware/includes/azure-vmware-solutions-limits.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ title: Azure VMware Solution limits
33
description: Azure VMware Solution limits.
44
ms.topic: include
55
ms.service: azure-vmware
6-
ms.date: 2/17/2023
6+
ms.date: 1/03/2024
77
author: suzizuber
88
ms.author: v-szuber
9+
ms.custom: engagement-fy23
910
---
1011

1112
<!-- Used in /azure/azure-resource-manager/management/azure-subscription-service-limits.md and concepts-networking.md -->
@@ -21,8 +22,8 @@ The following table describes the maximum limits for Azure VMware Solution.
2122
| Maximum number of vCenter Servers per private cloud | 1 (hard-limit) |
2223
| Maximum number of HCX site pairings | 25 (any edition) |
2324
| Maximum number of HCX service meshes | 10 (any edition) |
24-
| Maximum number of Azure VMware Solution ExpressRoute linked private clouds from a single location to a single Virtual Network Gateway | 4<br />The virtual network gateway used determines the actual max linked private clouds. For more details, see [About ExpressRoute virtual network gateways](../../expressroute/expressroute-about-virtual-network-gateways.md)<br />If you exceed this threshold use [Azure VMware Solution Interconnect](../connect-multiple-private-clouds-same-region.md) to aggregate private cloud connectivity within the Azure region. |
25-
| Maximum Azure VMware Solution ExpressRoute port speed | 10 Gbps (use Ultra Performance Gateway SKU with FastPath enabled)<br />The virtual network gateway used determines the actual bandwidth. For more details, see [About ExpressRoute virtual network gateways](../../expressroute/expressroute-about-virtual-network-gateways.md) |
25+
| Maximum number of Azure VMware Solution ExpressRoute linked private clouds from a single location to a single Virtual Network Gateway | 4<br />The virtual network gateway used determines the actual max linked private clouds. For more information, see [About ExpressRoute virtual network gateways](../../expressroute/expressroute-about-virtual-network-gateways.md)<br />If you exceed this threshold use [Azure VMware Solution Interconnect](../connect-multiple-private-clouds-same-region.md) to aggregate private cloud connectivity within the Azure region. |
26+
| Maximum Azure VMware Solution ExpressRoute port speed | 10 Gbps (use Ultra Performance Gateway SKU with FastPath enabled)<br />The virtual network gateway used determines the actual bandwidth. For more information, see [About ExpressRoute virtual network gateways](../../expressroute/expressroute-about-virtual-network-gateways.md) |
2627
| Maximum number of Azure Public IPv4 addresses assigned to NSX-T Data Center | 2,000 |
2728
| Maximum number of Azure VMware Solution Interconnects per private cloud | 10 |
2829
| vSAN capacity limits | 75% of total usable (keep 25% available for SLA) |

articles/azure-vmware/includes/connect-expressroute-vnet.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ title: Connect ExpressRoute to the virtual network gateway
33
description: Steps to connect ExpressRoute to the virtual network gateway.
44
ms.topic: include
55
ms.service: azure-vmware
6-
ms.date: 12/08/2020
6+
ms.date: 1/03/2024
77
author: suzizuber
88
ms.author: v-szuber
9+
ms.custom: engagement-fy23
910
---
1011

1112
<!-- Used in deploy-azure-vmware-solution.md and tutorial-configure-networking.md -->
@@ -28,8 +29,8 @@ ms.author: v-szuber
2829
| **Authorization key** | Paste the authorization key you copied earlier. |
2930
| **Peer circuit URI** | Paste the ExpressRoute ID you copied earlier. |
3031

31-
:::image type="content" source="../media/tutorial-configure-networking/add-connection.png" alt-text="Screenshot showing the Add connection page to connect ExpressRoute to the virtual network gateway.":::
32+
:::image type="content" source="../media/tutorial-configure-networking/add-connection.png" alt-text="Screenshot shows the Add connection page to connect ExpressRoute to the virtual network gateway.":::
3233

3334
The connection between your ExpressRoute circuit and your Virtual Network is created.
3435

35-
:::image type="content" source="../media/expressroute-global-reach/virtual-network-gateway-connections.png" alt-text="Screenshot showing a successful virtual network gateway connection.":::
36+
:::image type="content" source="../media/expressroute-global-reach/virtual-network-gateway-connections.png" alt-text="Screenshot shows a successful virtual network gateway connection.":::

articles/azure-vmware/includes/create-nsxt-segment-azure-portal-steps.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ title: Add an NSX-T Data Center network segment using Azure VMware Solution
33
description: Steps to add an NSX-T Data Center network segment for Azure VMware Solution in the Azure portal.
44
ms.topic: include
55
ms.service: azure-vmware
6-
ms.date: 4/22/2023
6+
ms.date: 1/03/2024
77
author: suzizuber
88
ms.author: v-szuber
9+
ms.custom: engagement-fy23
910
---
1011

1112
<!-- Used in configure-dhcp-azure-vmware-solution.md and tutorial-nsx-t-network-segment.md -->

articles/azure-vmware/includes/create-private-cloud-azure-portal-steps.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ title: Create an Azure VMware Solution private cloud
33
description: Steps to create an Azure VMware Solution private cloud using the Azure portal.
44
ms.topic: include
55
ms.service: azure-vmware
6-
ms.custom: devx-track-azurecli
7-
ms.date: 4/7/2023
6+
ms.custom: devx-track-azurecli, engagement-fy23
7+
ms.date: 1/03/2024
88
author: suzizuber
99
ms.author: v-szuber
1010
---
@@ -42,7 +42,7 @@ You can create an Azure VMware Solution private cloud using the Azure portal or
4242
| **Location** | Select a location, such as **(US) East US 2**. It's the *region* you defined during the planning phase. |
4343
| **Size of host** | Select the **AV36**, **AV36P** or **AV52** SKU. |
4444
| **Host Location** | Select **All hosts in one availability zone** for a standard private cloud or **Hosts in two availability zones** for stretched clusters. |
45-
| **Number of hosts** | Number of hosts allocated for the private cloud cluster. The default value is 3, which you can increase or decrease after deployment. If these nodes are not listed as available, please contact support to [request a quota increase](../request-host-quota-azure-vmware-solution.md?WT.mc_id=Portal-VMCP). You can also click the link labeled **If you need more hosts, request a quota increase** in the Azure portal. |
45+
| **Number of hosts** | Number of hosts allocated for the private cloud cluster. The default value is 3, which you can increase or decrease after deployment. If these nodes aren't listed as available, contact support to [request a quota increase](../request-host-quota-azure-vmware-solution.md?WT.mc_id=Portal-VMCP). You can also select the link labeled **If you need more hosts, request a quota increase** in the Azure portal. |
4646
| **Address block for private cloud** | Provide an IP address block for the private cloud. The CIDR represents the private cloud management network and is used for the cluster management services, such as vCenter Server and NSX-T Manager. Use /22 address space, for example, 10.175.0.0/22. The address should be unique and not overlap with other Azure Virtual Networks and with on-premises networks. |
4747

4848

@@ -53,7 +53,7 @@ You can create an Azure VMware Solution private cloud using the Azure portal or
5353
> [!NOTE]
5454
> This step takes roughly 3-4 hours. Adding a single host in an existing or the same cluster takes between 30 - 45 minutes.
5555
56-
1. Verify that the deployment was successful. Navigate to the resource group you created and select your private cloud. You'll see the status of **Succeeded** when the deployment has finished.
56+
1. Verify that the deployment was successful. Navigate to the resource group you created and select your private cloud. You see the status of **Succeeded** when the deployment is finished.
5757

5858
:::image type="content" source="../media/tutorial-create-private-cloud/validate-deployment.png" alt-text="Screenshot showing that the deployment was successful." border="true":::
5959

articles/azure-vmware/includes/customer-communications.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ title: Azure VMware Solution customer communications
33
description: Azure VMware Solution customer communications description.
44
ms.topic: include
55
ms.service: azure-vmware
6-
ms.date: 10/17/2022
6+
ms.date: 1/03/2024
77
author: suzizuber
88
ms.author: v-szuber
9+
ms.custom: engagement-fy23
910
---
1011

1112
<!-- Used in introduction.md and faq.yml -->

articles/azure-vmware/includes/data-charges.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@ title: Azure VMware Solution data charges
33
description: Azure VMware Solution data charges description.
44
ms.topic: include
55
ms.service: azure-vmware
6-
ms.date: 12/20/2023
6+
ms.date: 1/03/2024
77
author: rvandenbedem
88
ms.author: rvandenbedem
9+
ms.custom: engagement-fy23
910
---
1011

1112
<!-- Used in faq.yml -->
1213

13-
Traffic in the Azure VMware Solution ExpressRoute circuit is not metered. No billing for any Azure VMware Solution ExpressRoute circuit, or for Global Reach charges between Azure VMware Solution private clouds. This scenario includes Azure VMware Solution to on-premises, other than standard egress charges for traffic from your Azure ExpressRoute circuit connection to your on-premises site from Azure. These fees are charged according to Azure ExpressRoute pricing plans with the Metered Billing Model. If you are using the Azure ExpressRoute Unlimited Billing Model, egress traffic is not charged.
14+
Traffic in the Azure VMware Solution ExpressRoute circuit isn't metered. No billing for any Azure VMware Solution ExpressRoute circuit, or for Global Reach charges between Azure VMware Solution private clouds. This scenario includes Azure VMware Solution to on-premises, other than standard egress charges for traffic from your Azure ExpressRoute circuit connection to your on-premises site from Azure. These fees are charged according to Azure ExpressRoute pricing plans with the Metered Billing Model. If you're using the Azure ExpressRoute Unlimited Billing Model, egress traffic isn't charged.
1415

1516
- **Azure VMware Solution to Azure Virtual Network** is through an internal ExpressRoute circuit and is free of cost, regardless of region location (same region or cross-region).
1617

@@ -20,8 +21,8 @@ For example:
2021

2122
- If we connect an Azure Virtual Network in Azure West Europe to an Azure VMware Solution private cloud in West Europe, there are no ExpressRoute charges other than the ExpressRoute gateway charges.
2223

23-
- If we connect a Azure Virtual Network in Azure North Europe to an Azure VMware Solution private cloud in West Europe, there are no ExpressRoute charges other than the ExpressRoute gateway charges.
24+
- If we connect an Azure Virtual Network in Azure North Europe to an Azure VMware Solution private cloud in West Europe, there are no ExpressRoute charges other than the ExpressRoute gateway charges.
2425

25-
- If you connect an Azure VMware Solution private cloud in West Europe to an Azure VMware Solution private cloud in North Europe via ExpressRoute Global Reach. There are no ExpressRoute Global Reach data transfer (egress and ingress) charges. There will be charges when using an ExpressRoute gateway.
26+
- If you connect an Azure VMware Solution private cloud in West Europe to an Azure VMware Solution private cloud in North Europe via ExpressRoute Global Reach. There are no ExpressRoute Global Reach data transfer (egress and ingress) charges. There are charges when using an ExpressRoute gateway.
2627

2728
:::image type="content" source="../media/data-transfer-charges.png" alt-text="Diagram showing Azure VMware Solution data transfer charges." border="true" lightbox="../media/data-transfer-charges.png":::

articles/azure-vmware/includes/dhcp-dns-in-azure-vmware-solution-description.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ title: DHCP and DNS in Azure VMware Solution description
33
description: Azure VMware Solution DHCP and DNS description.
44
ms.topic: include
55
ms.service: azure-vmware
6-
ms.date: 4/11/2023
6+
ms.date: 1/03/2024
77
author: suzizuber
88
ms.author: v-szuber
9+
ms.custom: engagement-fy23
910
---
1011

1112
<!-- Used in tutorial-network-checklist.md and configure-dhcp-azure-vmware-solution.md -->

0 commit comments

Comments
 (0)