Skip to content

Commit 7b7d50d

Browse files
committed
Merge branch 'main' into release-build-functions-bindings-mongodb-preview
2 parents 6a4e94d + 683ee2d commit 7b7d50d

File tree

64 files changed

+977
-458
lines changed

Some content is hidden

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

64 files changed

+977
-458
lines changed

articles/app-service/overview-diagnostics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ This article explains how to troubleshoot issues with your app in Azure App Serv
1515

1616
Azure App Service diagnostics is an interactive experience to help you troubleshoot your app with no configuration required. App Service diagnostics points out what's wrong and guides you to the right information to more easily and quickly troubleshoot and resolve the problem.
1717

18-
Although this experience is most helpful for problems that occured within the last 24 hours, all the diagnostic graphs are always available for you to analyze.
18+
Although this experience is most helpful for problems that occurred within the last 24 hours, all the diagnostic graphs are always available for you to analyze.
1919

2020
App Service diagnostics works for not only apps on Windows, but also for apps on built-in or custom containers, [App Service Environments](./environment/intro.md), and [Azure Functions](../azure-functions/functions-overview.md).
2121

articles/app-service/tutorial-java-jboss-mysql-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,7 @@ If you see the error: `The subscription '701ea799-fb46-4407-bb67-9cbcf289f1c7' i
665665
666666
Depending on your subscription and the region you select, you might see the deployment status for Azure Database for MySQL Flexible Server to be `Conflict`, with the following message in Operation details:
667667
668-
`InternalServerError: An unexpected error occured while processing the request.`
668+
`InternalServerError: An unexpected error occurred while processing the request.`
669669
670670
This error is most likely caused by a limit on your subscription for the region you select. Try choosing a different region for your deployment.
671671

articles/app-service/tutorial-java-tomcat-mysql-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,7 @@ You can ignore the warnings. The Maven Jetty plugin shows the warnings because t
697697

698698
Depending on your subscription and the region you select, you might see the deployment status for Azure Database for MySQL Flexible Server to be `Conflict`, with the following message in Operation details:
699699

700-
`InternalServerError: An unexpected error occured while processing the request.`
700+
`InternalServerError: An unexpected error occurred while processing the request.`
701701
702702
This error is most likely caused by a limit on your subscription for the region you select. Try choosing a different region for your deployment.
703703

articles/application-gateway/configuration-http-settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The Backend Settings enable you to manage the configurations for backend connect
1616
## Types of Backend Settings in Application Gateway
1717
While Portal users will only see the "Backend Settings" option, API users will have access to two types of settings. You must utilize the correct configuration, according to the protocol.
1818

19-
* Backend HTTP settings - It is for Layer 7 proxy configurations that support HTTP, HTTPS, and WebSockets protocols.
19+
* Backend HTTP settings - It is for Layer 7 proxy configurations that support HTTP and HTTPS protocols.
2020
* Backend settings - It is for Layer 4 proxy (Preview) configurations that support TLS and TCP protocols.
2121

2222
---

articles/application-gateway/monitor-application-gateway-reference.md

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Monitoring data reference for Azure Application Gateway
33
description: This article contains important reference material you need when you monitor Azure Application Gateway.
4-
ms.date: 03/28/2025
4+
ms.date: 05/12/2025
55
ms.custom: horz-monitor
66
ms.topic: reference
77
author: greg-lindsay
@@ -109,7 +109,9 @@ https://management.azure.com/subscriptions/subid/providers/Microsoft.Network/loc
109109

110110
### TLS/TCP proxy metrics
111111

112-
Application Gateway supports TLS/TCP proxy monitoring. With layer 4 proxy feature now available with Application Gateway, there are some Common metrics that apply to both layer 7 and layer 4. There are some layer 4 specific metrics. The following list summarizes the metrics are the applicable for layer 4 usage.
112+
The following metrics are available for monitoring Application Gateway's TLS/TCP proxy. In addition to Layer 4-specific metrics, there are several common metrics with Layer 7 (HTTP/S). For details of each, visit the complete [metrics listing](#supported-metrics-for-microsoftnetworkapplicationgateways).
113+
114+
**Metrics that also apply to L4 proxy**
113115

114116
- Current Connections
115117
- New Connections per second
@@ -118,14 +120,16 @@ Application Gateway supports TLS/TCP proxy monitoring. With layer 4 proxy featur
118120
- Unhealthy host count
119121
- Client RTT
120122
- Backend Connect Time
121-
- Backend First Byte Response Time. `BackendHttpSetting` dimension includes both layer 7 and layer 4 backend settings.
122-
123-
For more information, see previous descriptions and the [metrics table](#supported-metrics-for-microsoftnetworkapplicationgateways).
123+
- Backend First Byte Response Time (`BackendHttpSetting` dimension applies to both Layer 7 and 4 backend settings).
124+
- Bytes Sent
125+
- Bytes Received
126+
- Compute Units
127+
- Capacity Units
124128

125-
These metrics apply to layer 4 only.
129+
**L4 proxy-specific metrics**
126130

127-
- **Backend Session Duration**. The total time of a backend connection. The average time duration from the start of a new connection to its termination. `BackendHttpSetting` dimension includes both layer 7 and layer 4 backend settings.
128-
- **Connection Lifetime**. The total time of a client connection to application gateway. The average time duration from the start of a new connection to its termination in milliseconds.
131+
- Backend Session Duration - The total time of a backend connection. The average time duration from the start of a new connection to its termination. `BackendHttpSetting` dimension includes both layer 7 and layer 4 backend settings.
132+
- Connection Lifetime - The total time of a client connection to application gateway. The average time duration from the start of a new connection to its termination in milliseconds.
129133

130134
### TLS/TCP proxy backend health
131135

articles/automation/extension-based-hybrid-runbook-worker-install.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: This article provides information about deploying the extension-bas
44
services: automation
55
ms.subservice: process-automation
66
ms.custom: devx-track-azurepowershell, devx-track-azurecli, devx-track-bicep, linux-related-content
7-
ms.date: 05/08/2025
7+
ms.date: 05/12/2025
88
ms.topic: how-to
99
#Customer intent: As a developer, I want to learn about extension so that I can efficiently deploy Hybrid Runbook Workers.
1010
ms.service: azure-automation
@@ -123,7 +123,7 @@ If you use a proxy server for communication between Azure Automation and machine
123123

124124
The API call will provide the value with the key: `AutomationHybridServiceUrl`. Use the URL in the next step to enable extension on the VM.
125125

126-
1. Install the Hybrid Worker Extension on the VM by running the following PowerShell cmdlet (Required module: Az.Compute). Use the `properties.automationHybridServiceUrl` provided by the above API call
126+
1. Install the Hybrid Worker Extension on the VM by running the following PowerShell cmdlet (Required module: Az.Compute). Use the `properties.automationHybridServiceUrl` provided by the above API call. Ensure ProxyServer URL does not contain any blank spaces.
127127

128128
# [Windows](#tab/windows)
129129

articles/azure-resource-manager/templates/syntax.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ In the `definitions` section of the template, specify the schemas used for valid
5757

5858
```json
5959
"definitions": {
60-
"<definition-name": {
60+
"<definition-name>": {
6161
"type": "<data-type-of-definition>",
6262
"allowedValues": [ "<array-of-allowed-values>" ],
6363
"minValue": <minimum-value-for-int>,
@@ -287,8 +287,8 @@ You define resources with the following structure:
287287
"<settings-for-the-resource>",
288288
"copy": [
289289
{
290-
"name": ,
291-
"count": ,
290+
"name": "<name-of-copy-loop>",
291+
"count": <number-of-iterations>,
292292
"input": {}
293293
}
294294
]

articles/azure-resource-manager/templates/template-functions-deployment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ The following example returns the deployer object.
5252
"outputs": {
5353
"developerOutput": {
5454
"type": "object",
55-
"value": "[developer()]"
55+
"value": "[deployer()]"
5656
}
5757
}
5858
}

articles/backup/archive-tier-support.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Azure Backup - Archive tier overview
33
description: Learn about Archive tier support for Azure Backup.
44
ms.topic: overview
5-
ms.date: 05/07/2025
5+
ms.date: 05/13/2025
66
ms.custom: references_regions
77
ms.service: azure-backup
88
author: jyothisuri
@@ -23,7 +23,7 @@ Archive tier supports the following workloads:
2323

2424
| Workloads | Operations |
2525
| --- | --- |
26-
| Azure Virtual Machines | Only monthly and yearly recovery points. Daily and weekly recovery points aren't supported. <br><br> Age >= 3 months in Vault-standard tier <br><br> Retention left >= 6 months. <br><br> No active daily and weekly dependencies. There are no un-expired daily or weekly recovery points between the recovery point considered for archival and the next monthly or yearly recovery point. |
26+
| Azure Virtual Machines | Only monthly and yearly recovery points. Daily and weekly recovery points aren't supported. <br><br> Age >= 3 months in Vault-standard tier <br><br> Retention left >= 6 months. <br><br> No active on-demand, daily, and weekly dependencies. There are no un-expired daily or weekly recovery points between the recovery point considered for archival and the next monthly or yearly recovery point. |
2727
| SQL Server in Azure Virtual Machines <br><br> SAP HANA in Azure Virtual Machines | Only full recovery points. Logs and differentials aren't supported. <br><br> Age >= 45 days in Vault-standard tier. <br><br> Retention left >= 6 months. <br><br> No dependencies. |
2828

2929
A recovery point becomes archivable only if all the above conditions are met.

articles/backup/backup-azure-vm-backup-faq.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
description: In this article, discover answers to common questions about backing up Azure VMs with the Azure Backup service.
55
ms.topic: faq
66
ms.service: azure-backup
7-
ms.date: 03/27/2025
7+
ms.date: 05/12/2025
88
author: jyothisuri
99
ms.author: jsuri
1010

@@ -157,6 +157,12 @@ sections:
157157
- **Retention of monthly backup points**: 1188 months
158158
- **Retention of yearly backup points**: 99 years
159159
160+
- question: Can I back up a VM disks that're created in the Azure Classic Storage?
161+
answer: |
162+
No, the support for disks created in Azure Classic Storage is no longer available. To ensure continued functionality, you must migrate these disks to Azure Resource Manager (ARM) Storage. Also, Classic Storage accounts can't support ARM-based Virtual Machines (VMs), and no workarounds exist to enable compatibility.
163+
164+
>[!Important]
165+
>Support for backup of all Classic VMs is planned for deprecation on September 30, 2025. We recommend that you migrate the Classic VMs and associated disks to ARM Storage before this timeline to avoid disruptions.
160166
- name: Restore
161167
questions:
162168
- question: How do I decide whether to restore disks only or a full VM?
@@ -409,7 +415,7 @@ sections:
409415
410416
- question: Why the expiry time for latest recovery points doesn't appear in the Azure portal for VMs?
411417
answer: |
412-
The expiry time for the latest recovery point doesn't appear because it has infinite retention until a newer one gets created. The expiry time of other recovery points will be available in the Azure Portal after 24 hours of creation, depending on when the garbage collection runs (that will be within 24 hours).
418+
The expiry time for the latest recovery point doesn't appear because it has infinite retention until a newer one gets created. The expiry time of other recovery points will be available in the Azure portal after 24 hours of creation, depending on when the garbage collection runs (that will be within 24 hours).
413419
414420
- question: Will an Azure VM restore operation to original or alternate location affect a scheduled backup?
415421
answer: |
@@ -449,7 +455,7 @@ sections:
449455
answer: |
450456
This is the directory used by Backup Extension VMSnapshotLinux and it gets created when backups are enabled on VM using Recovery Services Vault. Logs are written in this location during backups, restores or extension operations such as schedule updates, generally they should use up only a few GB and the size of the logs is not proportional with the size of the backup.
451457
452-
- question: If backup fails with time out error for large disk VMs after running sometime, when can I re-trigger the backup job again and will the backup continue from where it failed?
458+
- question: If backup fails with a time-out error for large disk VMs after running sometime, when can I re-trigger the backup job again and will the backup continue from where it failed?
453459
answer: |
454460
For Initial Replica, a full backup will be re-initiated in case of failure. However, for Incremental the snapshot from the last successful backup will be compared to the latest snapshot to copy the changed data into the vault.
455461

0 commit comments

Comments
 (0)