Skip to content

Commit ae48797

Browse files
authored
Merge pull request #261707 from MicrosoftDocs/main
12/20/2023 AM Publish
2 parents d300a7d + 2a8fa4b commit ae48797

File tree

79 files changed

+935
-815
lines changed

Some content is hidden

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

79 files changed

+935
-815
lines changed

articles/azure-monitor/logs/azure-monitor-data-explorer-proxy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ To create a new alert rule based on a cross-service query, follow the steps in [
165165
* Cross-service queries support data retrieval only.
166166
* [Private Link](../logs/private-link-security.md) (private endpoints) and [IP restrictions](/azure/data-explorer/security-network-restrict-public-access) do not support cross-service queries.
167167
* `mv-expand` is limited to 2000 records.
168-
* Queries of [external tables in Azure Data Explorer](/azure/data-explorer/external-table.md) are only supported if wrapped in a parameter-less function.
168+
* Azure Monitor Logs does not support the `external_table()` function, which lets you query external tables in Azure Data Explorer. To query an external table, define `external_table(<external-table-name>)` as a parameterless function in Azure Data Explorer. You can then call the function using the expression `adx("").<function-name>`.
169169

170170
### Azure Resource Graph cross-service query limitations
171171

articles/azure-vmware/azure-vmware-solution-platform-updates.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Microsoft regularly applies important updates to the Azure VMware Solution for n
1515

1616
**VMware vSphere 8.0**
1717

18-
VMware vSphere 8.0 will be rolled out to the Azure VMware Solution starting at the end of November.
18+
VMware vSphere 8.0 is targted for rollout to Azure VMware Solution starting at the end of January.
1919

2020
**AV64 SKU**
2121

articles/azure-vmware/concepts-private-clouds-clusters.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Concepts - Private clouds and clusters
33
description: Understand the key capabilities of Azure VMware Solution software-defined data centers and VMware vSphere clusters.
44
ms.topic: conceptual
55
ms.service: azure-vmware
6-
ms.date: 12/05/2023
6+
ms.date: 12/20/2023
77
ms.custom: engagement-fy23
88
---
99

@@ -31,8 +31,8 @@ Each Azure VMware Solution architectural component has the following function:
3131
- Azure Subscription: Provides controlled access, budget, and quota management for the Azure VMware Solution.
3232
- Azure Region: Groups data centers into Availability Zones (AZs) and then groups AZs into regions.
3333
- Azure Resource Group: Places Azure services and resources into logical groups.
34-
- Azure VMware Solution Private Cloud: Offers compute, networking, and storage resources using VMware software, including vCenter Server, NSX-T Data Center software-defined networking, vSAN software-defined storage, and Azure bare-metal ESXi hosts. Azure NetApp Files and Pure Cloud Block Store are also supported.
35-
- Azure VMware Solution Resource Cluster: Provides compute, networking, and storage resources for customer workloads by scaling out the Azure VMware Solution private cloud using VMware software, including vSAN software-defined storage and Azure bare-metal ESXi hosts. Azure NetApp Files and Pure Cloud Block Store are also supported.
34+
- Azure VMware Solution Private Cloud: Offers compute, networking, and storage resources using VMware software, including vCenter Server, NSX-T Data Center software-defined networking, vSAN software-defined storage, and Azure bare-metal ESXi hosts. Azure NetApp Files, Azure Elastic SAN, and Pure Cloud Block Store are also supported.
35+
- Azure VMware Solution Resource Cluster: Provides compute, networking, and storage resources for customer workloads by scaling out the Azure VMware Solution private cloud using VMware software, including vSAN software-defined storage and Azure bare-metal ESXi hosts. Azure NetApp Files, Azure Elastic SAN, and Pure Cloud Block Store are also supported.
3636
- VMware HCX: Delivers mobility, migration, and network extension services.
3737
- VMware Site Recovery: Automates disaster recovery and storage replication services with VMware vSphere Replication. Third-party disaster recovery solutions Zerto Disaster Recovery and JetStream Software Disaster Recovery are also supported.
3838
- Dedicated Microsoft Enterprise Edge (D-MSEE): Router that connects Azure cloud and the Azure VMware Solution private cloud instance.

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@ 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: 10/14/2023
6+
ms.date: 12/20/2023
77
author: rvandenbedem
88
ms.author: rvandenbedem
99
---
1010

1111
<!-- Used in faq.yml -->
1212

13-
Traffic in the Azure VMware Solution ExpressRoute circuit isn't metered in any way. No billing for any Azure VMware Solution ExpressRoute circuit, or for Global Reach charges between Azure VMware Solution private clouds, or Azure VMware Solution to on-premises, other than standard egress charges for traffic from your ExpressRoute circuit connecting to your on-premises to Azure is charged according to ExpressRoute pricing plans.
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.
1414

15-
- **Azure VMware Solution to VNet** is through an internal ExpressRoute circuit and is free of cost, regardless of region location (same region or cross-region).
15+
- **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).
1616

17-
- **Azure VMware Solution to on-premises** is done through VNet or ExpressRoute Global Reach (between the internal ExpressRoute and external ExpressRoute). It's still free aside from the standard egress charges from the ExpressRoute to on-premises network.
17+
- **Azure VMware Solution to on-premises site** is done through Azure Virtual Network or ExpressRoute Global Reach (between the internal ExpressRoute and external ExpressRoute). It's still free aside from the standard egress charges (Metered Billing Model) from the ExpressRoute to on-premises network. For the Unlimited Billing Model, there are no data charges.
1818

1919
For example:
2020

21-
- If we connect a VNet in Azure West Europe to an Azure VMware Solution private cloud in West Europe, then there are no ExpressRoute charges other than the ExpressRoute gateway charges.
21+
- 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.
2222

23-
- If we connect a VNet in Azure North Europe to an Azure VMware Solution private cloud in West Europe, then there are no ExpressRoute charges other than the ExpressRoute gateway charges.
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.
2424

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 you will NOT incur any ExpressRoute Global Reach data transfer (egress and ingress) charges. Please note that there will be charges when using an ExpressRoute gateway.
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.
2626

2727
:::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":::
4.82 KB
Loading
2.49 KB
Loading

articles/defender-for-cloud/alerts-reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ Defender for Cloud's supported kill chain intents are based on [version 9 of the
576576
577577
## Deprecated Defender for Servers alerts
578578

579-
The following tables include the Defender for Servers security alerts [which have been deprecated in April, 2023 due to an improvement process](release-notes.md#deprecation-and-improvement-of-selected-alerts-for-windows-and-linux-servers).
579+
The following tables include the Defender for Servers security alerts [which have been deprecated in April, 2023 due to an improvement process](release-notes-archive.md#deprecation-and-improvement-of-selected-alerts-for-windows-and-linux-servers).
580580

581581
### Deprecated Linux alerts
582582

0 commit comments

Comments
 (0)