Skip to content

Commit 05327bc

Browse files
authored
Merge pull request #253068 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 8e015aa + 55b584b commit 05327bc

File tree

5 files changed

+20
-7
lines changed

5 files changed

+20
-7
lines changed

articles/active-directory/develop/test-throttle-service-limits.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ The following table lists Microsoft Entra throttling limits to consider when run
5555
| Limit type | Resource unit quota | Write quota |
5656
|-------------------|----------------|----------------|
5757
| application+tenant pair | S: 3500, M:5000, L:8000 per 10 seconds | 3000 per 2 minutes and 30 seconds |
58-
| application | 150,000 per 20 seconds | 70,000 per 5 minutes |
58+
| application | 150,000 per 20 seconds | 35,000 per 5 minutes |
5959
| tenant | Not Applicable | 18,000 per 5 minutes |
6060

6161
The application + tenant pair limit varies based on the number of users in the tenant requests are run against. The tenant sizes are defined as follows: S - under 50 users, M - between 50 and 500 users, and L - above 500 users.

articles/active-directory/fundamentals/security-defaults.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,13 @@ After registration is finished, the following administrator roles will be requir
9292
- Global Administrator
9393
- Application Administrator
9494
- Authentication Administrator
95+
- Authentication Policy Administrator
9596
- Billing Administrator
9697
- Cloud Application Administrator
9798
- Conditional Access Administrator
9899
- Exchange Administrator
99100
- Helpdesk Administrator
101+
- Identity Governance Administrator
100102
- Password Administrator
101103
- Privileged Authentication Administrator
102104
- Privileged Role Administrator

articles/traffic-manager/traffic-manager-configure-subnet-routing-method.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,9 +190,9 @@ Add the two VMs running the IIS servers - *myIISVMEastUS* & *myIISVMWEurope* to
190190
| Name | myTestWebSiteEndpoint |
191191
| Target resource type | Public IP Address |
192192
| Target resource | **Choose a Public IP address** to show the listing of resources with Public IP addresses under the same subscription. In **Resource**, select the public IP address named *myIISVMEastUS-ip*. This is the public IP address of the IIS server VM in East US.|
193-
| Subnet routing settings | Add the IP address of *myVMEastUS* test VM. Any user query originating from this VM will be directed to the *myTestWebSiteEndpoint*. |
193+
| Subnet routing settings | Add the IP address of the recursive DNS resolver used by *myVMEastUS* test VM. Any user query originating from this VM will be directed to the *myTestWebSiteEndpoint*. |
194194
195-
4. Repeat steps 2 and 3 to add another endpoint named *myProductionEndpoint* for the public IP address *myIISVMWEurope-ip* that is associated with the IIS server VM named *myIISVMWEurope*. For **Subnet routing settings**, add the IP address of the test VM - *myVMWestEurope*. Any user query from this test VM will be routed to the endpoint - *myProductionWebsiteEndpoint*.
195+
4. Repeat steps 2 and 3 to add another endpoint named *myProductionEndpoint* for the public IP address *myIISVMWEurope-ip* that is associated with the IIS server VM named *myIISVMWEurope*. For **Subnet routing settings**, add the IP address of the recursive DNS resolver used by test VM - *myVMWestEurope*. Any user query from this test VM via its DNS resolver will be routed to the endpoint - *myProductionWebsiteEndpoint*.
196196
5. When the addition of both endpoints is complete, they are displayed in **Traffic Manager profile** along with their monitoring status as **Online**.
197197
198198
![Add a Traffic Manager endpoint](./media/traffic-manager-subnet-routing-method/customize-endpoint-with-subnet-routing-eastus.png)

articles/vs-azure-tools-storage-explorer-blobs.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,15 @@ The following steps illustrate how to manage the blobs (and virtual directories)
221221
1. Select the blob you wish to delete.
222222
2. On the main pane's toolbar, select **Delete**.
223223
3. Select **Yes** to the confirmation dialog.
224+
225+
* **Delete a blob along with snapshots**
226+
227+
1. Select the blob you wish to delete.
228+
2. On the main pane's toolbar, select **Delete**.
229+
3. Select **Yes** to the confirmation dialog.
230+
4. Under Activities the deletion of the blob will be skipped now click on retry.
231+
5. Retry Azcopy window will open and from Snapshot select Delete blobs with snapshots option from dropdown then
232+
select Retry selected.
224233

225234
## Next steps
226235

@@ -246,4 +255,4 @@ The following steps illustrate how to manage the blobs (and virtual directories)
246255
[16]: ./media/vs-azure-tools-storage-explorer-blobs/blob-upload-files-options.png
247256
[17]: ./media/vs-azure-tools-storage-explorer-blobs/blob-upload-folder-menu.png
248257
[18]: ./media/vs-azure-tools-storage-explorer-blobs/blob-upload-folder-options.png
249-
[19]: ./media/vs-azure-tools-storage-explorer-blobs/blob-container-open-editor-context-menu.png
258+
[19]: ./media/vs-azure-tools-storage-explorer-blobs/blob-container-open-editor-context-menu.png

articles/web-application-firewall/shared/application-ddos-protection.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Azure WAF has many features that can be used to mitigate many different types of
2727

2828
* Use bot protection managed rule set to protect against known bad bots. For more information, see [Configuring bot protection](../afds/waf-front-door-policy-configure-bot-protection.md).
2929

30-
* Apply rate limit to prevent IP addresses from calling your service too frequently. For more information, see [Rate limiting](../afds/waf-front-door-rate-limit.md).
30+
* Apply rate limits to prevent IP addresses from calling your service too frequently. For more information, see [Rate limiting](../afds/waf-front-door-rate-limit.md).
3131

3232
* Block IP addresses, and ranges that you identify as malicious. For more information, see [IP restrictions](../afds/waf-front-door-configure-ip-restriction.md).
3333

@@ -49,6 +49,8 @@ Application Gateway WAF SKUs can be used to mitigate many L7 DDoS attacks:
4949

5050
* Use bot protection managed rule set provides protection against known bad bots. For more information, see [Configuring bot protection](../ag/bot-protection.md).
5151

52+
* Apply rate limits to prevent IP addresses from calling your service too frequently. For more information, see [Configuring Rate limiting custom rules](../ag/rate-limiting-configure.md).
53+
5254
* Block IP addresses, and ranges that you identify as malicious. For more information, see examples at [Create and use v2 custom rules](../ag/create-custom-waf-rules.md).
5355

5456
* Block or redirect to a static web page any traffic from outside a defined geographic region, or within a defined region that doesn't fit the application traffic pattern. For more information, see examples at [Create and use v2 custom rules](../ag/create-custom-waf-rules.md).
@@ -65,9 +67,9 @@ Application Gateway WAF SKUs can be used to mitigate many L7 DDoS attacks:
6567

6668
* You can bypass the WAF for known legitimate traffic by creating Match Custom Rules with the action of Allow to reduce false positive. These rules should be configured with a high priority (lower numeric value) than other block and rate limit rules.
6769

68-
* Depending on your traffic pattern, create a preventive rate limit rule (only applies to Azure Front Door). For example, you can configure a rate limit rule to not allow any single *Client IP address* to send more than XXX traffic per window to your site. Azure Front Door supports two fixed windows for tracking requests, 1 and 5 minutes. It's recommended to use the 5-minute window for better mitigation of HTTP Flood attacks. For example, **Configure a Rate Limit Rule**, which blocks any *Source IP* that exceeds 100 requests in a 5-minute window. This rule should be the lowest priority rule (priority is ordered with 1 being the highest priority), so that more specific Rate Limit rules or Match rules can be created to match before this rule.
70+
* At a minimum, you should have a rate limit rule that blocks high rate of requests from any single IP address. For example, you can configure a rate limit rule to not allow any single *Client IP address* to send more than XXX traffic per window to your site. Azure WAF supports two windows for tracking requests, 1 and 5 minutes. It's recommended to use the 5-minute window for better mitigation of HTTP Flood attacks. This rule should be the lowest priority rule (priority is ordered with 1 being the highest priority), so that more specific Rate Limit rules or Match rules can be created to match before this rule. If you are using Application Gateway WAF v2, you can make use of additional rate limiting configurations to track and block clients by methods other than Client IP. More information on Rate Limits on Application Gateway waf can be found at [Rate limiting overview](../ag/rate-limiting-overview.md).
6971

70-
The following Log Analytics query can be helpful in determining the threshold you should use for the above rule.
72+
The following Log Analytics query can be helpful in determining the threshold you should use for the above rule. For a similar query but with Application Gateway, replace "FrontdoorAccessLog" with "ApplicationGatewayAccessLog".
7173

7274
```
7375
AzureDiagnostics

0 commit comments

Comments
 (0)