Skip to content

Commit 4abdebf

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into reliability-aks-edit
2 parents 5679780 + 1e6b578 commit 4abdebf

File tree

168 files changed

+2005
-1837
lines changed

Some content is hidden

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

168 files changed

+2005
-1837
lines changed

.openpublishing.redirection.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3874,6 +3874,11 @@
38743874
"redirect_url": "/azure/firewall/ftp-support",
38753875
"redirect_document_id": false
38763876
},
3877+
{
3878+
"source_path_from_root": "/articles/firewall/long-running-sessions.md",
3879+
"redirect_url": "/azure/firewall/tcp-session-behavior",
3880+
"redirect_document_id": false
3881+
},
38773882
{
38783883
"source_path_from_root": "/articles/firewall/diagnostic-logs.md",
38793884
"redirect_url": "/azure/firewall/monitor-firewall",
@@ -5744,6 +5749,26 @@
57445749
"redirect_url": "/azure/vpn-gateway/point-to-site-vpn-client-cert-windows",
57455750
"redirect_document_id": false
57465751
},
5752+
{
5753+
"source_path_from_root": "/articles/sql-server-stretch-database/sql-server-stretch-database-encryption-tde.md",
5754+
"redirect_url": "/azure/azure-sql/",
5755+
"redirect_document_id": false
5756+
},
5757+
{
5758+
"source_path_from_root": "/articles/sql-server-stretch-database/sql-server-stretch-database-tde-tsql.md",
5759+
"redirect_url": "/azure/azure-sql/",
5760+
"redirect_document_id": false
5761+
},
5762+
{
5763+
"source_path_from_root": "/articles/sql-server-stretch-database/sql-server-stretch-database-index-all-articles.md",
5764+
"redirect_url": "/azure/azure-sql/",
5765+
"redirect_document_id": false
5766+
},
5767+
{
5768+
"source_path_from_root": "/articles/sql-server-stretch-database/index.yml",
5769+
"redirect_url": "/azure/azure-sql/",
5770+
"redirect_document_id": false
5771+
},
57475772
{
57485773
"source_path_from_root": "/articles/vs-azure-tools-access-private-azure-clouds-with-visual-studio.md",
57495774
"redirect_url": "/visualstudio/azure/vs-azure-tools-access-private-azure-clouds-with-visual-studio",

articles/analysis-services/analysis-services-manage-users.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ Power BI Desktop, Visual Studio, and SSMS support Active Directory Universal Aut
3131

3232
If signing in to Azure by using a Windows account, and Universal Authentication is not selected or available (Excel), [Active Directory Federation Services (AD FS)](/windows-server/identity/ad-fs/deployment/how-to-connect-fed-azure-adfs) is required. With Federation, Microsoft Entra ID and Microsoft 365 users are authenticated using on-premises credentials and can access Azure resources.
3333

34+
> [!NOTE]
35+
> When creating a token with custom logic, it must either be a user token or an application service principal and the audience must be set to exactly `https://*.asazure.windows.net`
36+
3437
### SQL Server Management Studio (SSMS)
3538

3639
Azure Analysis Services servers support connections from [SSMS V17.1](/sql/ssms/download-sql-server-management-studio-ssms) and higher by using Windows Authentication, Active Directory Password Authentication, and Active Directory Universal Authentication. In general, it's recommended you use Active Directory Universal Authentication because:

articles/api-management/api-management-capacity.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,6 @@ Access metrics in the portal to understand how much capacity is used over time.
123123
> [!IMPORTANT]
124124
> Currently, the **CPU Percentage of Gateway** and **Memory Consumption of Gateway** metrics also appear in the portal for instances in classic tiers. However, they're not supported for use in classic tiers and show a value of 0.
125125
126-
127-
128-
129-
130126
> [!NOTE]
131127
> * You can set a [metric alert](api-management-howto-use-azure-monitor.md#set-up-an-alert-rule) to let you know when something unexpected is happening. For example, get notifications when your API Management instance has exceeded its expected peak capacity for more than 20 minutes.
132128
> * You can use Azure Monitor [autoscaling](api-management-howto-autoscale.md) to automatically add an Azure API Management unit. Scaling operation can take around 30 minutes, so you should plan your rules accordingly.
@@ -146,8 +142,11 @@ Use capacity metrics for making decisions whether to scale an API Management ins
146142
>[!TIP]
147143
> If you are able to estimate your traffic beforehand, test your API Management instance on workloads you expect. You can increase the request load on your tenant gradually and monitor the value of the capacity metric that corresponds to your peak load. Follow the steps from the previous section to use Azure portal to understand how much capacity is used at any given time.
148144
145+
> [!IMPORTANT]
146+
> When defining autoscaling rules, make sure to avoid autoscaling flapping that will cause a scale in/scale out loop. To learn more, we recommend reading [Azure Monitor Autoscale's guidance around flapping](/azure/azure-monitor/autoscale/autoscale-flapping).
147+
149148
## Related content
150149

151150
- [Upgrade and scale an Azure API Management service instance](upgrade-and-scale.md)
152151
- [Automatically scale an Azure API Management instance](api-management-howto-autoscale.md)
153-
- [Plan and manage costs for API Management](plan-manage-costs.md)
152+
- [Plan and manage costs for API Management](plan-manage-costs.md)

articles/app-service/configure-common.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn how to configure common settings for an Azure App Service app
44
keywords: azure app service, web app, app settings, environment variables
55
ms.assetid: 9af8a367-7d39-4399-9941-b80cbc5f39a0
66
ms.topic: how-to
7-
ms.date: 03/24/2025
7+
ms.date: 03/27/2025
88
ms.custom: devx-track-csharp, devx-track-azurecli, devx-track-azurepowershell, AppServiceConnectivity
99
ms.devlang: azurecli
1010
author: cephalin
@@ -34,10 +34,10 @@ For ASP.NET and ASP.NET Core developers, configuring app settings in App Service
3434
Other language stacks get the app settings as environment variables at runtime. For steps that are specific to each language stack, see:
3535

3636
- [ASP.NET Core](configure-language-dotnetcore.md#access-environment-variables)
37+
- [Java](configure-language-java-data-sources.md)
3738
- [Node.js](configure-language-nodejs.md#access-environment-variables)
38-
- [PHP](configure-language-php.md#access-environment-variables)
3939
- [Python](configure-language-python.md#access-app-settings-as-environment-variables)
40-
- [Java](configure-language-java-data-sources.md)
40+
- [PHP](configure-language-php.md#access-environment-variables)
4141
- [Custom containers](configure-custom-container.md#configure-environment-variables)
4242

4343
App settings are always encrypted when they're stored (encrypted at rest).
@@ -230,10 +230,10 @@ At runtime, connection strings are available as environment variables, prefixed
230230
For example, a MySQL connection string named *connectionstring1* can be accessed as the environment variable `MYSQLCONNSTR_connectionString1`. For steps that are specific to each language stack, see:
231231

232232
- [ASP.NET Core](configure-language-dotnetcore.md#access-environment-variables)
233+
- [Java](configure-language-java-data-sources.md)
233234
- [Node.js](configure-language-nodejs.md#access-environment-variables)
234-
- [PHP](configure-language-php.md#access-environment-variables)
235235
- [Python](configure-language-python.md#access-environment-variables)
236-
- [Java](configure-language-java-data-sources.md)
236+
- [PHP](configure-language-php.md#access-environment-variables)
237237
- [Custom containers](configure-custom-container.md#configure-environment-variables)
238238

239239
Connection strings are always encrypted when they're stored (encrypted at rest).
@@ -411,10 +411,10 @@ It's not possible to edit connection strings in bulk by using a JSON file with A
411411
To configure language stack settings, see these resources:
412412

413413
- [ASP.NET Core](configure-language-dotnetcore.md)
414+
- [Java](configure-language-java-deploy-run.md)
414415
- [Node.js](configure-language-nodejs.md)
415-
- [PHP](configure-language-php.md)
416416
- [Python](configure-language-python.md)
417-
- [Java](configure-language-java-deploy-run.md)
417+
- [PHP](configure-language-php.md)
418418

419419
<a name="alwayson"></a>
420420

0 commit comments

Comments
 (0)