Skip to content

Commit 249acfe

Browse files
authored
Merge branch 'main' into optimum-service-level
2 parents 2931fdd + 75a3504 commit 249acfe

File tree

207 files changed

+7671
-3900
lines changed

Some content is hidden

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

207 files changed

+7671
-3900
lines changed

.openpublishing.redirection.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2010,6 +2010,21 @@
20102010
"redirect_url": "./azure-resource-manager/management/deployment-models",
20112011
"redirect_document_id": false
20122012
},
2013+
{
2014+
"source_path_from_root": "/articles/azure-functions/functions-add-output-binding-storage-queue-java.md",
2015+
"redirect_url": "/azure/azure-functions/functions-add-output-binding-storage-queue-cli?pivots=programming-language-java",
2016+
"redirect_document_id": false
2017+
},
2018+
{
2019+
"source_path_from_root": "/articles/azure-functions/create-first-function-arc-custom-container.md",
2020+
"redirect_url": "/azure/azure-functions/functions-how-to-custom-container?pivots=azure-arc",
2021+
"redirect_document_id": false
2022+
},
2023+
{
2024+
"source_path_from_root": "/articles/azure-functions/create-first-function-arc-cli.md",
2025+
"redirect_url": "/azure/azure-functions/functions-how-to-custom-container?pivots=azure-arc",
2026+
"redirect_document_id": false
2027+
},
20132028
{
20142029
"source_path_from_root": "/articles/azure-functions/create-first-function-vs-code-web.md",
20152030
"redirect_url": "/azure/azure-functions",

articles/active-directory-b2c/tutorial-create-user-flows.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,9 @@ Next, specify that the application should be treated as a public client:
210210
1. In the left menu, under **Manage**, select **Authentication**.
211211
1. Under **Advanced settings**, in the **Allow public client flows** section, set **Enable the following mobile and desktop flows** to **Yes**.
212212
1. Select **Save**.
213-
1. Ensure that **"allowPublicClient": true** is set in the application manifest:
213+
1. Ensure that **"isFallbackPublicClient": true** is set in the application manifest:
214214
1. In the left menu, under **Manage**, select **Manifest** to open application manifest.
215-
1. Find **allowPublicClient** key and ensure its value is set to **true**.
215+
1. Find **isFallbackPublicClient** key and ensure its value is set to **true**.
216216

217217
Now, grant permissions to the API scope you exposed earlier in the *IdentityExperienceFramework* registration:
218218

articles/api-management/api-management-region-availability.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Information in the following table is updated regularly. Capacity availability i
3939
| Korea Central |||| |
4040
| North Central US ||| ||
4141
| North Europe ||| ||
42-
| Norway East |||| |
42+
| Norway East |||| |
4343
| South Africa North ||| | |
4444
| South Central US ||| | |
4545
| South India ||| | |

articles/app-service/monitor-instances-health-check.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,18 @@ If you're using your own authentication system, the Health check path must allow
7474

7575
```C#
7676
using System;
77+
using System.Security.Cryptography;
7778
using System.Text;
7879

7980
/// <summary>
8081
/// Method <c>HeaderMatchesEnvVar</c> returns true if <c>headerValue</c> matches WEBSITE_AUTH_ENCRYPTION_KEY.
8182
/// </summary>
82-
public Boolean HeaderMatchesEnvVar(string headerValue) {
83-
var sha = System.Security.Cryptography.SHA256.Create();
84-
String envVar = Environment.GetEnvironmentVariable("WEBSITE_AUTH_ENCRYPTION_KEY");
85-
String hash = System.Convert.ToBase64String(sha.ComputeHash(Encoding.UTF8.GetBytes(envVar)));
86-
return hash == headerValue;
83+
public bool HeaderMatchesEnvVar(string headerValue)
84+
{
85+
var sha = SHA256.Create();
86+
string envVar = Environment.GetEnvironmentVariable("WEBSITE_AUTH_ENCRYPTION_KEY");
87+
string hash = Convert.ToBase64String(sha.ComputeHash(Encoding.UTF8.GetBytes(envVar)));
88+
return string.Equals(hash, headerValue, StringComparison.Ordinal);
8789
}
8890
```
8991

@@ -200,6 +202,9 @@ Imagine you have two applications (or one app with a slot) with Health check ena
200202

201203
If all instances of your application are unhealthy, App Service won't remove instances from the load balancer. In this scenario, taking all unhealthy app instances out of the load balancer rotation would effectively cause an outage for your application. However, the instance replacement will still occur.
202204

205+
### What happens during a slot swap?
206+
Health check configuration is not slot-specific, so after a swap, the Health check configuration of the swapped slot will be applied to the destination slot and vice-versa. For example, if you have Health Check enabled for your staging slot the endpoint configured will be applied to the production slot after a swap.
207+
203208
### Does Health check work on App Service Environments?
204209

205210
Yes, health check is available for App Service Environment v3, but not for versions 1 or 2. If you're using the older versions of App Service Environment, you can use the [migration feature](environment/migrate.md) to migrate your App Service Environment to version 3.

articles/application-gateway/create-url-route-portal.md

Lines changed: 15 additions & 17 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: tutorial
8-
ms.date: 09/03/2024
8+
ms.date: 02/05/2025
99
ms.author: greglin
1010
#Customer intent: As an IT administrator, I want to use the Azure portal to set up an application gateway so I can route my app traffic based on path-based routing rules.
1111
---
@@ -25,15 +25,12 @@ In this article, you learn how to:
2525
2626
:::image type="content" source="./media/application-gateway-create-url-route-portal/scenario.png" alt-text="Diagram of application gateway URL routing example." lightbox="./media/application-gateway-create-url-route-portal/scenario.png":::
2727

28-
[!INCLUDE [updated-for-az](~/reusable-content/ce-skilling/azure/includes/updated-for-az.md)]
29-
3028
If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
3129

3230
## Prerequisites
3331

3432
- An Azure subscription
3533

36-
3734
## Create virtual machines
3835

3936
In this example, you create three virtual machines to be used as backend servers for the application gateway. You also install IIS on the virtual machines to verify that the application gateway works as expected.
@@ -125,7 +122,7 @@ In this example, you create three virtual machines to be used as backend servers
125122
126123
### Backends tab
127124
128-
The backend pool is used to route requests to the backend servers that serve the request. Backend pools can be composed of NICs, virtual machine scale sets, public IPs, internal IPs, fully qualified domain names (FQDN), and multi-tenant backends like Azure App Service.
125+
The backend pool is used to route requests to the backend servers that serve the request. Backend pools can be composed of NICs, virtual machine scale sets, public IPs, internal IPs, fully qualified domain names (FQDN), and multitenant backends like Azure App Service.
129126
130127
1. On the **Backends** tab, select **Add a backend pool**.
131128
@@ -159,21 +156,22 @@ On the **Configuration** tab, you'll connect the frontend and backend pool you c
159156
160157
4. On the **Backend targets** tab, select **myBackendPool** for the **Backend target**.
161158
162-
5. For the **HTTP setting**, select **Add new** to create a new HTTP setting. The HTTP setting will determine the behavior of the routing rule.
159+
5. For the **Backend settings**, select **Add new** to create a new HTTP setting. The HTTP setting will determine the behavior of the routing rule.
163160
164-
6. In the **Add an HTTP setting** window that opens, enter *myHTTPSetting* for the **HTTP setting name**. Accept the default values for the other settings in the **Add an HTTP setting** window, then select **Add** to return to the **Add a routing rule** window.
161+
6. In the **Add Backend setting** window that opens, enter *myHTTPSetting* for the **Backend settings name**. Accept the default values for the other settings in the **Add Backend setting** window, then select **Add** to return to the **Add a routing rule** window.
165162
7. Under **Path-based routing**, select **Add multiple targets to create a path-based rule**.
166-
8. For **Path**, type */images/*\*.
167-
9. For **Target name**, type *Images*.
168-
10. For **HTTP setting**, select **myHTTPSetting**
169-
11. For **Backend target**, select **Images**.
170-
12. Select **Add** to save the path rule and return to the **Add a routing rule** tab.
171-
13. Repeat to add another rule for Video.
172-
14. Select **Add** to add the routing rule and return to the **Configuration** tab.
173-
15. Select **Next: Tags** and then **Next: Review + create**.
163+
1. Under **Path based rules**, select **Add multiple targets to create a path-based rule**.
164+
1. For **Path**, type */images/*\*.
165+
1. For **Target name**, type *Images*.
166+
1. For **Backend settings**, select **myHTTPSetting**
167+
1. For **Backend target**, select **myBackendPool**.
168+
1. Select **Add** to save the path rule and return to the **Add a routing rule** tab.
169+
1. Repeat to add another rule for Video.
170+
1. Select **Add** to add the routing rule and return to the **Configuration** tab.
171+
1. Select **Next: Tags** and then **Next: Review + create**.
174172
175173
> [!NOTE]
176-
> You do not need to add a custom */** path rule to handle default cases. This is automatically handled by the default backend pool.
174+
> You don't need to add a custom */** path rule to handle default cases. This is automatically handled by the default backend pool.
177175
178176
> [!NOTE]
179177
> Wildcard delimiter **\*** is only honored at the end of the rule. For more information and supported path based rules examples, see [URL Path Based Routing overview](url-route-overview.md#pathpattern).
@@ -187,7 +185,7 @@ Review the settings on the **Review + create** tab, and then select **Create** t
187185
188186
1. Select **All resources**, and then select **myAppGateway**.
189187
190-
![Screenshot of record application gateway public IP address.](./media/application-gateway-create-url-route-portal/application-gateway-record-ag-address.png)
188+
:::image type="content" source="./media/application-gateway-create-url-route-portal/application-gateway-record-ag-address.png" alt-text="Screenshot of record application gateway public IP address.":::
191189
192190
2. Copy the public IP address, and then paste it into the address bar of your browser. Such as, http:\//203.0.113.10:8080.
193191
Loading
Loading
-2.44 KB
Loading
Loading
-13 KB
Loading

0 commit comments

Comments
 (0)