Skip to content

Commit c6f15c8

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into release-azure-durable
2 parents 45cc553 + f7f5627 commit c6f15c8

12 files changed

Lines changed: 164 additions & 25 deletions

articles/azure-app-configuration/monitor-app-configuration.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ For more information about App Configuration metrics, see [supported metrics for
4949
Azure App Configuration logs include activity logs and resource logs.
5050

5151
### Activity logs
52-
[Activity logs](/azure/azure-monitor/reference/tables/azureactivity) provide insight into subscription-level events and show management plane activities (create, update, delete operations on your App Configuration resource). However, they don't capture data plane operations like key-value reads and writes. You can view them in the **Activity log** blade. Alternatively, follow the steps in [Log collection](#log-collection) to route them to Log Analytics workspace for more complex querying scenarios.
52+
[Activity logs](/azure/azure-monitor/reference/tables/azureactivity) provide insight into subscription-level events and show all control plane CRUD operations for your App Configuration resource. However, they don't capture data plane operations like key-value reads and writes. You can view activity logs in the **Activity log** blade. Alternatively, follow the steps in [Log collection](#log-collection) to route them to a Log Analytics workspace for more complex querying scenarios.
5353

5454
### Resource logs
5555
App Configuration provides two types of resource logs.
56-
- **Audit logs**: Capture write operations (create, update, delete) on your data plane resources, such as key-values. Audit logs don't include data plane read operations but include management plane operations. Entries are unaggregated. Query them in the **AACAudit** table. For more information, refer to [AACAudit](/azure/azure-monitor/reference/tables/AACAudit).
57-
- **HTTP request logs**: Capture both read and write operations on your data plane resources, such as key-values. Operations are aggregated for better performance and to reduce log volume. Aggregation is based on HTTP method and status code. Each log entry may represent multiple similar operations within a certain time window. Query them in the **AACHttpRequest** table. For more information, refer to [AACHttpRequest](/azure/azure-monitor/reference/tables/AACHttpRequest).
56+
- **Audit logs**: Capture data plane write operations (create, update, and delete), such as key-values modifications, and all control plane CRUD operations. Audit logs don't include data plane read operations. Unlike HTTP request logs, entries of audit logs are not aggregated. Query them in the **AACAudit** table. For more information, refer to [AACAudit](/azure/azure-monitor/reference/tables/AACAudit).
57+
- **HTTP request logs**: Capture both read and write operations on your data plane resources, such as key-values. Entries of HTTP request logs are aggregated for better performance and to reduce log volume. Aggregation is based on HTTP method and status code. Each log entry may represent multiple requests within a certain time window. Refer to the HitCount field for the number of requests whose logs are aggregated. Query them in the **AACHttpRequest** table. For more information, refer to [AACHttpRequest](/azure/azure-monitor/reference/tables/AACHttpRequest).
5858

5959
#### Log collection
6060
Metrics and the activity log are collected and stored automatically, and can be routed to other locations by using a diagnostic setting.

articles/azure-functions/functions-app-settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -973,7 +973,7 @@ In the [Flex Consumption plan](./flex-consumption-plan.md), these site propertie
973973
| `WEBSITE_VNET_ROUTE_ALL` |Not used for networking in Flex Consumption|
974974
| `properties.alwaysOn` |Not valid|
975975
| `properties.containerSize` |Renamed as `instanceMemoryMB`|
976-
| `properties.dnsConfiguration` | Custom DNS servers configured in the Azure Virtual Network are automatically used|
976+
| 'properties.dnsConfiguration.dnsServers'| DNS is inherited from the integrated virtual network in a Flex Consumption plan. |
977977
| `properties.ftpsState` | FTPS not supported |
978978
| `properties.isReserved` |Not valid|
979979
| `properties.IsXenon` |Not valid|

articles/azure-netapp-files/data-protection-disaster-recovery-options.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: azure-netapp-files
55
author: b-ahibbard
66
ms.service: azure-netapp-files
77
ms.topic: concept-article
8-
ms.date: 08/28/2025
8+
ms.date: 03/03/2026
99
ms.author: anfdocs
1010
# Customer intent: "As a data administrator, I want to assess the data protection and disaster recovery options available in Azure NetApp Files, so that I can choose the most effective solutions to ensure data integrity and availability for my organization's needs."
1111
---
@@ -37,7 +37,7 @@ Azure NetApp Files supports a fully managed backup solution for long-term recove
3737
### Benefits
3838

3939
- Increased productivity, reliably integrated service that is easy to manage and can be set once
40-
- Application-consistent backups with [AzAcSnap integration](azacsnap-introduction.md)
40+
- Application-consistent backups with [AzAcSnap integration](azacsnap-introduction.md), [SnapCenter snapshot and backup orchestration](https://www.netapp.com/snapcenter/), or third-party tools
4141
- Retain daily, weekly, monthly backups for extended periods of time on cost-efficient cloud storage without media management
4242

4343
To learn more, see [How snapshots can be vaulted for long-term retention and cost savings](snapshots-introduction.md#how-snapshots-can-be-vaulted-for-long-term-retention-and-cost-savings). To get started with backups, see [Configure policy-based backups for Azure NetApp Files](backup-configure-policy-based.md).
@@ -78,8 +78,8 @@ Choosing the best data protection option for your Azure NetApp Files deployment
7878
| Use case | In-region solution | Cross-region solution |
7979
| --- | --- | --- |
8080
| Ad hoc backup | On-demand snapshots | - |
81-
| Application consistent data protection | AzAcSnap | - |
82-
| Data corruption and ransomware protection | Scheduled snapshots | Cross-region replication |
81+
| Application consistent data protection | AzAcSnap, [SnapCenter](https://docs.netapp.com/us-en/snapcenter/get-started/concept_snapcenter_overview.html) | - |
82+
| Data corruption and ransomware protection | Advanced ransomware protection | Cross-region replication |
8383
| Disaster recovery | - | Cross-region replication |
8484
Fast data recovery (whole volume) | Revert volume from snapshot | Revert volume from snapshot |
8585
| Feed current production data to test or development environment | Restore snapshot to new volume (clone) | Restore snapshot to new volume (clone) |
@@ -96,8 +96,9 @@ Fast data recovery (whole volume) | Revert volume from snapshot | Revert volume
9696
* [How Azure NetApp Files snapshots work](snapshots-introduction.md)
9797
* [Understand Azure NetApp Files backup](backup-introduction.md)
9898
* [Understand Azure NetApp Files replication](replication.md)
99-
* [Reliability in Azure NetApp Flies](/azure/reliability/reliability-netapp-files)
99+
* [Reliability in Azure NetApp Files](/azure/reliability/reliability-netapp-files)
100100
* [What is Azure Application Consistent Snapshot tool](azacsnap-introduction.md)
101101
* [Restore individual files using single-file snapshot restore](snapshots-restore-file-single.md)
102102
* [Restore a snapshot to a new volume](snapshots-restore-new-volume.md)
103103
* [Restore a volume using snapshot revert](snapshots-revert-volume.md)
104+
* [Understand advanced ransomware protection](advanced-ransomware-protection.md)

articles/backup/troubleshoot-azure-files.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,16 @@ Recommended Actions: Ensure that the following configurations in the storage acc
325325

326326
**Cause**: Storage Accounts with [Smart Tier(Preview)](../storage/blobs/access-tiers-smart.md) set are currently not supported.
327327

328+
### UserErrorStorageAccountSasPolicyNotSupported - Azure Files Backup requires a minimum SAS expiration period of 8 hours
329+
330+
**Error code**: `UserErrorStorageAccountSasPolicyNotSupported`
331+
332+
**Error message**: Azure File Share Backup requires a minimum SAS expiration period of 8 hours.
333+
334+
**Cause**: If the SAS token expiry is shorter than 8 hours, the Backup service cannot renew the token in time. This leads to authentication failures and can interrupt ongoing backup or restore operations.
335+
336+
**Recommended action**: Set the SAS expiry upper limit to 8 hours or more to ensure the Backup service can successfully renew the SAS token and maintain uninterrupted backup and restore activities.
337+
328338
## Common policy modification errors
329339

330340
### BMSUserErrorConflictingProtectionOperation- Another configure protection operation is in progress for this item

articles/migrate/set-discovery-scope.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ This article describes how to limit the scope of discovery for servers in VMware
1818

1919
When you set up the appliance, it connects to vCenter Server and starts discovery. Before you connect the appliance to vCenter Server, you can limit discovery to vCenter Server datacenters, clusters, a folder of clusters, hosts, a folder of hosts, or individual servers. To set the scope, you assign permissions on the account that the appliance uses to access the vCenter Server.
2020

21+
Watch the following video to learn how to discover on-premises servers running in a VMware environment as part of your migration to Azure.
22+
23+
24+
> [!VIDEO https://learn-video.azurefd.net/vod/player?id=edbc7f22-2ba1-44cd-a534-465dfd426a14]
25+
2126
## Before you start
2227

2328
If you haven't set up a vCenter Server user account that Azure Migrate uses for discovery, do that now for [assessment](tutorial-discover-vmware.md#prepare-vmware) or [agentless migration](migrate-support-matrix-vmware-migration.md#agentless-migration).

articles/redis/reserved-pricing.md

Lines changed: 43 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,31 +35,63 @@ The following Azure Managed Redis tiers currently support reservations:
3535

3636
| Region Name | Memory Optimized | Balanced | Compute Optimized | Flash Optimized |
3737
| ------------------- | ---------------- | -------- | ---------------- | --------------- |
38-
| UAE North | Yes | Yes | Yes | No |
3938
| Australia Central | Yes | Yes | Yes | No |
39+
| Australia Central 2 | Yes | Yes | Yes | No |
40+
| Australia East | Yes | Yes | Yes | No |
4041
| Australia Southeast | Yes | Yes | Yes | No |
42+
| Austria East | Yes | Yes | Yes | No |
43+
| Belgium Central | Yes | Yes | Yes | No |
44+
| Brazil South | Yes | Yes | Yes | No |
4145
| Brazil Southeast | Yes | Yes | Yes | No |
46+
| Canada Central | Yes | Yes | Yes | No |
4247
| Canada East | Yes | Yes | Yes | No |
43-
| Switzerland West | Yes | Yes | Yes | No |
44-
| Spain Central | Yes | Yes | Yes | No |
48+
| Central US | Yes | Yes | Yes | No |
49+
| Chile Central | Yes | Yes | Yes | No |
50+
| East Asia | Yes | Yes | Yes | No |
51+
| East US | Yes | No | Yes | No |
52+
| East US 2 | Yes | Yes | Yes | No |
4553
| France Central | Yes | Yes | Yes | No |
4654
| France South | Yes | Yes | Yes | No |
47-
| Indonesia Central | Yes | Yes | Yes | No |
48-
| Israel Central | Yes | Yes | Yes | No |
49-
| Israel Northwest | No | Yes | No | No |
55+
| Germany North | Yes | Yes | Yes | No |
56+
| Germany West Central| Yes | Yes | Yes | No |
5057
| India Central | Yes | Yes | Yes | No |
5158
| India South | Yes | Yes | Yes | No |
5259
| India West | Yes | Yes | Yes | No |
60+
| Indonesia Central | Yes | Yes | Yes | No |
61+
| Israel Central | Yes | Yes | Yes | No |
62+
| Israel Northwest | No | Yes | Yes | No |
5363
| Italy North | Yes | Yes | Yes | No |
5464
| Japan East | Yes | Yes | Yes | No |
65+
| Japan West | Yes | Yes | Yes | No |
5566
| Korea Central | Yes | Yes | Yes | No |
5667
| Korea South | Yes | Yes | Yes | No |
68+
| Malaysia West | Yes | Yes | Yes | No |
69+
| Mexico Central | Yes | Yes | Yes | No |
70+
| New Zealand North | Yes | Yes | Yes | No |
71+
| North Europe | Yes | Yes | Yes | No |
72+
| NorthCentral US | Yes | Yes | Yes | No |
5773
| Norway East | Yes | Yes | Yes | No |
74+
| Norway West | Yes | Yes | Yes | No |
5875
| Poland Central | Yes | Yes | Yes | No |
5976
| Qatar Central | Yes | Yes | Yes | No |
60-
| UK West | Yes | Yes | Yes | No |
61-
| US East | Yes | No | Yes | No |
6277
| South Africa North | Yes | Yes | Yes | No |
78+
| South Africa West | Yes | Yes | Yes | No |
79+
| South Central US | Yes | Yes | Yes | No |
80+
| SouthEast Asia | Yes | Yes | Yes | No |
81+
| Spain Central | Yes | Yes | Yes | No |
82+
| Sweden Central | Yes | Yes | Yes | No |
83+
| Sweden South | Yes | Yes | Yes | No |
84+
| Switzerland North | Yes | Yes | Yes | No |
85+
| Switzerland West | Yes | Yes | Yes | No |
86+
| UAE Central | Yes | Yes | Yes | No |
87+
| UAE North | Yes | Yes | Yes | No |
88+
| UK South | Yes | Yes | Yes | No |
89+
| UK West | Yes | Yes | Yes | No |
90+
| West Central US | Yes | Yes | Yes | No |
91+
| West Europe | Yes | Yes | Yes | No |
92+
| West US | Yes | Yes | Yes | No |
93+
| West US 2 | Yes | Yes | Yes | No |
94+
| West US 3 | Yes | Yes | Yes | No |
6395

6496
## Buy Azure Managed Redis reservations
6597

@@ -100,7 +132,9 @@ Existing or new caches that match the attributes you select get the reservation
100132

101133
- You can update the scope of the reservation through the Azure portal, PowerShell, Azure CLI, or the API.
102134

103-
- You can cancel, exchange, or refund reservations with certain limitations. For more information, see [Self-service exchanges and refunds for Azure Reservations](/azure/cost-management-billing/reservations/exchange-and-refund-azure-reservations).
135+
## Exchange existing Reservations with Azure Managed Redis
136+
137+
You can cancel, exchange, or refund reservations with certain limitations. For more information, see [Self-service exchanges and refunds for Azure Reservations](/azure/cost-management-billing/reservations/exchange-and-refund-azure-reservations).
104138

105139
## Related content
106140

articles/storage/blobs/network-file-system-protocol-known-issues.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ This article describes limitations and known issues of Network File System (NFS)
2424

2525
- NFS 3.0 support can't be disabled in a storage account after you enable it.
2626

27-
- Geo-redundant storage (GRS), Geo-zone-redundant storage (GZRS), and Read-access geo-redundant storage (RA-GRS) redundancy options aren't supported when you create an NFS 3.0 storage account.
27+
- Geo-Redundant Storage (GRS) is supported only for unplanned failover scenarios and isn't supported for planned failover.
28+
29+
- Geo-zone-redundant storage (GZRS) and Read-access geo-redundant storage (RA-GRS) redundancy options aren't supported when you create an NFS 3.0 storage account.
2830

2931
- Access control lists (ACLs) can't be used to authorize an NFS 3.0 request. In fact, if the ACL or a blob or directory contains an entry for a named user or group, that file becomes inaccessible on the client for nonroot users. You have to remove these entries to restore access to nonroot users on the client. For information about how to remove an ACL entry for named users and groups, see [How to set ACLs](data-lake-storage-access-control.md#how-to-set-acls).
3032

0 commit comments

Comments
 (0)