Skip to content

Commit 165160c

Browse files
Merge branch 'MicrosoftDocs:main' into main
2 parents 0646786 + 7559287 commit 165160c

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

articles/ddos-protection/ddos-protection-sku-comparison.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ The following table shows features and corresponding SKUs.
3434

3535
| Feature | DDoS IP Protection | DDoS Network Protection |
3636
|---|---|---|
37+
| Protects Public IP Standard SKU | Yes | Yes |
38+
| Protects Public IP Basic SKU | No | Yes |
3739
| Active traffic monitoring & always on detection | Yes| Yes |
3840
| L3/L4 Automatic attack mitigation | Yes | Yes |
3941
| Automatic attack mitigation | Yes | Yes |

articles/iot-dps/how-to-control-access.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ As a comparison, the equivalent Python code to generate a security token is:
217217
from base64 import b64encode, b64decode
218218
from hashlib import sha256
219219
from time import time
220-
from urllib import quote_plus, urlencode
220+
from urllib.parse import quote_plus, urlencode
221221
from hmac import HMAC
222222
223223
def generate_sas_token(uri, key, policy_name, expiry=3600):

articles/spring-apps/tutorial-custom-domain.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Certificates encrypt web traffic. These TLS/SSL certificates can be stored in Az
3131

3232
## Keyvault Private Link Considerations
3333

34-
The Azure Spring Apps management IPs are not yet part of the Azure Trusted Microsoft services. Therefore, to allow Azure Spring Apps to load certificates from a Key Vault protected with Private endpoint connections, you must add the following IPs to Azure Key Vault Firewall: `20.53.123.160 52.143.241.210 40.65.234.114 52.142.20.14 20.54.40.121 40.80.210.49 52.253.84.152 20.49.137.168 40.74.8.134 51.143.48.243`
34+
The Azure Spring Apps management IPs are not yet part of the Azure Trusted Microsoft services. Therefore, to allow Azure Spring Apps to load certificates from a Key Vault protected with Private endpoint connections, you must add the following IPs to Azure Key Vault Firewall: `20.99.204.111, 20.201.9.97, 20.74.97.5, 52.235.25.35, 20.194.10.0, 20.59.204.46, 104.214.186.86, 52.153.221.222, 52.160.137.39, 20.39.142.56, 20.199.190.222, 20.79.64.6, 20.211.128.96, 52.149.104.144, 20.197.121.209, 40.119.175.77, 20.108.108.22, 102.133.143.38, 52.226.244.150, 20.84.171.169, 20.93.48.108, 20.75.4.46, 20.78.29.213, 20.106.86.34, 20.193.151.132`
3535

3636
## Import certificate
3737

0 commit comments

Comments
 (0)