Skip to content

Commit 4b545c0

Browse files
committed
Merge branch 'main' into release-defender-flip
2 parents 73fe0f5 + ddb184e commit 4b545c0

File tree

53 files changed

+525
-284
lines changed

Some content is hidden

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

53 files changed

+525
-284
lines changed

articles/app-service/overview-access-restrictions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Service endpoints allow you to lock down *inbound* access to your app so that th
6767
> [!NOTE]
6868
> Access restriction rules based on service endpoints are not supported on apps that have private endpoint configured or apps that use IP-based SSL ([App-assigned address](./networking-features.md#app-assigned-address)).
6969
70-
To learn more about configuring service endpoints with your app, see [Azure App Service access restrictions](../virtual-network/virtual-network-service-endpoints-overview.md).
70+
To learn more about configuring service endpoints with your app, see [Azure Virtual Network service endpoints](../virtual-network/virtual-network-service-endpoints-overview.md).
7171

7272
#### Any service endpoint source
7373

articles/application-gateway/application-gateway-troubleshooting-502.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: application-gateway
55
author: greg-lindsay
66
ms.service: azure-application-gateway
77
ms.topic: troubleshooting
8-
ms.date: 05/19/2023
8+
ms.date: 04/29/2025
99
ms.author: greglin
1010
ms.custom: devx-track-azurepowershell
1111
---
@@ -87,9 +87,9 @@ The following table lists the values associated with the default health probe:
8787
8888
### Solution
8989
90-
* Host value of the request will be set to 127.0.0.1. Ensure that a default site is configured and is listening at 127.0.0.1.
90+
* Host value of the request is set to 127.0.0.1. Ensure that a default site is configured and is listening at 127.0.0.1.
9191
* Protocol of the request is determined by the BackendHttpSetting protocol.
92-
* URI Path will be set to */*.
92+
* URI Path is set to */*.
9393
* If BackendHttpSetting specifies a port other than 80, the default site should be configured to listen at that port.
9494
* The call to `protocol://127.0.0.1:port` should return an HTTP result code of 200. This code should be returned within the 30-second timeout period.
9595
* Ensure the configured port is open and there are no firewall rules or Azure Network Security Groups blocking incoming or outgoing traffic on the port configured.
@@ -130,7 +130,7 @@ Validate that the Custom Health Probe is configured correctly, as shown in the p
130130
131131
### Cause
132132
133-
When a user request is received, the application gateway applies the configured rules to the request and routes it to a backend pool instance. It waits for a configurable interval of time for a response from the backend instance. By default, this interval is **20** seconds. In Application Gateway v1, if the application gateway doesn't receive a response from backend application in this interval, the user request gets a 502 error. In Application Gateway v2, if the application gateway doesn't receive a response from the backend application in this interval, the request will be tried against a second backend pool member. If the second request fails the user request gets a 504 error.
133+
When a user request is received, the application gateway applies the configured rules to the request and routes it to a backend pool instance. It waits for a configurable interval of time for a response from the backend instance. By default, this interval is **20** seconds. In Application Gateway v1, if the application gateway doesn't receive a response from backend application in this interval, the user request gets a 502 error. In Application Gateway v2, if the application gateway doesn't receive a response from the backend application in this interval, the request is tried against a second backend pool member. If the second request fails the user request gets a 504 error.
134134
135135
### Solution
136136
@@ -192,17 +192,17 @@ If all the instances of BackendAddressPool are unhealthy, then the application g
192192

193193
Ensure that the instances are healthy and the application is properly configured. Check if the backend instances can respond to a ping from another VM in the same VNet. If configured with a public end point, ensure a browser request to the web application is serviceable.
194194

195-
## Upstream SSL certificate does not match
195+
## Upstream SSL certificate doesn't match
196196

197197
### Cause
198198

199-
The TLS certificate installed on backend servers does not match the hostname received in the Host request header.
199+
The TLS certificate installed on backend servers doesn't match the hostname received in the Host request header.
200200

201-
In scenarios where End-to-end TLS is enabled, a configuration that is achieved by editing the appropriate "Backend HTTP Settings", and changing there the configuration of the "Backend protocol" setting to HTTPS, it is mandatory to ensure that the CNAME of the TLS certificate installed on backend servers matches the hostname coming to the backend in the HTTP host header request.
201+
In scenarios where End-to-end TLS is enabled, a configuration that is achieved by editing the appropriate "Backend HTTP Settings", and changing there the configuration of the "Backend protocol" setting to HTTPS, it's mandatory to ensure that the DNS NAME of the TLS certificate installed on backend servers matches the hostname coming to the backend in the HTTP host header request.
202202

203-
As a reminder, the effect of enabling on the "Backend HTTP Settings" the option of protocol HTTPS rather than HTTP, will be that the second part of the communication that happens between the instances of the Application Gateway and the backend servers will be encrypted with TLS.
203+
As a reminder, the effect of enabling on the "Backend HTTP Settings" the option of protocol HTTPS rather than HTTP, is that the second part of the communication that happens between the instances of the Application Gateway and the backend servers are encrypted with TLS.
204204

205-
Due to the fact that by default Application Gateway sends the same HTTP host header to the backend as it receives from the client, you will need to ensure that the TLS certificate installed on the backend server, is issued with a CNAME that matches the host name received by that backend server in the HTTP host header.
205+
Due to the fact that by default Application Gateway sends the same HTTP host header to the backend as it receives from the client, you need to ensure that the TLS certificate installed on the backend server, is issued with a DNS NAME that matches the host name received by that backend server in the HTTP host header.
206206
Remember that, unless specified otherwise, this hostname would be the same as the one received from the client.
207207

208208
For example:
@@ -211,16 +211,16 @@ Imagine that you have an Application Gateway to serve the https requests for dom
211211

212212
On that Application Gateway you should have a listener for the host www.contoso.com with a rule that has the "Backed HTTP Setting" forced to use protocol HTTPS (ensuring End-to-end TLS). That same rule could have configured a backend pool with two VMs running IIS as Web servers.
213213

214-
As we know enabling HTTPS in the "Backed HTTP Setting" of the rule will make the second part of the communication that happens between the Application Gateway instances and the servers in the backend to use TLS.
214+
As we know enabling HTTPS in the "Backed HTTP Setting" of the rule makes the second part of the communication that happens between the Application Gateway instances and the servers in the backend to use TLS.
215215

216-
If the backend servers do not have a TLS certificate issued for the CNAME www.contoso.com or *.contoso.com, the request will fail with **Server Error: 502 - Web server received an invalid response while acting as a gateway or proxy server** because the upstream SSL certificate (the certificate installed on the backend servers) will not match the hostname in the host header, and hence the TLS negotiation will fail.
216+
If the backend servers do not have a TLS certificate issued for the DNS NAME www.contoso.com or *.contoso.com, the request fails with **Server Error: 502 - Web server received an invalid response while acting as a gateway or proxy server** because the upstream SSL certificate (the certificate installed on the backend servers) doesn't match the hostname in the host header, and hence the TLS negotiation fails.
217217

218218

219219
www.contoso.com --> APP GW front end IP --> Listener with a rule that configures "Backend HTTP Settings" to use protocol HTTPS rather than HTTP --> Backend Pool --> Web server (needs to have a TLS certificate installed for www.contoso.com)
220220

221221
## Solution
222222

223-
it is required that the CNAME of the TLS certificate installed on the backend server, matches the host name configured in the HTTP backend settings, otherwise the second part of the End-to-end communication that happens between the instances of the Application Gateway and the backend, will fail with "Upstream SSL certificate does not match", and will throw back a **Server Error: 502 - Web server received an invalid response while acting as a gateway or proxy server**
223+
It's required that the DNS NAME of the TLS certificate installed on the backend server, matches the host name configured in the HTTP backend settings, otherwise the second part of the End-to-end communication that happens between the instances of the Application Gateway and the backend, fails with "Upstream SSL certificate doesn't match", and throws back a **Server Error: 502 - Web server received an invalid response while acting as a gateway or proxy server**
224224

225225

226226
## Next steps

articles/devtest-labs/devtest-lab-add-vm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ This article describes how to create Azure virtual machines (VMs) in Azure DevTe
3939
- **Virtual machine size**: Keep the default value for the base, or select **Change Size** to select a different size. For more information about default VM sizes, see [Default VM sizes](#default-vm-sizes).
4040
- **Allow hibernation**: Select this option to enable hibernation for the virtual machine.
4141
>[!NOTE]
42-
>If you enable hibernation, you must also select **Public IP** in **Advanced Settings**. **Private** and **Shared** IPs aren't supported if hibernation is enabled.
42+
>If you enable hibernation, you must also select either **Public IP** or **Private IP** in **Advanced Settings**. Hibernation for **Shared IPs** isn't currently supported.
4343
- **OS disk type**: Keep the default value for the base, or select a different option from the dropdown list.
4444
- **Security type**: You can select **Trusted launch** to enable trusted launch for Generation 2 VMs. If you select **Trusted launch**, select the **Enable secure boot**, **Enable vTPM**, and **Integrity monitoring** checkboxes as needed. For more information, see [Trusted Launch for Azure virtual machines](/azure/virtual-machines/trusted-launch).
4545
- **Artifacts**: Optionally, select **Add or Remove Artifacts** to select and configure artifacts to add to the VM. For instructions, see [Add artifacts](#add-artifacts).

articles/devtest-labs/devtest-lab-gen2-vm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ You need at least [user](devtest-lab-add-devtest-user.md#devtest-labs-user) acce
4545
- **Password**: If you don't choose to use a secret, enter a VM password between 8 and 123 characters long.
4646
- **Save as default password**: Select this checkbox to save the password in the Key Vault associated with the lab.
4747
- **Virtual machine size**: Keep the default value for the base, or select **Change Size** to select different sizes.
48-
- **Allow hibernation**: Select this option to enable hibernation for the virtual machine. If you enable Hibernation, you also must select **Public IP** in the Advanced settings as Private and Shared IP are currently not supported if Hibernation is enabled.
48+
- **Allow hibernation**: Select this option to enable hibernation for the virtual machine. If you enable Hibernation, you also must select either **Public IP** or **Private IP** in the Advanced settings. Hibernation for **Shared IPs** isn't currently supported.
4949
- **OS disk type**: Keep the default value for the base, or select a different option from the dropdown list.
5050
- **Security type**: Select **Trusted Launch** to enable it for Generation 2 VMs. On selecting Trusted Launch, the options Secure boot, vTPM, and Integrity Monitoring will appear. Based on your needs, select the appropriate options among them for your deployment. For more information, see [Trusted Launch-enabled security features](/azure/virtual-machines/trusted-launch#secure-boot).
5151
- **Artifacts**: This field shows the number of artifacts already configured for this VM base. Optionally, select **Add or Remove Artifacts** to select and configure artifacts to add to the VM.

articles/devtest-labs/devtest-lab-hibernate-vm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ You need at least [user](devtest-lab-add-devtest-user.md#devtest-labs-user) acce
5555
- **Password**: If you don't choose to use a secret, enter a VM password between 8 and 123 characters long.
5656
- **Save as default password**: Select this checkbox to save the password in the Key Vault associated with the lab.
5757
- **Virtual machine size**: Keep the default value for the base, or select **Change Size** to select different sizes.
58-
- **Allow hibernation**: Select this option to enable hibernation for the virtual machine. If you enable Hibernation, you also must select **Public IP** in the Advanced settings as Private and Shared IP are currently not supported if Hibernation is enabled.
58+
- **Allow hibernation**: Select this option to enable hibernation for the virtual machine. If you enable Hibernation, you also must select either **Public IP** or **Private IP** in the Advanced settings. Hibernation for **Shared IPs** isn't currently supported.
5959
- **OS disk type**: Keep the default value for the base, or select a different option from the dropdown list.
6060
- **Security type**: Select **Trusted Launch** to enable it for Gen2 VMs. On selecting Trusted Launch When the options Secure boot, vTPM, and Integrity Monitoring appear, select the appropriate options for your deployment. For more information, see [Trusted Launch-enabled security features](/azure/virtual-machines/trusted-launch#secure-boot).
6161
- **Artifacts**: This field shows the number of artifacts already configured for this VM base. Optionally, select **Add or Remove Artifacts** to select and configure artifacts to add to the VM.

articles/devtest-labs/devtest-lab-trusted-launch.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ You need at least [user](devtest-lab-add-devtest-user.md#devtest-labs-user) acce
4545
- **Password**: If you don't choose to use a secret, enter a VM password between 8 and 123 characters long.
4646
- **Save as default password**: Select this checkbox to save the password in the Key Vault associated with the lab.
4747
- **Virtual machine size**: Keep the default value for the base, or select **Change Size** to select different sizes.
48-
- **Allow hibernation**: Select this option to enable hibernation for this virtual machine. If you enable Hibernation, you also must select **Public IP** in the Advanced settings as Private and Shared IP are currently not supported if Hibernation is enabled.
48+
- **Allow hibernation**: Select this option to enable hibernation for this virtual machine. If you enable Hibernation, you also must select either **Public IP** or **Private IP** in the Advanced settings. Hibernation for **Shared IPs** isn't currently supported.
4949
- **OS disk type**: Keep the default value for the base, or select a different option from the dropdown list.
5050
- **Security type**: Select **Trusted Launch** to enable it for Generation 2 VMs. On selecting Trusted Launch, the options Secure boot, vTPM, and Integrity Monitoring will appear. Based on your needs, select the appropriate options among them for your deployment. For more information, see [Trusted Launch-enabled security features](/azure/virtual-machines/trusted-launch#secure-boot).
5151
- **Artifacts**: This field shows the number of artifacts already configured for this VM base. Optionally, select **Add or Remove Artifacts** to select and configure artifacts to add to the VM.

articles/devtest-labs/tutorial-create-custom-lab.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ To add a VM to the lab, follow these steps. For more information, see [Create la
8080
- **Virtual machine size**: Keep the default value for the base, or select **Change Size** to select a different size.
8181
- **Allow hibernation**: You can select this checkbox to enable hibernation for this VM. For this tutorial, keep the checkbox deselected.
8282
>[!NOTE]
83-
>If you enable hibernation, you must also select **Public** for **IP Address** in the **Advanced settings**, because **Private** and **Shared** IPs aren't supported if hibernation is enabled.
83+
>If you enable hibernation, you must also select either **Public** or **Private** for **IP Address** in the **Advanced settings**, because hibernation for **Shared** IPs isn't currently supported.
8484
- **OS disk type**: You can select a disk type from the dropdown list. For this tutorial, keep the default value.
8585
- **Artifacts**: You can select **Add or Remove Artifacts** to select and configure artifacts to add to the VM. For more information, see [Add artifacts](devtest-lab-add-vm.md#add-optional-artifacts).
8686

articles/event-hubs/compare-tiers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Compare Azure Event Hubs tiers
33
description: This article compares supported tiers of Azure Event Hubs.
44
ms.topic: article
5-
ms.date: 02/15/2024
5+
ms.date: 04/29/2025
66
---
77

88
# Compare Azure Event Hubs tiers

articles/event-hubs/includes/event-hubs-tier-features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ The following table shows the list of features that are available (or not availa
1818
| Private link | N/A | Yes | Yes | Yes |
1919
| Customer-managed key <br/>(bring your own key) | N/A | N/A | Yes | Yes |
2020
| Capture | N/A | Priced separately | Included | Included |
21-
| Dynamic partition scale-out | N/A | N/A | Yes | Yes |
21+
| Dynamic partitions scale-out | N/A | N/A | Yes | Yes |
2222
| Ingress events | Pay per million events | Pay per million events | Included | Included |
2323
| Runtime audit logs | N/A | N/A | Yes | Yes |
2424
| Availability zone | Yes | Yes | Yes | Yes |

articles/expressroute/expressroute-locations-providers.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: expressroute
55
author: duongau
66
ms.service: azure-expressroute
77
ms.topic: concept-article
8-
ms.date: 04/18/2025
8+
ms.date: 04/29/2025
99
ms.author: duau
1010
ms.custom: references_regions, template-concept, engagement-fy23
1111
---
@@ -20,7 +20,6 @@ The tables in this article provide information on ExpressRoute geographical cove
2020

2121
> [!NOTE]
2222
> Azure regions and ExpressRoute locations are two distinct and different concepts, understanding the difference between the two is critical to exploring Azure hybrid networking connectivity.
23-
>
2423
2524
## Azure regions
2625

@@ -44,6 +43,9 @@ The following table shows connectivity locations and the service providers for e
4443

4544
* **ER Direct** refers to [ExpressRoute Direct](expressroute-erdirect-about.md) support at each peering location. If you want to view the available bandwidth at a location, see [Determine available bandwidth](expressroute-howto-erdirect.md#resources)
4645

46+
> [!NOTE]
47+
> If you are a service provider interested in becoming an ExpressRoute partner, please complete and submit this [Microsoft Form](https://aka.ms/erproviderform).
48+
4749
### Global commercial Azure
4850

4951
#### [A-C](#tab/a-c)

0 commit comments

Comments
 (0)