Skip to content

Commit db74d22

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into tamram23-0406
2 parents c60e810 + 0a85294 commit db74d22

File tree

12 files changed

+168
-36
lines changed

12 files changed

+168
-36
lines changed

articles/aks/azure-cni-overlay.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Like Azure CNI Overlay, Kubenet assigns IP addresses to pods from an address spa
4343

4444
## IP address planning
4545

46-
- **Cluster Nodes**: Cluster nodes go into a subnet in your VNet, so verify you have a subnet large enough to account for future scale. A simple `/24` subnet can host up to 251 nodes (the first three IP addresses in a subnet are reserved for management operations).
46+
- **Cluster Nodes**: Cluster nodes go into a subnet in your VNet, so verify you have a subnet large enough to account for future scale. Cluster can't scale to another subnet but you can add new nodepools in another subnet within the same VNet for expansion. A simple `/24` subnet can host up to 251 nodes (the first three IP addresses in a subnet are reserved for management operations).
4747

4848
- **Pods**: The overlay solution assigns a `/24` address space for pods on every node from the private CIDR that you specify during cluster creation. The `/24` size is fixed and can't be increased or decreased. You can run up to 250 pods on a node. When planning the pod address space, ensure that the private CIDR is large enough to provide `/24` address spaces for new nodes to support future cluster expansion.
4949

articles/app-service/environment/migrate.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Migrate to App Service Environment v3 by using the migration feature
33
description: Overview of the migration feature for migration to App Service Environment v3
44
author: seligj95
55
ms.topic: article
6-
ms.date: 03/20/2023
6+
ms.date: 04/07/2023
77
ms.author: jordanselig
88
ms.custom: references_regions
99
---
@@ -90,6 +90,7 @@ If your App Service Environment doesn't pass the validation checks or you try to
9090
|`<ZoneRedundant><DedicatedHosts><ASEv3/ASE>` is not available in this location. |This error appears if you're trying to migrate an App Service Environment in a region that doesn't support one of your requested features. |Migrate using one of the [manual migration options](migration-alternatives.md) if you want to migrate immediately. Otherwise, wait for the migration feature to support this App Service Environment configuration. |
9191
|Migrate cannot be called on this ASE until the active upgrade has finished. |App Service Environments can't be migrated during platform upgrades. You can set your [upgrade preference](how-to-upgrade-preference.md) from the Azure portal. In some cases, an upgrade is initiated when visiting the migration page if your App Service Environment isn't on the current build. |Wait until the upgrade finishes and then migrate. |
9292
|App Service Environment management operation in progress. |Your App Service Environment is undergoing a management operation. These operations can include activities such as deployments or upgrades. Migration is blocked until these operations are complete. |You can migrate once these operations are complete. |
93+
|Migrate is not available for this subscription|Support needs to be engaged for migrating this App Service Environment.|Open a support case to engage support to resolve your issue.|
9394

9495
## Overview of the migration process using the migration feature
9596

107 Bytes
Loading

articles/application-gateway/tutorial-protect-application-gateway-ddos.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
---
2-
title: 'Tutorial: Protect your application gateway with Azure DDoS Protection Standard'
2+
title: 'Tutorial: Protect your application gateway with Azure DDoS Network Protection'
33
titleSuffix: Azure Application Gateway
44
description: Learn how to set up an application gateway and protect it with Azure DDoS protection
55
services: application-gateway
66
author: duongau
77
ms.author: duau
8-
ms.date: 12/21/2022
8+
ms.date: 04/06/2023
99
ms.topic: quickstart
1010
ms.service: application-gateway
1111
ms.custom: template tutorial
1212
---
1313

14-
# Tutorial: Protect your application gateway with Azure DDoS Protection Standard
14+
# Tutorial: Protect your application gateway with Azure DDoS Network Protection
1515

16-
This article helps you create an Azure Application Gateway with a DDoS protected virtual network. Azure DDoS Protection Standard enables enhanced DDoS mitigation capabilities such as adaptive tuning, attack alert notifications, and monitoring to protect your application gateways from large scale DDoS attacks.
16+
This article helps you create an Azure Application Gateway with a DDoS protected virtual network. Azure DDoS Network Protection enables enhanced DDoS mitigation capabilities such as adaptive tuning, attack alert notifications, and monitoring to protect your application gateways from large scale DDoS attacks.
1717

1818
> [!IMPORTANT]
19-
> Azure DDoS Protection incurs a cost when you use the Standard SKU. Overages charges only apply if more than 100 public IPs are protected in the tenant. Ensure you delete the resources in this tutorial if you aren't using the resources in the future. For information about pricing, see [Azure DDoS Protection Pricing]( https://azure.microsoft.com/pricing/details/ddos-protection/). For more information about Azure DDoS protection, see [What is Azure DDoS Protection?](../ddos-protection/ddos-protection-overview.md).
19+
> Azure DDoS Protection incurs a cost when you use the Network Protection SKU. Overages charges only apply if more than 100 public IPs are protected in the tenant. Ensure you delete the resources in this tutorial if you aren't using the resources in the future. For information about pricing, see [Azure DDoS Protection Pricing]( https://azure.microsoft.com/pricing/details/ddos-protection/). For more information about Azure DDoS protection, see [What is Azure DDoS Protection?](../ddos-protection/ddos-protection-overview.md).
2020
2121
In this tutorial, you learn how to:
2222

@@ -156,7 +156,7 @@ Review the settings on the **Review + create** tab, and then select **Create** t
156156

157157
## Enable DDoS protection
158158

159-
Azure DDoS protection Standard is enabled at the virtual network where the resource you want to protect reside.
159+
Azure DDoS Network Protection is enabled at the virtual network where the resource you want to protect reside.
160160

161161
1. In the search box at the top of the portal, enter **Virtual network**. Select **Virtual networks** in the search results.
162162

@@ -168,7 +168,7 @@ Azure DDoS protection Standard is enabled at the virtual network where the resou
168168

169169
5. In the pull-down box in DDoS protection plan, select **myDDoSProtectionPlan**.
170170

171-
:::image type="content" source="./media/tutorial-protect-application-gateway/enable-ddos-vnet.png" alt-text="Screenshot of ddos protection.":::
171+
:::image type="content" source="./media/tutorial-protect-application-gateway/enable-ddos-vnet.png" alt-text="Screenshot of D D o S network protection.":::
172172

173173
6. Select **Save**.
174174

@@ -276,4 +276,4 @@ To delete the resource group:
276276
Advance to the next article to learn how to:
277277
278278
> [!div class="nextstepaction"]
279-
> [Configure an application gateway with TLS termination using the Azure portal](create-ssl-portal.md)
279+
> [Configure an application gateway with TLS termination using the Azure portal](create-ssl-portal.md)

articles/azure-cache-for-redis/cache-how-to-geo-replication.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ Yes, geo-replication of caches in VNets is supported with caveats:
230230
- Geo-replication between caches in the same VNet is supported.
231231
- Geo-replication between caches in different VNets is also supported.
232232
- If the VNets are in the same region, you can connect them using [VNet peering](../virtual-network/virtual-network-peering-overview.md) or a [VPN Gateway VNet-to-VNet connection](../vpn-gateway/vpn-gateway-howto-vnet-vnet-resource-manager-portal.md).
233-
- If the VNets are in different regions, geo-replication using VNet peering is supported. A client VM in VNet 1 (region 1) isn't able to access the cache in VNet 2 (region 2) using its DNS name because of a constraint with Basic internal load balancers. For more information about VNet peering constraints, see [Virtual Network - Peering - Requirements and constraints](../virtual-network/virtual-network-manage-peering.md#requirements-and-constraints). We recommend using a VPN Gateway VNet-to-VNet connection.
233+
- If the VNets are in different regions, geo-replication using VNet peering is not supported. A client VM in VNet 1 (region 1) isn't able to access the cache in VNet 2 (region 2) using its DNS name because of a constraint with Basic internal load balancers. For more information about VNet peering constraints, see [Virtual Network - Peering - Requirements and constraints](../virtual-network/virtual-network-manage-peering.md#requirements-and-constraints). We recommend using a VPN Gateway VNet-to-VNet connection.
234234

235235
To configure your VNet effectively and avoid geo-replication issues, you must configure both the inbound and outbound ports correctly. For more information on avoiding the most common VNet misconfiguration issues, see [Geo-replication peer port requirements](cache-how-to-premium-vnet.md#geo-replication-peer-port-requirements).
236236

articles/communication-services/concepts/telephony/certified-session-border-controllers.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,18 @@ ms.subservice: pstn
1414
# List of Session Border Controllers certified for Azure Communication Services direct routing
1515
This document contains a list of Session Border Controllers certified for Azure Communication Services direct routing. It also includes known limitations.
1616

17-
Microsoft is working with the selected Session Border Controllers (SBC) vendors certified for Teams Direct Routing to work with Azure direct routing. You can watch the progress on this page. While the SBC, certified for Teams Direct Routing, can work with Azure direct routing, we encourage not to put any workload on the SBC until it appears on this page. We also do not support the uncertified SBC. While Azure direct routing is built on the same backend as Teams Direct Routing, there are some differences. The certification covers comprehensive validation of the SBC for the Azure direct routing.
17+
Microsoft is working with the selected Session Border Controllers (SBC) vendors certified for Teams Direct Routing to work with Azure direct routing. You can watch the progress on this page. While the SBC, certified for Teams Direct Routing, can work with Azure direct routing, we encourage not to put any workload on the SBC until it appears on this page. We also don't support the uncertified SBC. While Azure direct routing is built on the same backend as Teams Direct Routing, there are some differences. The certification covers comprehensive validation of the SBC for the Azure direct routing.
1818

1919
Microsoft works with each vendor to:
2020
- Jointly work on the SIP interconnection protocols.
2121
- Perform intense tests using a third-party lab. Only devices that pass the tests are certified.
22-
- Run daily tests with all certified devices in production and pre-production environments. Validating the devices in pre-production environments guarantees that new versions of Azure Communication Services code in the cloud will work with certified SBCs.
22+
- Run daily tests with all certified devices in production and preproduction environments. Validating the devices in preproduction environments guarantees that new versions of Azure Communication Services code in the cloud work with certified SBCs.
2323
- Establish a joint support process with the SBC vendors.
2424

2525
[!INCLUDE [Public Preview](../../includes/public-preview-include-document.md)]
2626
[!INCLUDE [Dynamics 365 Omnichannel Notice](../includes/direct-routing-omnichannel-note.md)]
2727

2828
Media bypass is not yet supported by Azure Communication Services.
29-
Early media is not supported by a web-based client.
3029
The table that follows list devices certified for Azure Communication Services direct routing.
3130

3231
If you have any questions about the SBC certification program for Communication Services direct routing, contact [email protected].

articles/dev-box/toc.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ items:
1414
href: quickstart-configure-dev-box-service.md
1515
- name: Create a dev box
1616
href: quickstart-create-dev-box.md
17-
- name: Connect with Remote Desktop App
18-
href: tutorial-connect-to-dev-box-with-remote-desktop-app.md
1917
- name: Tutorials
2018
expanded: true
2119
items:
@@ -26,7 +24,7 @@ items:
2624
items:
2725
- name: Key concepts
2826
href: concept-dev-box-concepts.md
29-
- name: Components common to Dev Box and ADE
27+
- name: Components common to Dev Box and Deployment Environments
3028
href: concept-common-components.md
3129
- name: How-to guides
3230
expanded: true

articles/reliability/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,8 @@
229229
href: ../site-recovery/site-recovery-overview.md?toc=/azure/reliability/toc.json&bc=/azure/reliability/breadcrumb/toc.json
230230
- name: Azure Blob Storage
231231
href: ../storage/common/storage-disaster-recovery-guidance.md?toc=/azure/reliability/toc.json&bc=/azure/reliability/breadcrumb/toc.json
232+
- name: Azure Storage Mover
233+
href: reliability-azure-storage-mover.md?toc=/azure/reliability/toc.json&bc=/azure/reliability/breadcrumb/toc.json
232234
- name: Azure SQL
233235
href: /azure/azure-sql/database/high-availability-sla?toc=/azure/reliability/toc.json&bc=/azure/reliability/breadcrumb/toc.json
234236
- name: Azure Virtual WAN

0 commit comments

Comments
 (0)