Skip to content

Commit 6c6673f

Browse files
committed
Merge branch 'main' into release-preview-sentinel-lake
2 parents e7457b9 + 47d7517 commit 6c6673f

File tree

72 files changed

+1284
-908
lines changed

Some content is hidden

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

72 files changed

+1284
-908
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6879,6 +6879,11 @@
68796879
"redirect_url": "/azure/sre-agent/troubleshoot-azure-container-apps",
68806880
"redirect_document_id": false
68816881
},
6882+
{
6883+
"source_path": "articles/sre-agent/permissions.md",
6884+
"redirect_url": "/azure/sre-agent/security-context",
6885+
"redirect_document_id": false
6886+
},
68826887
{
68836888
"source_path": "articles/reliability/whats-new.md",
68846889
"redirect_url": "/azure/reliability/overview",

articles/active-directory-b2c/service-limits.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: CelesteDG
88
ms.service: azure-active-directory
99

1010
ms.topic: reference
11-
ms.date: 05/11/2024
11+
ms.date: 07/15/2025
1212
ms.subservice: b2c
1313
zone_pivot_groups: b2c-policy-type
1414

@@ -197,6 +197,7 @@ As a protection for our customers, Microsoft places some restrictions on telepho
197197
| 228 | Togo | 10 | 30 |
198198
| 233 | Ghana| 10 | 30 |
199199
| 234 | Nigeria | 20 | 100 |
200+
| 235 | Chad | 10 | 30 |
200201
| 236 | Central African Republic  | 10 | 30 |
201202
| 238 | Cape Verde | 10 | 30 |
202203
| 249 | Sudan | 10 | 30 |
@@ -212,6 +213,7 @@ As a protection for our customers, Microsoft places some restrictions on telepho
212213
| 265 | Malawi  | 10 | 30 |
213214
| 373 | Moldova | 20 | 100 |
214215
| 375 | Belarus   | 10 | 30 |
216+
| 381 | Serbia | 50 | 200 |
215217
| 386 | Slovenia | 10 | 50 |
216218
| 501 | Belize| 10 | 30 |
217219
| 502 | Guatemala | 10 | 50
@@ -236,10 +238,13 @@ As a protection for our customers, Microsoft places some restrictions on telepho
236238
| 95 | Myanmar (Burma) | 10 | 30 |
237239
| 961 | Lebanon  | 10 | 30 |
238240
| 963 | Syria  | 10 | 30 |
241+
| 964 | Iraq | 50 | 200 |
239242
| 967 | Yemen |10 | 30 |
240243
| 970 | State of Palestine| 10 | 30 |
241244
| 972 | Israel  | 50 | 200 |
245+
| 975 | Bhutan | 20 | 100 |
242246
| 976 | Mongolia  | 10 | 30 |
247+
| 977 | Nepal | 20 | 100 |
243248
| 992 | Tajikistan | 10 | 30 |
244249
| 993 | Turkmenistan | 10 | 30 |
245250
| 994 | Azerbaijan | 50 | 200 |

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ Available aggregations for these metrics are as follows.
5656

5757
In the Developer, Basic, Standard, and Premium tiers, the **Capacity** metric is available for making decisions about scaling or upgrading an API Management instance. Its construction is complex and imposes certain behavior.
5858

59+
[!INCLUDE [capacity-change.md](../../includes/api-management-capacity-change.md)]
60+
5961
Available aggregations for this metric are as follows.
6062

6163
* **Avg** - Average percentage of capacity used across gateway processes in every [unit](upgrade-and-scale.md) of an API Management instance.
@@ -171,6 +173,7 @@ Use capacity metrics for making decisions whether to scale an API Management ins
171173
+ Ignore sudden spikes that are most likely not related to an increase in load (see [Capacity metric behavior](#capacity-metric-behavior) section for explanation).
172174
+ As a general rule, upgrade or scale your instance when a capacity metric value exceeds **60% - 70%** for a long period of time (for example, 30 minutes). Different values may work better for your service or scenario.
173175
+ If your instance or workspace gateway is configured with only 1 unit, upgrade or scale it when a capacity metric value exceeds **40%** for a long period. This recommendation is based on the need to reserve capacity for guest OS updates in the underlying service platform.
176+
+ Use [available diagnostics](monitor-api-management.md) to monitor the response times of API calls. Consider adjusting scaling thresholds if you notice degraded response times with increasing value of capacity metric.
174177

175178
> [!TIP]
176179
> If you are able to estimate your traffic beforehand, test your API Management instance or workspace gateway on workloads you expect. You can increase the request load 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.

articles/app-service/configure-ssl-certificate.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ You can add up to 1,000 private certificates per webspace.
5555

5656
## Create a free managed certificate
5757

58-
The free App Service managed certificate is a turn-key solution for helping to secure your custom DNS name in App Service. Without any action from you, this TLS/SSL server certificate is fully managed by App Service and is automatically renewed continuously in six-month increments, 45 days before expiration, as long as the prerequisites that you set up stay the same. All the associated bindings are updated with the renewed certificate. You create and bind the certificate to a custom domain, and let App Service do the rest.
58+
The free App Service managed certificate is a turn-key solution for helping to secure your custom DNS name in App Service. Without any action from you, this TLS/SSL server certificate is fully managed by App Service and is automatically renewed, as long as the prerequisites that you set up stay the same. All the associated bindings are updated with the renewed certificate. You create and bind the certificate to a custom domain, and let App Service do the rest.
5959

6060
Before you create a free managed certificate, make sure that you [meet the prerequisites](#prerequisites) for your app.
6161

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Azure Application Gateway uses gateway-managed cookies for maintaining user sess
3232
This feature is useful when you want to keep a user session on the same server and when session state is saved locally on the server for a user session. If the application can't handle cookie-based affinity, you can't use this feature. To use it, make sure that the clients support cookies.
3333

3434
> [!NOTE]
35-
> Some vulnerability scans may flag the Application Gateway affinity cookie because the Secure or HttpOnly flags are not set. These scans don't take into account that the data in the cookie is generated using a one-way hash. The cookie doesn't contain any user information and is used purely for routing.
35+
> Some vulnerability scans may flag the Application Gateway affinity cookie because the Secure or HttpOnly flags aren't set. These scans don't take into account that the data in the cookie is generated using a one-way hash. The cookie doesn't contain any user information and is used purely for routing.
3636
3737

3838
The [Chromium browser](https://www.chromium.org/Home) [v80 update](https://chromiumdash.appspot.com/schedule) brought a mandate where HTTP cookies without [SameSite](https://datatracker.ietf.org/doc/html/draft-ietf-httpbis-rfc6265bis-03#rfc.section.5.3.7) attribute have to be treated as SameSite=Lax. For CORS (Cross-Origin Resource Sharing) requests, if the cookie has to be sent in a third-party context, it has to use *SameSite=None; Secure* attributes and it should be sent over HTTPS only. Otherwise, in an HTTP only scenario, the browser doesn't send the cookies in the third-party context. The goal of this update from Chrome is to enhance security and to avoid Cross-Site Request Forgery (CSRF) attacks.
@@ -78,7 +78,7 @@ By default, the Application Gateway resource includes popular CA certificates, a
7878

7979
### Request timeout
8080

81-
This setting is the number of seconds that the application gateway waits to receive a response from the backend server. The default value is 20 seconds. However, you may wish to adjust this setting to the needs of your application.
81+
This setting is the number of seconds that the application gateway waits to receive a response from the backend server. The default value is 20 seconds. However, you may wish to adjust this setting to the needs of your application. Acceptable values are from 1 second to 86400 seconds (24 hours).
8282

8383
### Override backend path
8484

@@ -152,7 +152,7 @@ This setting specifies the port where the backend servers listen to traffic from
152152

153153
### Timeout
154154

155-
This setting is the number of seconds that the application gateway waits before closing the frontend and backend connections in case there is no transmission of any data.
155+
This setting is the number of seconds that the application gateway waits before closing the frontend and backend connections in case there's no transmission of any data. Acceptable values are from 1 second to 86400 seconds (24 hours).
156156

157157
### Trusted root certificate
158158

articles/azure-netapp-files/snapshots-introduction.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: azure-netapp-files
55
author: b-hchen
66
ms.service: azure-netapp-files
77
ms.topic: concept-article
8-
ms.date: 01/28/2025
8+
ms.date: 07/17/2025
99
ms.author: anfdocs
1010
# Customer intent: As a data administrator, I want to create and manage snapshots in Azure NetApp Files, so that I can ensure efficient data protection, quick recovery options, and scalable storage management for my organization's critical data.
1111
---
@@ -104,7 +104,7 @@ The following diagram shows how snapshot data is transferred from the Azure NetA
104104

105105
The Azure NetApp Files backup functionality is designed to keep a longer history of backups as indicated in this simplified example. Notice how the backup repository on the right contains more and older snapshots than the protected volume and snapshots on the left.
106106

107-
Most use cases require that you keep online snapshots on the Azure NetApp Files volume for a relatively short amount of time (usually several months) to serve the most common recoveries of lost data due to application or user error. The Azure NetApp Files backup functionality is used to extend the data-protection period to a year or longer by sending the snapshots over to cost-efficient Azure storage. As indicated by the blue color in the diagram, the very first transfer is the baseline, which copies all consumed data blocks in the source Azure NetApp Files volume and snapshots. Consecutive backups use the snapshot mechanism to update the backup repository with only block-incremental updates.
107+
Most use cases require that you keep online snapshots on the Azure NetApp Files volume for a relatively short amount of time (usually several days, maybe weeks) to serve the most common recoveries of lost data due to application or user error. The Azure NetApp Files backup functionality is used to extend the data-protection period to a year or longer by sending the snapshots over to cost-efficient Azure storage. As indicated by the blue color in the diagram, the very first transfer is the baseline, which copies all consumed data blocks in the source Azure NetApp Files volume and snapshots. Consecutive backups use the snapshot mechanism to update the backup repository with only block-incremental updates.
108108

109109
## Ways to restore data from snapshots
110110

articles/azure-vmware/native-connect-on-premises.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Connectivity to on-premises is performed using a standard ExpressRoute connectio
3131
## Related topics
3232

3333
- [Connectivity to an Azure Virtual Network](native-network-connectivity.md)
34-
(native-internet-connectivity-design-considerations.md)
34+
- [Internet connectivity options](native-internet-connectivity-design-considerations.md)
3535
- [Connect multiple Gen 2 private clouds](native-connect-multiple-private-clouds.md)
3636
- [Connect Gen 2 private clouds and Gen 1 private clouds](native-connect-private-cloud-previous-edition.md)
3737
- [Public and Private DNS forward lookup zone configuration](native-dns-forward-lookup-zone.md)

articles/azure-vmware/native-internet-connectivity-design-considerations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Internet connectivity using Azure Firewall is similar to the way Azure virtual n
3030

3131
1. Have or create Azure Firewall or a third-party Network Virtual Appliance in the virtual network local to the private cloud or in the peered virtual network.
3232
2. Define an Azure route table with a 0.0.0.0/0 route pointing to the next-hop type Virtual Appliance with the next-hop IP address of the Azure Firewall private IP or IP of the Network Virtual Appliance.
33-
3. Associate the route table to the Azure VMware Solution specific virtual network subnets named “esx-lrnsxuplink” and “esx-lrnsxuplink-1”, which are part of the virtual network associated with private cloud.
33+
3. Associate the route table to the Azure VMware Solution specific virtual network subnets named “avs-nsx-gw-1” and “avs-nsx-gw-2”, which are part of the virtual network associated with private cloud.
3434
>[!Note]
3535
>The Azure route tables (UDR), associated with private cloud uplink subnets, and private cloud VNet need to be in the same Azure resource group.
3636
4. Have necessary firewall rules to allow traffic to and from the internet.

articles/azure-vmware/native-network-design-consideration.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ The following functionality is limited during this time. These limitations will
2929
- Virtual Network Service Endpoints direct connectivity from Azure VMware Solution workloads is not supported.
3030
- **vCloud Director** using Private Endpoints is supported. However, vCloud Director using Public Endpoints is not supported.
3131
- **vSAN Stretched Clusters** is not supported.
32-
- Public IP down to the VMware NSX Microsoft Edge for configuring internet will not be supported.
32+
- Public IP down to the VMware NSX Microsoft Edge for configuring internet will not be supported. You can find what internet options are supported in [Internet connectivity options](native-internet-connectivity-design-considerations.md)
3333
- Support for **AzCLI**, **PowerShell**, and **.NET SDK** are not available during Public Preview.
3434
- **Run commands** interacting with customer segments aren't supported, including Zerto, JetStream, and other 3rd-party integrations.
3535

@@ -64,11 +64,11 @@ Example /22 CIDR network address block **10.31.0.0/22** is divided into the foll
6464
| :-- | :-- | :-- | :-- |
6565
| VMware NSX Network | /27 | NSX Manager network. | 10.31.0.0/27 |
6666
| vCSA Network | /27 | vCenter Server network. | 10.31.0.32/27 |
67-
| esx-cust-fdc | /27 | The management appliances (vCenter Server and NSX manager) are behind the "esx-cust-fdc” subnet, programmed as secondary IP ranges on this subnet. | 10.31.0.64/27 |
68-
| cust-fds | /27 | Used by Azure VMware Solution Gen 2 to program routes created in VMware NSX into the virtual network. | 10.31.0.96/27 |
69-
| services | /27 | Used for Azure VMware Solution Gen 2 provider services. Also used to configure private DNS resolution for your private cloud. | 10.31.0.160/27 |
70-
| esx-lrnsxuplink, esx-lrnsxuplink-1 | /28 | Subnets off each of the T0 Gateways per edge. These subnets are used to program VMware NSX network segments as secondary IPs addresses. | 10.31.0.224/28, 10.31.0.240/28 |
71-
| esx-cust-vmk1 | /24 | vmk1 is the management interface used by customers to access the host. IPs from the vmk1 interface come from these subnets. All of the vmk1 traffic for all hosts comes from this subnet range. | 10.31.1.0/24 |
67+
| avs-mgmt| /27 | The management appliances (vCenter Server and NSX manager) are behind the "avs-mgmt” subnet, programmed as secondary IP ranges on this subnet. | 10.31.0.64/27 |
68+
| avs-vnet-sync| /27 | Used by Azure VMware Solution Gen 2 to program routes created in VMware NSX into the virtual network. | 10.31.0.96/27 |
69+
| avs-services | /27 | Used for Azure VMware Solution Gen 2 provider services. Also used to configure private DNS resolution for your private cloud. | 10.31.0.160/27 |
70+
|avs-nsx-gw-1, avs-nsx-gw-2| /28 | Subnets off each of the T0 Gateways per edge. These subnets are used to program VMware NSX network segments as secondary IPs addresses. | 10.31.0.224/28, 10.31.0.240/28 |
71+
| esx-mgmt-vmk1 | /24 | vmk1 is the management interface used by customers to access the host. IPs from the vmk1 interface come from these subnets. All of the vmk1 traffic for all hosts comes from this subnet range. | 10.31.1.0/24 |
7272
| esx-vmotion-vmk2 | /24 | vMotion VMkernel interfaces. | 10.31.2.0/24 |
7373
| esx-vsan-vmk3 | /24 | vSAN VMkernel interfaces and node communication. | 10.31.3.0/24 |
7474
| Reserved | /27 | Reserved Space. | 10.31.0.128/27 |

articles/backup/azure-elastic-san-backup-configure.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
title: Configure Azure Elastic SAN backup using Azure portal (preview)
33
description: Learn how to configure Azure Elastic SAN backup (preview) using Azure portal.
44
ms.topic: how-to
5-
ms.date: 06/20/2025
6-
author: jyothisuri
7-
ms.author: jsuri
5+
ms.date: 07/15/2025
6+
author: AbhishekMallick-MS
7+
ms.author: v-mallicka
88
# Customer intent: "As an IT administrator, I want to configure backup for Azure Elastic SAN using the Azure portal, so that I can ensure data protection and recovery for my storage resources."
99
---
1010

@@ -39,7 +39,7 @@ To create a backup policy for Elastic SAN from Azure Business Continuity Center,
3939
1. On the **Schedule + retention** tab, under the **Backup schedule** section, set the schedule for creating recovery points for backups.
4040

4141
>[!Note]
42-
>Azure Backup currently supports **Daily** backup frequency only, which is selected by default.
42+
>Azure Backup currently supports **Daily** and **Weekly**backup frequency. **Daily** backup is selected by default.
4343
4444
:::image type="content" source="./media/azure-elastic-storage-area-network-backup-configure/set-backup-schedule.png" alt-text="Screenshot shows how to configure the backup schedule." lightbox="./media/azure-elastic-storage-area-network-backup-configure/set-backup-schedule.png":::
4545

0 commit comments

Comments
 (0)