Skip to content

Commit 202b9c8

Browse files
authored
Merge pull request #299238 from MicrosoftDocs/main
Merge main to live, 4 AM
2 parents a07ea00 + 6a88102 commit 202b9c8

File tree

159 files changed

+224
-177
lines changed

Some content is hidden

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

159 files changed

+224
-177
lines changed
-22.9 KB
Loading

articles/app-service/reference-app-settings.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ The following environment variables are related to the app environment in genera
4141
| `WEBSITE_PROACTIVE_AUTOHEAL_ENABLED` | By default, a VM instance is proactively corrected when it uses more than 90% of allocated memory for more than 30 seconds, or when 80% of the total requests in the last two minutes take longer than 200 seconds. If a VM instance triggers one of these rules, the recovery process is an overlapping restart of the instance.<br/><br/>Set to `false` to disable this recovery behavior. The default is `true`.<br/><br/>For more information, see the [Introducing Proactive Auto Heal](https://azure.github.io/AppService/2017/08/17/Introducing-Proactive-Auto-Heal.html) blog post. |
4242
| `WEBSITE_PROACTIVE_CRASHMONITORING_ENABLED` | Whenever the w3wp.exe process on a VM instance of your app crashes due to an unhandled exception for more than three times in 24 hours, a debugger process is attached to the main worker process on that instance. The debugger process collects a memory dump when the worker process crashes again. This memory dump is then analyzed, and the call stack of the thread that caused the crash is logged in your App Service logs.<br/><br/>Set to `false` to disable this automatic monitoring behavior. The default is `true`.<br/><br/>For more information, see the [Proactive Crash Monitoring in Azure App Service](https://azure.github.io/AppService/2021/03/01/Proactive-Crash-Monitoring-in-Azure-App-Service.html) blog post. |
4343
| `WEBSITE_DAAS_STORAGE_SASURI` | During crash monitoring (proactive or manual), the memory dumps are deleted by default. To save the memory dumps to a storage blob container, specify the shared access signature (SAS) URI. |
44-
| `WEBSITE_CRASHMONITORING_ENABLED` | Set to `true` to enable [crash monitoring](https://azure.github.io/AppService/2020/08/11/Crash-Monitoring-Feature-in-Azure-App-Service.html) manually. You must also set `WEBSITE_DAAS_STORAGE_SASURI` and `WEBSITE_CRASHMONITORING_SETTINGS`. The default is `false`.<br/><br/>This setting has no effect if remote debugging is enabled. Also, if this setting is set to `true`, [proactive crash monitoring](https://azure.github.io/AppService/2021/03/01/Proactive-Crash-Monitoring-Feature-in-Azure-App-Service.html) is disabled. |
44+
| `WEBSITE_CRASHMONITORING_ENABLED` | Set to `true` to enable [crash monitoring](https://azure.github.io/AppService/2020/08/11/Crash-Monitoring-Feature-in-Azure-App-Service.html) manually. You must also set `WEBSITE_DAAS_STORAGE_SASURI` and `WEBSITE_CRASHMONITORING_SETTINGS`. The default is `false`.<br/><br/>This setting has no effect if remote debugging is enabled. Also, if this setting is set to `true`, [proactive crash monitoring](https://azure.github.io/AppService/2021/03/01/Proactive-Crash-Monitoring-in-Azure-App-Service.html) is disabled. |
4545
| `WEBSITE_CRASHMONITORING_SETTINGS` | JSON with the following format:`{"StartTimeUtc": "2020-02-10T08:21","MaxHours": "<elapsed-hours-from-StartTimeUtc>","MaxDumpCount": "<max-number-of-crash-dumps>"}`. Required to configure [crash monitoring](https://azure.github.io/AppService/2020/08/11/Crash-Monitoring-Feature-in-Azure-App-Service.html) if `WEBSITE_CRASHMONITORING_ENABLED` is specified. To log the call stack without saving the crash dump in the storage account, add `,"UseStorageAccount":"false"` in the JSON. |
4646
| `REMOTEDEBUGGINGVERSION` | Remote debugging version. |
4747
| `WEBSITE_CONTENTAZUREFILECONNECTIONSTRING` | By default, App Service creates a shared storage for you at app creation. To use a custom storage account instead, set to the connection string of your storage account. For functions, see [App settings reference for Azure Functions](../azure-functions/functions-app-settings.md#website_contentazurefileconnectionstring).<br/><br/>Example: `DefaultEndpointsProtocol=https;AccountName=<name>;AccountKey=<key>` |
@@ -180,6 +180,7 @@ This section shows the configurable runtime settings for each supported language
180180
| `WEBSITE_JAVA_MAX_HEAP_MB` | Java maximum heap, in megabytes. This setting is effective only when you use an experimental Tomcat version. |
181181
| `WEBSITE_DISABLE_JAVA_HEAP_CONFIGURATION` | Manually disable `WEBSITE_JAVA_MAX_HEAP_MB` by setting this variable to `true` or `1`. |
182182
| `WEBSITE_AUTH_SKIP_PRINCIPAL` | By default, the following Tomcat [HttpServletRequest interfaces](https://tomcat.apache.org/tomcat-5.5-doc/servletapi/javax/servlet/http/HttpServletRequest.html) are hydrated when you enable the built-in [authentication](overview-authentication-authorization.md): `isSecure`, `getRemoteAddr`, `getRemoteHost`, `getScheme`, `getServerPort`, `getLocalPort`, `getRequestURL`. To disable it, set the value to `1`. |
183+
| `WEBSITE_AUTH_EXPIRED_SESSION_LOGOFF` | If a webapp uses EasyAuth, set this to `true` or `1` to force a redirect to the EasyAuth logout page if the session associated to a request has expired (e.g. for webapps running on Tomcat, this is defined by the element `session-timeout` in the file `web.xml`). |
183184
| `WEBSITE_SKIP_FILTERS` | To disable all servlet filters that App Service added, set to `1`. |
184185
| `IGNORE_CATALINA_BASE` | By default, App Service checks if the Tomcat variable `CATALINA_BASE` is defined. If not, it looks for the existence of `%HOME%\tomcat\conf\server.xml`. If the file exists, it sets `CATALINA_BASE` to `%HOME%\tomcat`. To disable this behavior and remove `CATALINA_BASE`, set this variable to `1` or `true`. |
185186
| `PORT` | Read-only. For Linux apps, the port that the Java runtime listens to in the container. |

articles/automation/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,4 +134,4 @@ You can review the prices associated with Azure Automation on the [pricing](http
134134

135135
> [!div class="nextstepaction"]
136136
> [Create an Automation account](./quickstarts/create-azure-automation-account-portal.md)
137-
> [Well-architected recommendations for implementing automation](/azure/well-architected/operational-excellence/automate-tasks.md/azure/well-architected/operational-excellence/automate-tasks#evaluate-tasks-to-automate)
137+
> [Well-architected recommendations for implementing automation](/azure/well-architected/operational-excellence/automate-tasks#evaluate-tasks-to-automate)

articles/azure-functions/functions-create-your-first-function-visual-studio.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: "Quickstart: Create your first C# function in Azure using Visual Studio"
33
description: "In this quickstart, you learn how to use Visual Studio to create and publish a C# HTTP triggered function to Azure Functions."
44
ms.assetid: 82db1177-2295-4e39-bd42-763f6082e796
55
ms.topic: quickstart
6-
ms.date: 02/28/2023
6+
ms.date: 05/01/2025
77
ms.devlang: csharp
88
ms.custom: devx-track-csharp, mvc, devcenter, vs-azure, 23113853-34f2-4f, mode-ui, ai-video-demo
99
ai-usage: ai-assisted
@@ -95,7 +95,7 @@ After you've verified that the function runs correctly on your local computer, i
9595

9696
## Publish the project to Azure
9797

98-
Visual Studio can publish your local project to Azure. Before you can publish your project, you must have a function app in your Azure subscription. If you don't already have a function app in Azure, Visual Studio publishing creates one for you the first time you publish your project. In this article, you create a function app and related Azure resources.
98+
Visual Studio can publish your local project to Azure. Before you can publish your project, you must have a function app in your Azure subscription. If you don't already have a function app in Azure, Visual Studio can help you create one before you publish your project. In this article, you create a function app that runs on Linux in a Flex Consumption plan, which is the recommended plan for event-driven and secure serverless functions.
9999

100100
[!INCLUDE [Publish the project to Azure](../../includes/functions-vstools-publish.md)]
101101

@@ -105,7 +105,7 @@ Visual Studio can publish your local project to Azure. Before you can publish yo
105105

106106
1. Under **Functions**, select your new function named **HttpExample**, then in the function page select **Get function URL** and then the **Copy to clipboard icon**.
107107

108-
1. In the address bar in your browser, paste the URL you just copied and run the request.
108+
1. In the address bar in your browser, paste the URL you copied and run the request.
109109

110110
The URL that calls your HTTP trigger function is in the following format:
111111

@@ -119,7 +119,7 @@ Visual Studio can publish your local project to Azure. Before you can publish yo
119119

120120
*Resources* in Azure refer to function apps, functions, storage accounts, and so forth. They're grouped into *resource groups*, and you can delete everything in a group by deleting the group.
121121

122-
You created Azure resources to complete this quickstart. You may be billed for these resources, depending on your [account status](https://azure.microsoft.com/account/) and [service pricing](https://azure.microsoft.com/pricing/). Other quickstarts in this collection build upon this quickstart. If you plan to work with subsequent quickstarts, tutorials, or with any of the services you've created in this quickstart, don't clean up the resources.
122+
You created Azure resources to complete this quickstart. You could be billed for these resources, depending on your [account status](https://azure.microsoft.com/account/) and [service pricing](https://azure.microsoft.com/pricing/). Other quickstarts in this collection build upon this quickstart. If you plan to work with subsequent quickstarts, tutorials, or with any of the services you've created in this quickstart, don't clean up the resources.
123123

124124
[!INCLUDE [functions-vstools-cleanup](../../includes/functions-vstools-cleanup.md)]
125125

articles/azure-functions/functions-premium-plan.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Azure Functions Premium plan
33
description: Learn about details and configuration options (virtual network, no cold start, unlimited execution duration) for the Azure Functions Premium plan.
44
author: nzthiago
55
ms.topic: concept-article
6-
ms.date: 04/04/2025
6+
ms.date: 05/01/2025
77
ms.author: thalme
88
ms.custom: references_regions, fasttrack-edit, devx-track-azurepowershell, build-2024
99
---
@@ -56,21 +56,21 @@ In the Premium plan, you can have your app always ready on a specified number of
5656

5757
This app-level setting also controls your plan's minimum instances. For example, consider having three function apps in the same Premium plan. When two of your apps have always-ready instance count set to one, and the third app is set to five, the minimum number for your whole plan is five. This also reflects the minimum number of instances for which your plan is billed. The maximum number of always-ready instances we support per app is 20.
5858

59-
# [Portal](#tab/portal)
59+
#### [Portal](#tab/portal)
6060

6161
You can configure the number of always ready instances in the Azure portal by selecting your **Function App**, going to the **Platform Features** tab, and selecting the **Scale Out** options. In the function app edit window, always ready instances are specific to that app.
6262

6363
:::image type="content" source="media/functions-premium-plan/scale-out.png" alt-text="Screenshot that shows the elastic scale settings in the portal.":::
6464

65-
# [Azure CLI](#tab/azurecli)
65+
#### [Azure CLI](#tab/azurecli)
6666

6767
You can also configure always ready instances for an app by using the Azure CLI.
6868

6969
```azurecli-interactive
7070
az functionapp update -g <RESOURCE_GROUP> -n <FUNCTION_APP_NAME> --set siteConfig.minimumElasticInstanceCount=<YOUR_ALWAYS_READY_COUNT>
7171
```
7272

73-
# [Azure PowerShell](#tab/azure-powershell)
73+
#### [Azure PowerShell](#tab/azure-powershell)
7474

7575
You can also configure always ready instances for an app by using Azure PowerShell.
7676

@@ -99,19 +99,19 @@ Consider this example that shows how always ready instances and prewarmed instan
9999
1. As load increases and your app needs more instances to handle HTTP traffic, that prewarmed instance is swapped to an active instance. HTTP load is now routed to all three instances, and a fourth instance is instantly provisioned to fill the prewarmed buffer.
100100
1. This sequence of scaling and prewarming continues until the maximum instance count for the app is reached or load decreases causing the platform to scale back in after a period. No instances are prewarmed or activated beyond the maximum.
101101

102-
# [Portal](#tab/portal)
102+
#### [Portal](#tab/portal)
103103

104104
You can't change the prewarmed instance count setting in the portal. You must instead use the Azure CLI or Azure PowerShell.
105105

106-
# [Azure CLI](#tab/azurecli)
106+
#### [Azure CLI](#tab/azurecli)
107107

108108
You can modify the number of prewarmed instances for an app using the Azure CLI.
109109

110110
```azurecli-interactive
111111
az functionapp update -g <RESOURCE_GROUP> -n <FUNCTION_APP_NAME> --set siteConfig.preWarmedInstanceCount=<YOUR_PREWARMED_COUNT>
112112
```
113113

114-
# [Azure PowerShell](#tab/azure-powershell)
114+
#### [Azure PowerShell](#tab/azure-powershell)
115115

116116
You can modify the number of prewarmed instances for an app using the Azure PowerShell.
117117

articles/backup/troubleshoot-sap-ase-sybase-database-backup.md

Lines changed: 52 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Troubleshooting SAP ASE (Sybase) database backup (preview) using Azure Backup
33
description: Learn to troubleshoot SAP ASE (Sybase) database backup using Azure Backup.
44
ms.topic: troubleshooting
5-
ms.date: 11/23/2024
5+
ms.date: 05/02/2025
66
ms.service: azure-backup
77
author: jyothisuri
88
ms.author: jsuri
@@ -190,6 +190,57 @@ This article provides troubleshooting details for error codes that appears when
190190

191191
**Recommended action**: Run the updated pre-registration script in the virtual machine, which will add the default configuration in the `config` file and retry. If the error persists after that, contact Microsoft Support.
192192

193+
### DatabaseConnectionError
194+
195+
**Error code**: `DatabaseConnectionError`
196+
197+
**Error message**: An error occurred while executing the query on the database. The database is already open and can only have one user at a time.
198+
199+
**Cause**: The database might be set to single user mode, which prevents additional connections.
200+
201+
**Recommended action**: To resolve the error, follow these steps:
202+
203+
1. Check the database configuration to ensure that it allows multiple connections if required.
204+
1. Validate and disable the single user mode if it is enabled using `sp_dboption`. Learn how to [use `sp_dboption`](https://help.sap.com/docs/SAP_ASE/29a04b8081884fb5b715fe4aa1ab4ad2/ab5c9f3abc2b1014978feb816ba90fa0.html).
205+
206+
If the issue persists, contact Microsoft support.
207+
208+
### SingleUserModeIsEnabled
209+
210+
**Error code**: `SingleUserModeIsEnabled`
211+
212+
**Error message**: Database (`{databaseName}`) is currently in single user mode.
213+
214+
**Cause**: The database is currently in single user mode, which might cause the restore operation to fail. Attempt to disable single user mode was unsuccessful.
215+
216+
**Recommended action**: Sign in to the ASE server and disable the single user mode for the database using the `sp_dboption` stored procedure. Learn how to [use `sp_dboption`](https://help.sap.com/docs/SAP_ASE/29a04b8081884fb5b715fe4aa1ab4ad2/ab5c9f3abc2b1014978feb816ba90fa0.html).
217+
218+
If the issue persists, contact Microsoft support.
219+
220+
221+
### NotAbleToEnableSingleUserMode
222+
223+
**Error code**: `NotAbleToEnableSingleUserMode`
224+
225+
**Error message**: The single user mode didn't change for database (`{databaseName}`) after you attempt to enable it.
226+
227+
**Cause**: This issue may occur due to a problem preventing the change of single user mode.
228+
229+
**Recommended action**: Sign in to the ASE server and manually attempt to enable and disable the single user mode for the database, then retry the operation. Learn how to [use `sp_dboption`](https://help.sap.com/docs/SAP_ASE/29a04b8081884fb5b715fe4aa1ab4ad2/ab5c9f3abc2b1014978feb816ba90fa0.html).
230+
231+
If the issue persists, contact Microsoft support.
232+
233+
234+
### NotAbleToDisableSingleUserMode
235+
236+
**Error code**: `NotAbleToDisableSingleUserMode`
237+
238+
**Error message**: The single user mode didn't change for database (`{databaseName}`) after you attempt to disable it.
239+
240+
**Recommended action**: Sign in to the SAP ASE server and disable the single user mode for the database using the `sp_dboption` stored procedure. Learn how to [use `sp_dboption`](https://help.sap.com/docs/SAP_ASE/29a04b8081884fb5b715fe4aa1ab4ad2/ab5c9f3abc2b1014978feb816ba90fa0.html).
241+
242+
If the issue persists, contact Microsoft support.
243+
193244
## Restore errors
194245

195246
### FailedToCreateDatabase

articles/virtual-desktop/add-session-hosts-host-pool.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Add session hosts to a host pool - Azure Virtual Desktop
33
description: Learn how to add session host virtual machines to a host pool in Azure Virtual Desktop.
44
ms.topic: how-to
55
zone_pivot_groups: azure-virtual-desktop-host-pool-management-approaches
6-
author: ErikjeMS
6+
author: dougeby
77
ms.author: avdcontent
88
ms.date: 03/18/2025
99
---

articles/virtual-desktop/administrative-template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Add the administrative template for Azure Virtual Desktop to Group Policy
33
description: Learn how to add the administrative template (ADMX) for Azure Virtual Desktop to Group Policy to configure certain features.
4-
author: ErikjeMS
4+
author: dougeby
55
ms.topic: how-to
66
ms.date: 08/12/2024
77
ms.author: avdcontent

articles/virtual-desktop/agent-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Get started with the Azure Virtual Desktop Agent
33
description: An overview of the Azure Virtual Desktop Agent and update processes.
4-
author: ErikjeMS
4+
author: dougeby
55
ms.topic: conceptual
66
ms.date: 12/16/2020
77
ms.author: avdcontent

articles/virtual-desktop/agent-updates-diagnostics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Set up diagnostics for monitoring agent updates
33
description: How to set up diagnostic reports to monitor agent updates.
4-
author: ErikjeMS
4+
author: dougeby
55
ms.topic: how-to
66
ms.date: 03/20/2023
77
ms.author: avdcontent

0 commit comments

Comments
 (0)