Skip to content

Commit 66adfe5

Browse files
committed
Merge branch 'main' into release-durable-task
2 parents 6c80f8a + 4285632 commit 66adfe5

66 files changed

Lines changed: 804 additions & 363 deletions

File tree

Some content is hidden

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

articles/app-service/manage-backup.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,9 @@ There are two types of backups in App Service. If your app is in a supported pri
120120
1. At the top of the **Backups** page, select **Configure custom backups**.
121121
122122
1. In **Storage account**, select an existing storage account in the same subscription or select **Create new**. Repeat in **Container**.
123+
> [!NOTE]
124+
> Custom backups for Azure App Service require an Azure Storage account that supports Shared Access Signature (SAS)–based authorization. Managed Identity–based authentication to the storage account isn't supported for App Service backup and restore operations.
125+
123126
124127
To back up the linked databases, select **Next: Advanced** > **Include database**, and select the databases to backup.
125128

articles/azure-resource-manager/management/request-limits-and-throttling.md

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ The token bucket represents the maximum number of requests that you can send for
1818

1919
These updated limits make it easier for you to refresh and manage your quota.
2020

21-
The updated limits are:
21+
The updated limits for public and sovereign clouds are:
2222

2323
| Scope | Operations | Bucket size | Refill rate per sec |
2424
| ----- | ---------- | ----------- | ------------------- |
@@ -37,8 +37,6 @@ For example, suppose you have a bucket size of 250 tokens for read requests and
3737

3838
Reading metrics using the `*/providers/microsoft.insights/metrics` API contributes significantly to overall Azure Resource Manager traffic and is a common cause of subscription throttling events. If you use this API heavily, we recommend that you switch to the `getBatch` API. You can query multiple resources in a single REST request, which improves performance and reduces throttling. For more information about converting your operations, see [How to migrate from the metrics API to the getBatch API](/azure/azure-monitor/essentials/migrate-to-batch-api).
3939

40-
These limits and architecture will also apply to all sovereign clouds by the end of 2026.
41-
4240
### How can I view my throttled requests?
4341

4442
To view your throttled requests and other Resource Manager metrics, see [Accessing Azure Resource Manager metrics](/azure/azure-resource-manager/management/monitor-resource-manager#accessing-azure-resource-manager-metrics).
@@ -63,39 +61,6 @@ The request for subscription '{0}' could not be processed due to an excessive vo
6361

6462
Customers might experience throttling due to excessive background jobs, which can be triggered by high-frequency operations or system-wide activities. While customers do not have direct control over the creation or execution of these jobs, awareness of potential throttling is important.
6563

66-
## Throttling for sovereign clouds
67-
68-
Throttling happens at two levels. Azure Resource Manager throttles requests for the subscription and tenant. If the request is under the throttling limits for the subscription and tenant, Resource Manager routes the request to the resource provider. The resource provider applies throttling limits that are tailored to its operations.
69-
70-
Requests are initially throttled per principal ID and per Azure Resource Manager instance in the region of the user sending the request. Requests to the Azure Resource Manager instance in the region are also throttled per principal user ID and per hour. When the request is forwarded to the resource provider, requests are throttled per region of the resource rather than per Azure Resource Manager instance in region of the user.
71-
72-
> [!NOTE]
73-
> The limits of a resource provider can differ from the limits of the Azure Resource Manager instance in the region of the user.
74-
75-
The following image shows how throttling is applied as a request goes from the user to Azure Resource Manager and the resource provider.
76-
77-
:::image type="content" source="./media/request-limits-and-throttling/request-throttling.svg" alt-text="Diagram that shows how throttling is applied as a request goes from the user to Azure Resource Manager and the resource provider.":::
78-
79-
## Subscription and tenant limits
80-
81-
Every subscription-level and tenant-level operation is subject to throttling limits. Subscription requests are ones that involve passing your subscription ID, such as retrieving the resource groups in your subscription. For example, sending a request to `https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups?api-version=2022-01-01` is a subscription-level operation. Tenant requests don't include your subscription ID, such as retrieving valid Azure locations. For example, sending a request to `https://management.azure.com/tenants?api-version=2022-01-01` is a tenant-level operation.
82-
83-
The default throttling limits per hour are shown in the following table.
84-
85-
| Scope | Operations | Limit |
86-
| ----- | ---------- | ------- |
87-
| Subscription | reads | 12,000 |
88-
| Subscription | deletes | 15,000 |
89-
| Subscription | writes | 1,200 |
90-
| Tenant | reads | 12,000 |
91-
| Tenant | writes | 1,200 |
92-
93-
These limits are scoped to the security principal (user or application) making the requests and the subscription ID or tenant ID. If your requests come from more than one security principal, your limit across the subscription or tenant is greater than 12,000 and 1,200 per hour.
94-
95-
These limits apply to each Azure Resource Manager instance. There are multiple instances in every Azure region, and Azure Resource Manager is deployed to all Azure regions. So, in practice, the limits are higher than these limits. Different instances of Azure Resource Manager usually handle the user's requests.
96-
97-
The remaining requests are returned in the [response header values](#remaining-requests).
98-
9964
## Resource provider limits
10065

10166
Resource providers apply their own throttling limits. Within each subscription, the resource provider throttles per region of the resource in the request. Because Resource Manager throttles by instance of Resource Manager, and there are several instances of Resource Manager in each region, the resource provider might receive more requests than the default limits in the previous section.

articles/backup/backup-azure-arm-restore-vms.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ If CRR is enabled, you can view the backup items in the secondary region.
248248

249249
The secondary region restore user experience is similar to the primary region restore user experience. When configuring details in the Restore Configuration pane to configure your restore, you're prompted to provide only secondary region parameters.
250250

251-
Currently, secondary region [RPO](azure-backup-glossary.md#recovery-point-objective-rpo) is _36 hours_. This is because the RPO in the primary region is _24 hours_ and can take up to _12 hours_ to replicate the backup data from the primary to the secondary region.
251+
For Azure VM backups, the secondary region [RPO](azure-backup-glossary.md#recovery-point-objective-rpo) can be up to _36 hours_ in the worst case. With the Standard policy, the primary region RPO is up to _24 hours_, and replication to the secondary region can take up to _12 hours_. With the Enhanced policy, more frequent local recovery point creation can improve the best-case achievable secondary region RPO. However, because vaulting is daily, the worst-case secondary region RPO can still be up to _36 hours_.
252252

253253
:::image type="content" source="./media/backup-azure-arm-restore-vms/secondary-region-restore.png" alt-text="{alt-text}":::Screenshot shows how to start secondary region restore of a VM. ":::
254254

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ sections:
457457
458458
- question: When Vault is configured with CRR, what happens to the secondary data if the primary region fails?
459459
answer: |
460-
Backup data fully replicated to the secondary region before the failure of the primary region will remain intact. This remains the case even after the primary region has recovered from the failure. In other words, the virtual machine can be recovered in the secondary region with the data it had before the failure as per the replication schedule. Note that the RPO for the secondary region is 36 hours i.e., data takes approximately 36 hours to be fully replicated from primary to the secondary region.
460+
Backup data fully replicated to the secondary region before the failure of the primary region remains intact. This remains true even after the primary region recovers from the failure. In other words, the virtual machine can be recovered in the secondary region with the data it had before the failure, based on the replication schedule. For Azure VM backups, the secondary region RPO can be up to 36 hours in the worst case. With the Standard policy, this is based on up to 24 hours in the primary region plus up to 12 hours for replication to the secondary region. With the Enhanced policy, more frequent local recovery point creation can improve the best-case achievable secondary region RPO, but the worst-case can still be up to 36 hours.
461461
462462
- question: When I update the backup policy, why is the expiry time not getting updated immediately?
463463
answer: |

articles/backup/backup-azure-vms-introduction.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ Azure Backup takes snapshots according to the backup schedule.
4747

4848
If you have opted for application or file-system-consistent backups, the VM needs to have a backup extension installed to coordinate for the snapshot process. For [*agentless multi-disk crash-consistent* backups](backup-azure-vms-agentless-multi-disk-crash-consistent-overview.md), the VM agent is not required for snapshots.
4949

50-
- **Windows VMs:** For Windows VMs, the Backup service coordinates with VSS to take an app-consistent snapshot of the VM disks. By default, Azure Backup takes a full VSS backup (it truncates the logs of application such as SQL Server at the time of backup to get application level consistent backup). If you're using a SQL Server database on Azure VM backup, then you can modify the setting to take a VSS Copy backup (to preserve logs). For more information, see [this article](./backup-azure-vms-troubleshoot.md#troubleshoot-vm-snapshot-issues).
50+
- **Windows VMs:** For Windows VMs, Azure Backup coordinates with VSS to take an application-consistent snapshot. For VMs running SQL Server, Azure VM Backup triggers a VSS Full (Copy-Only) backup by default to avoid affecting the SQL backup chain used by other backup tools. Copy-Only backups do not truncate SQL Server transaction logs. If you require log truncation (and understand the impact on the SQL backup chain), you can opt in to a VSS Full (Non-Copy-Only) backup by using the UseVssFullBackup registry setting. For more information, see [this article](./backup-azure-vms-troubleshoot.md#troubleshoot-vm-snapshot-issues).
51+
>[!Note]
52+
> Azure VM Backup is a VM-level backup. If you need database-level point-in-time recovery using transaction logs, use [Azure Backup for SQL Server in Azure VM (workload backup)](backup-azure-sql-database.md).
5153
5254
- **Linux VMs:** To take app-consistent snapshots of Linux VMs, use the Linux pre-script and post-script framework to write your own custom scripts to ensure consistency.
5355

articles/backup/backup-azure-vms-troubleshoot.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -556,17 +556,16 @@ Verify the VM Agent version on Windows VMs:
556556
557557
## Troubleshoot VM snapshot issues
558558
559-
VM backup relies on issuing snapshot commands to underlying storage. Not having access to storage or delays in a snapshot task run can cause the backup job to fail. The following conditions can cause snapshot task failure:
559+
VM backup relies on issuing snapshot commands to underlying storage. Lack of storage access or delays during a snapshot task run can cause the backup job to fail. The following conditions can cause snapshot task failure:
560+
* **VMs with SQL Server configured can experience snapshot delays** when Azure VM Backup interacts with the SQL Server VSS Writer. For Windows VMs running SQL Server, Azure VM Backup currently triggers a VSS Full (Copy-Only) backup by default to avoid impacting SQL Server differential and transaction log backup chains used by other backup tools. Copy-Only VSS backups do not truncate SQL Server transaction logs.
560561
561-
* **VMs with SQL Server backup configured can cause snapshot task delay**. To avoid that, currently VM backup creates a VSS full backup (Copy-Only) on Windows VMs. If you need a VSS Full backup (Non-copy Only) then add the following registry key on the Windows VM:
562+
If you explicitly require a VSS Full (Non-Copy-Only) backup, which can truncate SQL Server transaction logs and may affect the SQL backup chain, configure the following registry key on the Windows VM:
562563
563564
```console
564-
REG ADD "HKLM\SOFTWARE\Microsoft\BcdrAgent" /v UseVSSCopyBackup /t REG_SZ /d True /f
565+
REG ADD "HKLM\SOFTWARE\Microsoft\BcdrAgent" /v UseVssFullBackup /t REG_SZ /d True /f
565566
```
566567
567-
>[!Note]
568-
>Setting UseVSSCopyBackup = True enables VSS Copy-Only backups. This ensures that snapshots aren't delayed and that any log chains managed by other backup products (such as SQL Server log backups) are not broken.
569-
If the key is set to False or not present, Azure Backup defaults to VSS Full backups, which may truncate application logs to achieve application-consistent backups.
568+
If UseVssFullBackup is set to False or not present, Azure VM Backup continues to use VSS Full (Copy-Only) backups by default.
570569
571570
* **VM status is reported incorrectly because the VM is shut down in RDP**. If you used the remote desktop to shut down the virtual machine, verify that the VM status in the portal is correct. If the status isn't correct, use the **Shutdown** option in the portal VM dashboard to shut down the VM.
572571
* **The VM runs at high CPU or memory**. If the virtual machine runs at high memory or CPU usage, more than 90 percent, your snapshot task is queued and delayed. Eventually it times out. If this issue happens, try an on-demand backup.

articles/backup/backup-create-recovery-services-vault.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Before you begin, consider the following information:
5252
- A list of supported managed types and regions is available in the [Support matrix for Azure Backup](backup-support-matrix.md#cross-region-restore).
5353
- Cross Region Restore incurs extra charges for use. After you enable Cross Region Restore, it might take up to 48 hours for the backup items to be available in secondary regions. [Learn more about pricing](https://azure.microsoft.com/pricing/details/backup/).
5454
- Cross Region Restore currently can't be reverted to GRS or LRS after the protection starts for the first time.
55-
- Currently, the recovery point objective (RPO) for the secondary region is 36 hours. The RPO in the primary region is 24 hours and can take up to 12 hours to replicate the backup data from the primary to the secondary region.
55+
- Secondary region recovery point objective (RPO) can vary by workload type and policy. For Azure VM backups, the secondary region RPO can be up to 36 hours in the worst case. With the Standard policy, the primary region RPO is up to 24 hours, and replication to the secondary region can take up to 12 hours. With the Enhanced policy, more frequent local recovery point creation can improve the best-case achievable secondary region RPO, but the worst-case can still be up to 36 hours. For workload-specific guidance, see the relevant restore documentation.
5656
- Permissions are required to use Cross Region Restore. For more information, see [Use Azure role-based access control (RBAC) to manage Azure Backup recovery points](backup-rbac-rs-vault.md#minimum-role-requirements-for-azure-vm-backup).
5757

5858
A vault created with GRS redundancy includes the option to configure Cross Region Restore. Every GRS vault has a banner that links to the documentation.

articles/container-apps/TOC.yml

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -271,36 +271,42 @@ items:
271271
- name: Overview
272272
href: observability.md
273273
displayName: Observability overview
274-
- name: Troubleshoot and resolve issues with an agent
274+
- name: Develop and debug with real-time logs
275+
items:
276+
- name: Log streaming
277+
href: log-streaming.md
278+
- name: Container console
279+
href: container-console.md
280+
- name: Container debug console
281+
href: container-debug-console.md
282+
- name: Monitor production workloads
283+
items:
284+
- name: Application logging
285+
href: logging.md
286+
- name: Logging options
287+
href: log-options.md
288+
- name: Log monitoring
289+
href: log-monitoring.md
290+
- name: Metrics
291+
href: metrics.md
292+
- name: Alerts
293+
href: alerts.md
294+
- name: End-to-end tracing and dashboards
295+
items:
296+
- name: Aspire Dashboard
297+
href: aspire-dashboard.md
298+
- name: OpenTelemetry agents
299+
href: opentelemetry-agents.md
300+
- name: Grafana dashboards
301+
href: grafana-dashboards.md
302+
- name: Troubleshoot and resolve issues with SRE agent
275303
items:
276304
- name: Overview
277305
href: ../sre-agent/overview.md
278306
- name: Use an SRE agent
279307
href: ../sre-agent/usage.md
280308
- name: Fix app issues with an SRE agent
281309
href: ../sre-agent/troubleshoot-azure-container-apps.md
282-
- name: Application logging
283-
href: logging.md
284-
- name: Real time data
285-
href: aspire-dashboard.md
286-
- name: Logging options
287-
href: log-options.md
288-
- name: Log streaming
289-
href: log-streaming.md
290-
- name: Container console
291-
href: container-console.md
292-
- name: Container debug console
293-
href: container-debug-console.md
294-
- name: Metrics
295-
href: metrics.md
296-
- name: Log monitoring
297-
href: log-monitoring.md
298-
- name: Alerts
299-
href: alerts.md
300-
- name: OpenTelemetry agents
301-
href: opentelemetry-agents.md
302-
- name: Grafana dashboards
303-
href: grafana-dashboards.md
304310
- name: Scaling & performance
305311
items:
306312
- name: Overview

0 commit comments

Comments
 (0)