Skip to content

Commit 0cb970b

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into lambda-functions
2 parents 9ff1235 + 6d980da commit 0cb970b

File tree

198 files changed

+7415
-26198
lines changed

Some content is hidden

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

198 files changed

+7415
-26198
lines changed

articles/api-management/api-management-howto-developer-portal-customize.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: dlepow
66

77
ms.service: azure-api-management
88
ms.topic: tutorial
9-
ms.date: 03/29/2024
9+
ms.date: 04/28/2025
1010
ms.author: danlep
1111
ms.custom: engagement-fy23
1212
---
@@ -28,7 +28,7 @@ In this tutorial, you learn how to:
2828
2929
For more information about developer portal features and options, see [Azure API Management developer portal overview](developer-portal-overview.md).
3030

31-
:::image type="content" source="media/api-management-howto-developer-portal-customize/cover.png" alt-text="Screenshot of the API Management developer portal - administrator mode." border="false":::
31+
:::image type="content" source="media/api-management-howto-developer-portal-customize/cover.png" alt-text="Screenshot of the API Management developer portal - administrator mode." :::
3232

3333
## Prerequisites
3434

@@ -49,6 +49,8 @@ Follow these steps to access the managed version of the developer portal.
4949
It might take a few minutes to enable the developer portal.
5050
1. In the left menu, under **Developer portal**, select **Portal overview**. Then select the **Developer portal** button in the top navigation bar. A new browser tab with an administrative version of the portal will open.
5151

52+
[!INCLUDE [developer-portal-editor-refresh](../../includes/developer-portal-editor-refresh.md)]
53+
5254
## Understand the portal's administrative interface
5355

5456
[!INCLUDE [api-management-developer-portal-editor](../../includes/api-management-developer-portal-editor.md)]
@@ -70,7 +72,7 @@ You'll want to use your own images and other media content in the developer port
7072

7173
A placeholder logo is provided in the top left corner of the navigation bar. You can replace it with your own logo to match your organization's branding.
7274

73-
1. In the developer portal, select the default **Contoso** logo in the top left of the navigation bar.
75+
1. In the developer portal, select the default logo in the top left of the navigation bar.
7476
1. Select **Edit**.
7577
1. In the **Picture** pop-up, under **Main**, select **Source**.
7678
1. In the **Media** pop-up, select one of the following:

articles/api-management/developer-portal-overview.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: dlepow
77

88
ms.service: azure-api-management
99
ms.topic: concept-article
10-
ms.date: 03/29/2024
10+
ms.date: 04/28/2025
1111
ms.author: danlep
1212
---
1313

@@ -76,21 +76,18 @@ The developer portal's administrative interface provides a visual editor for pub
7676

7777
[!INCLUDE [api-management-developer-portal-add](../../includes/api-management-developer-portal-add.md)]
7878

79-
[!INCLUDE [api-management-developer-portal-wordpress](../../includes/api-management-developer-portal-wordpress.md)]
79+
### Pages and layouts
8080

81+
The pre-provisioned content in the developer portal showcases pages with commonly used features. Find them on the **Pages** panel. You can modify the content of these pages or add new ones to suit your needs.
8182

82-
### Layouts and pages
83-
84-
Layouts define how pages are displayed. For example, in the default content, there are two layouts: one applies to the home page, and the other to all remaining pages. You can modify these layouts and add more layouts to suit your needs.
83+
Select **Layouts** on the **Pages** panel to define how pages are displayed. The developer portal comes with a default layout that's applied to the pages. You can modify this layout and add more layouts to suit your needs.
8584

8685
A layout gets applied to a page by matching its URL template to the page's URL. For example, a layout with a URL template of `/wiki/*` is applied to every page with the `/wiki/` segment in the URL: `/wiki/getting-started`, `/wiki/styles`, etc.
8786

8887
In the following image, content belonging to the layout is outlined in blue, while the page-specific content is outlined in red.
8988

9089
:::image type="content" source="media/developer-portal-overview/pages-layouts.png" alt-text="Screenshot of layout content in the developer portal." :::
9190

92-
The pre-provisioned content in the developer portal showcases pages with commonly used features. You can modify the content of these pages or add new ones to suit your needs.
93-
9491
> [!NOTE]
9592
> Due to integration considerations, the following pages can't be removed or moved under a different URL: `/404`, `/500`, `/captcha`, `/change-password`, `/config.json`, `/confirm/invitation`, `/confirm-v2/identities/basic/signup`, `/confirm-v2/password`, `/internal-status-0123456789abcdef`, `/publish`, `/signin`, `/signin-sso`, `/signup`.
9693
@@ -248,7 +245,8 @@ To restore a previous portal revision:
248245
If you want to discard all changes you've made to the developer portal, you can reset the website to its starting state. Resetting the portal deletes any changes you've made to the developer portal pages, layouts, customizations, and uploaded media.
249246

250247
> [!NOTE]
251-
> Resetting the developer portal doesn't delete the published version of the developer portal.
248+
> * Resetting the developer portal doesn't delete the published version of the developer portal.
249+
> * Resetting the portal could update the portal to a newer version of the developer portal codebase with updated components. The placeholder content that appears might also be changed. Developer portal features and customization options remain consistent.
252250
253251
To reset the developer portal:
254252

300 KB
Loading
5.07 KB
Loading
300 KB
Loading
60.4 KB
Loading

articles/app-service/app-service-hybrid-connections.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn how to create and use hybrid connections in Azure App Service
44
author: madsd
55
ms.assetid: 66774bde-13f5-45d0-9a70-4e9536a4f619
66
ms.topic: article
7-
ms.date: 04/10/2025
7+
ms.date: 04/29/2025
88
ms.author: madsd
99
ms.custom: "UpdateFrequency3, fasttrack-edit"
1010
#customer intent: As an app developer, I want to understand the usage of Hybrid Connections to provide access to apps in Azure App Service.
@@ -237,10 +237,10 @@ The status of **Connected** means that at least one HCM is configured with that
237237

238238
:::image type="content" source="media/app-service-hybrid-connections/hybrid-connections-service-bus-endpoint.png" alt-text="Screenshot of Hybrid Connection Service Bus endpoint.":::
239239

240-
- The Service Bus gateways are the resources that accept the request into the Hybrid Connection and pass it through the Azure Relay. You need to allowlist all 128 of the gateways. The gateways are in the format: `G#-prod-[stamp]-sb.servicebus.windows.net`. The number sign, `#`, is a number between 0 and 127 and `stamp` is the name of the instance within your Azure data center where your Service Bus endpoint exists.
240+
- The Service Bus gateways are the resources that accept the request into the Hybrid Connection and pass it through the Azure Relay. You need to allowlist all of the gateways. The gateways are in the format: `G#-prod-[stamp]-sb.servicebus.windows.net` and `GV#-prod-[stamp]-sb.servicebus.windows.net`. The number sign, `#`, is a number between 0 and 127 and `stamp` is the name of the instance within your Azure data center where your Service Bus endpoint exists.
241241

242242
- If you can use a wildcard, you can allowlist *\*.servicebus.windows.net*.
243-
- If you can't use a wildcard, you must allowlist all 128 gateways.
243+
- If you can't use a wildcard, you must allowlist all 256 of the gateways.
244244

245245
You can find out the stamp using *nslookup* on the Service Bus endpoint URL.
246246

@@ -255,6 +255,13 @@ The status of **Connected** means that at least one HCM is configured with that
255255
...
256256
G126-prod-sn3-010-sb.servicebus.windows.net
257257
G127-prod-sn3-010-sb.servicebus.windows.net
258+
GV0-prod-sn3-010-sb.servicebus.windows.net
259+
GV1-prod-sn3-010-sb.servicebus.windows.net
260+
GV2-prod-sn3-010-sb.servicebus.windows.net
261+
GV3-prod-sn3-010-sb.servicebus.windows.net
262+
...
263+
GV126-prod-sn3-010-sb.servicebus.windows.net
264+
GV127-prod-sn3-010-sb.servicebus.windows.net
258265

259266
If your status says **Connected** but your app can't reach your endpoint then:
260267

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/automation/add-user-assigned-identity.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ PATCH
120120
"identity": {
121121
"type": "SystemAssigned, UserAssigned",
122122
"userAssignedIdentities": {
123-
"/subscriptions/ffffffff-eeee-dddd-cccc-bbbbbbbbbbb0/resourceGroups/resource-group-name/providers/Microsoft.ManagedIdentity/userAssignedIdentities/firstIdentity": {},
124-
"/subscriptions/ffffffff-eeee-dddd-cccc-bbbbbbbbbbb0/resourceGroups/resource-group-name/providers/Microsoft.ManagedIdentity/userAssignedIdentities/secondIdentity": {}
123+
"/subscriptions/00a000aa-00a0-00aa-00aa-0a0aa000aa00/resourceGroups/resource-group-name/providers/Microsoft.ManagedIdentity/userAssignedIdentities/firstIdentity": {},
124+
"/subscriptions/00a000aa-00a0-00aa-00aa-0a0aa000aa00/resourceGroups/resource-group-name/providers/Microsoft.ManagedIdentity/userAssignedIdentities/secondIdentity": {}
125125
}
126126
}
127127
}
@@ -130,7 +130,7 @@ PATCH
130130
The syntax of the API is as follows:
131131

132132
```http
133-
https://management.azure.com/subscriptions/ffffffff-eeee-dddd-cccc-bbbbbbbbbbb0/resourceGroups/resource-group-name/providers/Microsoft.Automation/automationAccounts/automation-account-name?api-version=2020-01-13-preview
133+
https://management.azure.com/subscriptions/00a000aa-00a0-00aa-00aa-0a0aa000aa00/resourceGroups/resource-group-name/providers/Microsoft.Automation/automationAccounts/automation-account-name?api-version=2020-01-13-preview
134134
```
135135

136136
#### Example
@@ -176,15 +176,15 @@ Perform the following steps.
176176
```json
177177
{
178178
"type": "SystemAssigned, UserAssigned",
179-
"principalId": "ffffffff-eeee-dddd-cccc-bbbbbbbbbbb0",
180-
"tenantId": "ffffffff-eeee-dddd-cccc-bbbbbbbbbbb0",
179+
"principalId": "00a000aa-00a0-00aa-00aa-0a0aa000aa00",
180+
"tenantId": "00a000aa-00a0-00aa-00aa-0a0aa000aa00",
181181
"userAssignedIdentities": {
182182
"/subscriptions/ContosoID/resourcegroups/ContosoLab/providers/Microsoft.ManagedIdentity/userAssignedIdentities/ContosoUAMI1": {
183-
"PrincipalId": "ffffffff-eeee-dddd-cccc-bbbbbbbbbbb0",
183+
"PrincipalId": "00a000aa-00a0-00aa-00aa-0a0aa000aa00",
184184
"ClientId": "00001111-aaaa-2222-bbbb-3333cccc4444"
185185
},
186186
"/subscriptions/ContosoID/resourcegroups/ContosoLab/providers/Microsoft.ManagedIdentity/userAssignedIdentities/ContosoUAMI2": {
187-
"PrincipalId": "ffffffff-eeee-dddd-cccc-bbbbbbbbbbb0",
187+
"PrincipalId": "00a000aa-00a0-00aa-00aa-0a0aa000aa00",
188188
"ClientId": "00001111-aaaa-2222-bbbb-3333cccc4444"
189189
}
190190
}

0 commit comments

Comments
 (0)