Skip to content

Commit 5277474

Browse files
authored
Merge pull request #296349 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 2aebbed + a7f2a55 commit 5277474

File tree

5 files changed

+4
-22
lines changed

5 files changed

+4
-22
lines changed

articles/event-hubs/includes/event-hubs-tier-limits.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ The following table shows limits that are different for Basic, Standard, Premium
2222
| Maximum size of Event Hubs publication | 256 KB | 1 MB | 1 MB | 1 MB |
2323
| Number of consumer groups per event hub | 1 | 20 | 100 | 1,000<br/>No limit per CU |
2424
| Number of Kafka consumer groups per namespace | NA | 1,000 | 1,000 | 1,000 |
25-
| Number of brokered connections per namespace | 100 | 5,000 | 10,000 per PU<br/><br/>For example, if the namespace is assigned 3 PUs, the limit is 30,000. | 100,000 per CU |
25+
| Number of brokered connections per namespace | 100 | 5,000 | 10,000 per PU<br/><br/>For example, if the namespace is assigned 4 PUs, the limit is 40,000. | 100,000 per CU |
2626
| Maximum retention period of event data | 1 day | 7 days | 90 days | 90 days |
2727
| Event storage for retention | 84 GB per TU | 84 GB per TU | 1 TB per PU | 10 TB per CU |
2828
| Maximum TUs or PUs or CUs | 40 TUs | 40 TUs | 16 PUs | 20 CUs |

articles/firewall/firewall-sftp.md

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -108,22 +108,6 @@ $firewall = New-AzFirewall `
108108
-PublicIpAddress $pip `
109109
-FirewallPolicyId $policy.id
110110
111-
# Create the route table
112-
$routeTableDG = New-AzRouteTable `
113-
-Name Firewall-rt-table `
114-
-ResourceGroupName "$rg" `
115-
-location $location `
116-
-DisableBgpRoutePropagation
117-
118-
# Add the default route
119-
Add-AzRouteConfig `
120-
-Name "DG-Route" `
121-
-RouteTable $routeTableDG `
122-
-AddressPrefix 0.0.0.0/0 `
123-
-NextHopType "VirtualAppliance" `
124-
-NextHopIpAddress $pip.ipaddress `
125-
| Set-AzRouteTable
126-
127111
```
128112

129113
## Create a storage account and container

articles/firewall/snat-private-range.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Azure Firewall provides SNAT capability for all outbound traffic to public IP ad
1717
This logic works well when you route traffic directly to the Internet. However, there are scenarios where you may want to override the default SNAT behavior.
1818

1919
- If you've enabled [forced tunneling](forced-tunneling.md), Internet-bound traffic is SNATed to one of the firewall private IP addresses in AzureFirewallSubnet, hiding the source from your on-premises firewall.
20-
- If your organization uses registered IP address ranges outside of IANA RFC 1918 or IANA RFC 6598 for private networks, Azure Firewall SNATs the traffic to one of the firewall private IP addresses in AzureFirewallSubnet. However, you can configure Azure Firewall to **not** SNAT your public IP address range. For example, to specify an individual IP address you can specify it like this: `192.168.1.10`. To specify a range of IP addresses, you can specify it like this: `192.168.1.0/24`.
20+
- If your organization uses registered IP address ranges outside of IANA RFC 1918 or IANA RFC 6598 for private networks, Azure Firewall SNATs the traffic to one of the firewall private IP addresses in AzureFirewallSubnet. However, you can configure Azure Firewall to **not** SNAT your public IP address range. For example, to specify an individual IP address you can specify it as a single IP address `x.x.x.x`. To specify a range of IP addresses, you can specify it like this: `x.x.x.x/24`.
2121

2222
Azure Firewall SNAT behavior can be changed in the following ways:
2323

articles/hdinsight/disk-encryption.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ HDInsight supports multiple types of encryption in two different layers:
2222

2323
- Server Side Encryption (SSE) - SSE is performed by the storage service. In HDInsight, SSE is used to encrypt OS disks and data disks. It is enabled by default. SSE is a layer 1 encryption service.
2424
- Encryption at host using platform-managed key - Similar to SSE, this type of encryption is performed by the storage service. However, it is only for temporary disks and is not enabled by default. Encryption at host is also a layer 1 encryption service.
25-
- Encryption at rest using customer managed key - This type of encryption can be used on data and temporary disks. It is not enabled by default and requires the customer to provide their own key through Azure key vault. Encryption at rest is a layer 2 encryption service.
25+
- Encryption at rest using customer managed key - This type of encryption can be used on data and temporary disks. It is not enabled by default and requires the customer to provide their own key through Azure Key Vault. Encryption at rest is a layer 2 encryption service.
2626

2727
These types are summarized in the following table.
2828

@@ -39,7 +39,7 @@ Both data disks and temporary disks on each node of the cluster are encrypted wi
3939

4040
For OS disks attached to the cluster VMs only one layer of encryption (PMK) is available. It is recommended that customers avoid copying sensitive data to OS disks if having a CMK encryption is required for their scenarios.
4141

42-
If the key vault firewall is enabled on the key vault where the disk encryption key is stored, the HDInsight regional Resource Provider IP addresses for the region where the cluster will be deployed must be added to the key vault firewall configuration. This is necessary because HDInsight is not a trusted Azure key vault service.
42+
If the key vault firewall is enabled on the key vault where the disk encryption key is stored, the HDInsight regional Resource Provider IP addresses for the region where the cluster will be deployed must be added to the key vault firewall configuration. This is necessary because HDInsight is not a trusted Azure Key Vault service.
4343

4444
You can use the Azure portal or Azure CLI to safely rotate the keys in the key vault. When a key rotates, the HDInsight cluster starts using the new key within minutes. Enable the [Soft Delete](/azure/key-vault/general/soft-delete-overview) key protection features to protect against ransomware scenarios and accidental deletion. Key vaults without this protection feature aren't supported.
4545

articles/web-application-firewall/ag/application-gateway-crs-rulegroups-rules.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,6 @@ The following rule groups and rules are available when using Web Application Fir
366366
|942430|Warning - 3|Restricted SQL Character Anomaly Detection (args): # of special characters exceeded (12)|
367367
|942440|Critical - 5|SQL Comment Sequence Detected|
368368
|942450|Critical - 5|SQL Hex Encoding Identified|
369-
|942460|Warning - 3|Meta-Character Anomaly Detection Alert - Repetitive Non-Word Characters|
370369
|942470|Critical - 5|SQL Injection Attack|
371370
|942480|Critical - 5|SQL Injection Attack|
372371
|942500|Critical - 5|MySQL in-line comment detected|
@@ -691,7 +690,6 @@ The following rule groups and rules are available when using Web Application Fir
691690
|944210|Possible use of Java serialization|
692691
|944240|Remote Command Execution: Java serialization|
693692
|944250|Remote Command Execution: Suspicious Java method detected|
694-
|944300|Base64 encoded string matched suspicious keyword|
695693

696694
# [OWASP 3.1](#tab/owasp31)
697695

0 commit comments

Comments
 (0)