Skip to content

Commit 2b2b74b

Browse files
authored
Merge pull request #292026 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 23e2550 + ffaf8b1 commit 2b2b74b

13 files changed

+16
-16
lines changed

articles/nat-gateway/troubleshoot-nat-connectivity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ You observe a drop in the datapath availability of NAT gateway, which coincides
5656
* If your investigation is inconclusive, open a support case to [further troubleshoot](#more-troubleshooting-guidance).
5757

5858
>[!NOTE]
59-
>It is important to understand why SNAT port exhaustion occurs. Make sure you use the right patterns for scalable and reliable scenarios. Adding more SNAT ports to a scenario without understanding the cause of the demand should be a last resort. If you do not understand why your scenario is applying pressure on SNAT port inventory, adding more SNAT ports by adding more IP addresses will only delay the same exhaustion failure as your application scales. You may be masking other inefficiencies and anti-patterns. For more informations, see [best practices for efficient use of outbound connections](#outbound-connectivity-best-practices).
59+
>It is important to understand why SNAT port exhaustion occurs. Make sure you use the right patterns for scalable and reliable scenarios. Adding more SNAT ports to a scenario without understanding the cause of the demand should be a last resort. If you do not understand why your scenario is applying pressure on SNAT port inventory, adding more SNAT ports by adding more IP addresses will only delay the same exhaustion failure as your application scales. You may be masking other inefficiencies and anti-patterns. For more information, see [best practices for efficient use of outbound connections](#outbound-connectivity-best-practices).
6060
6161
### Possible solutions for TCP connection timeouts
6262

articles/network-watcher/network-watcher-visualize-nsg-flow-logs-open-source-tools.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ By connecting NSG flow logs with the Elastic Stack, we can create a Kibana dashb
3737

3838
The following instructions are used to install Elasticsearch in Ubuntu Azure VMs. For instructions on how to install elastic search in Red Hat Enterprise Linux, see [Install Elasticsearch with RPM](https://www.elastic.co/guide/en/elasticsearch/reference/8.6/rpm.html).
3939

40-
1. The Elastic Stack from version 5.0 and above requires Java 8. Run the command `java -version` to check your version. If you don't have Java installed, see the documentation on the [Azure-suppored JDKs](/azure/developer/java/fundamentals/java-support-on-azure).
40+
1. The Elastic Stack from version 5.0 and above requires Java 8. Run the command `java -version` to check your version. If you don't have Java installed, see the documentation on the [Azure-supported JDKs](/azure/developer/java/fundamentals/java-support-on-azure).
4141
2. Download the correct binary package for your system:
4242

4343
```bash

articles/network-watcher/nsg-flow-logs-policy-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ To assign the *deployIfNotExists* policy:
9292
| Setting | Value |
9393
| --- | --- |
9494
| **NSG Region** | Select the region of your network security group that you're targeting with the policy. |
95-
| **Storage id** | Enter the full resource ID of the storage account. The storage account must be in the same region as the network security group. The format of storage resource ID is `/subscriptions/<SubscriptionID>/resourceGroups/<ResouceGroupName>/providers/Microsoft.Storage/storageAccounts/<StorageAccountName>`. |
95+
| **Storage id** | Enter the full resource ID of the storage account. The storage account must be in the same region as the network security group. The format of storage resource ID is `/subscriptions/<SubscriptionID>/resourceGroups/<ResourceGroupName>/providers/Microsoft.Storage/storageAccounts/<StorageAccountName>`. |
9696
| **Network Watchers RG** | Select the resource group of your Azure Network Watcher instance. |
9797
| **Network Watcher name** | Enter the name of your Network Watcher instance. |
9898

articles/network-watcher/traffic-analytics-schema.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ let TableWithBlobId =
7070
| extend blobTime = format_datetime(todatetime(FlowIntervalStartTime_t), "yyyy MM dd hh")
7171
| extend nsgComponents = split(toupper(NSGList_s), "/"), dateTimeComponents = split(blobTime, " ")
7272
| extend BlobPath = strcat("https://", saName,
73-
"@insights-logs-networksecuritygroupflowevent/resoureId=/SUBSCRIPTIONS/", nsgComponents[0],
73+
"@insights-logs-networksecuritygroupflowevent/resourceId=/SUBSCRIPTIONS/", nsgComponents[0],
7474
"/RESOURCEGROUPS/", nsgComponents[1],
7575
"/PROVIDERS/MICROSOFT.NETWORK/NETWORKSECURITYGROUPS/", nsgComponents[2],
7676
"/y=", dateTimeComponents[0], "/m=", dateTimeComponents[1], "/d=", dateTimeComponents[2], "/h=", dateTimeComponents[3],
@@ -147,7 +147,7 @@ The following table lists the fields in the schema and what they signify for net
147147
> | **LoadBalancer2_s** | \<SubscriptionID\>/\<ResourceGroupName\>/\<LoadBalancerName\> | Load balancer associated with the Destination IP in the flow. |
148148
> | **LocalNetworkGateway1_s** | \<SubscriptionID\>/\<ResourceGroupName\>/\<LocalNetworkGatewayName\> | Local network gateway associated with the Source IP in the flow. |
149149
> | **LocalNetworkGateway2_s** | \<SubscriptionID\>/\<ResourceGroupName\>/\<LocalNetworkGatewayName\> | Local network gateway associated with the Destination IP in the flow. |
150-
> | **ConnectionType_s** | - VNetPeering <br> - VpnGateway <br> - ExpressRoute | The onnection Type. |
150+
> | **ConnectionType_s** | - VNetPeering <br> - VpnGateway <br> - ExpressRoute | The Connection Type. |
151151
> | **ConnectionName_s** | \<SubscriptionID\>/\<ResourceGroupName\>/\<ConnectionName\> | The connection Name. For flow type P2S, it is formatted as \<gateway name\>_\<VPN Client IP\>. |
152152
> | **ConnectingVNets_s** | Space separated list of virtual network names | In case of hub and spoke topology, hub virtual networks are populated here. |
153153
> | **Country_s** | Two letter country code (ISO 3166-1 alpha-2) | Populated for flow type ExternalPublic. All IP addresses in PublicIPs_s field share the same country code. |

articles/networking/create-zero-trust-network-web-apps.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ You'll deploy Azure Firewall to perform packet inspection between the applicatio
395395
| Firewall tier | Select **Premium**. |
396396
| Firewall policy | Select **Add new**.|
397397
| **Create a new Firewall Policy** | |
398-
| Policy name | Enter **myFirewalPolicy**. |
398+
| Policy name | Enter **myFirewallPolicy**. |
399399
| Policy tier | Select **Premium** and select **OK**. |
400400
| Choose a virtual network | Select **Use existing**. |
401401
| Virtual network | Select **hub-vnet**. |
@@ -408,7 +408,7 @@ You'll deploy Azure Firewall to perform packet inspection between the applicatio
408408
In this task, you'll configure the firewall policy used for packet inspection.
409409

410410
1. Navigate to the Azure Firewall that you previously created.
411-
1. In the **Overview** page, locate and select the link to the **myFirewalPolicy** firewall policy.
411+
1. In the **Overview** page, locate and select the link to the **myFirewallPolicy** firewall policy.
412412
1. In the **Firewall Policy** page, select the **IDPS** under **Settings**.
413413
1. On the **IDPS** page, select **Alert and deny** and then select **Apply**. Wait for the firewall policy to complete updating before proceeding to the next step.
414414
1. Select **TLS inspection** under **Settings**

articles/openshift/howto-bring-nsg.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ This article shows how to use the "bring your own" Network Security Group (NSG)
8080
```
8181
az aro create \
8282
--resource-group BASE_RESOURCE_GROUP_NAME \
83-
--name CLSUTER_NAME \
83+
--name CLUSTER_NAME \
8484
--vnet VNET_NAME \
8585
--master-subnet MASTER_SUBNET_NAME \
8686
--worker-subnet WORKER_SUBNET_NAME \

articles/openshift/quickstart-openshift-arm-bicep-template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ Save the following example as *azuredeploy.json*:
164164
"type": "string",
165165
"defaultValue": "172.30.0.0/16",
166166
"metadata": {
167-
"decription": "Cidr of service"
167+
"description": "Cidr of service"
168168
}
169169
},
170170
"clusterName" : {

articles/operational-excellence/relocation-automation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ In the diagram below, the red flow lines illustrate redeployment of the target i
6161

6262
1. Deploy the template using [ARM](/azure/automation/quickstart-create-automation-account-template), [Portal](/azure/automation/automation-create-standalone-account?tabs=azureportal) or [PowerShell](/powershell/module/az.automation/import-azautomationrunbook?view=azps-11.2.0&preserve-view=true).
6363

64-
1. Use PowerShell to export all associated runbooks from the source Azure Automation instance and import them to the target instance. Reconfigure the properties as per target. For more information, see [Export-AzAuotomationRunbook](/powershell/module/az.automation/export-azautomationrunbook?view=azps-11.2.0&viewFallbackFrom=azps-9.4.0&preserve-view=true).
64+
1. Use PowerShell to export all associated runbooks from the source Azure Automation instance and import them to the target instance. Reconfigure the properties as per target. For more information, see [Export-AzAutomationRunbook](/powershell/module/az.automation/export-azautomationrunbook?view=azps-11.2.0&viewFallbackFrom=azps-9.4.0&preserve-view=true).
6565

6666
1. Associate the relocated Azure Automation instance to the target Log Analytics workspace.
6767

articles/operational-excellence/relocation-firewall.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ If you're running classic firewall rules without Firewall policy, migrate to Fir
142142
1. Review and update the configuration for the topics below to reflect the changes required for the target region.
143143
- **IP Groups.** To include IP addresses from the target region, if different from the source, *IP Groups* should be reviewed. The IP addresses included in the groups must be modified.
144144
- **Zones.** Configure the [availability Zones (AZ)](../reliability/availability-zones-overview.md) in the target region.
145-
- **Forced Tunneling.** [Ensure that you've relcoated the virtual network](./relocation-virtual-network.md) and that the firewall *Management Subnet* is present before the Azure Firewall is relocated. Update the IP Address in the target region of the Network Virtual Appliance (NVA) to which the Azure Firewall should redirect the traffic, in the User Defined Route (UDR).
145+
- **Forced Tunneling.** [Ensure that you've relocated the virtual network](./relocation-virtual-network.md) and that the firewall *Management Subnet* is present before the Azure Firewall is relocated. Update the IP Address in the target region of the Network Virtual Appliance (NVA) to which the Azure Firewall should redirect the traffic, in the User Defined Route (UDR).
146146
- **DNS.** Review IP Addresses for your custom custom *DNS Servers* to reflect your target region. If the *DNS Proxy* feature is enabled, be sure to configure your virtual network DNS server settings and set the Azure Firewall’s private IP address as a *Custom DNS server*.
147147
- **Private IP ranges (SNAT).** - If custom ranges are defined for SNAT, it's recommended that you review and eventually adjust to include the target region address space.
148148
- **Tags.** - Verify and eventually update any tag that may reflect or refer to the new firewall location.
@@ -185,7 +185,7 @@ To find the location code for your target region, see [Data residency in Azure](
185185
1. Review and update the configuration for the topics below to reflect the changes required for the target region.
186186
- **IP Groups.** To include IP addresses from the target region, if different from the source, *IP Groups* should be reviewed. The IP addresses included in the groups must be modified.
187187
- **Zones.** Configure the [availability Zones (AZ)](../reliability/availability-zones-overview.md) in the target region.
188-
- **Forced Tunneling.** [Ensure that you've relcoated the virtual network](./relocation-virtual-network.md) and that the firewall *Management Subnet* is present before the Azure Firewall is relocated. Update the IP Address in the target region of the Network Virtual Appliance (NVA) to which the Azure Firewall should redirect the traffic, in the User Defined Route (UDR).
188+
- **Forced Tunneling.** [Ensure that you've relocated the virtual network](./relocation-virtual-network.md) and that the firewall *Management Subnet* is present before the Azure Firewall is relocated. Update the IP Address in the target region of the Network Virtual Appliance (NVA) to which the Azure Firewall should redirect the traffic, in the User Defined Route (UDR).
189189
- **DNS.** Review IP Addresses for your custom custom *DNS Servers* to reflect your target region. If the *DNS Proxy* feature is enabled, be sure to configure your virtual network DNS server settings and set the Azure Firewall’s private IP address as a *Custom DNS server*.
190190
- **Private IP ranges (SNAT).** - If custom ranges are defined for SNAT, it's recommended that you review and eventually adjust to include the target region address space.
191191
- **Tags.** - Verify and eventually update any tag that may reflect or refer to the new firewall location.

articles/vpn-gateway/azure-vpn-client-prerequisites-check.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ The **Run Prerequisites Test** feature is available in the Azure VPN Client for
2828
1. Select **Run Prerequisites Test** to run the check.
2929
1. After the prerequisites check has completed, the **Status** shows **Complete**. Review the results. If any test items don't pass, the status indicates that and prescriptive measures are provided to help you mitigate the issue.
3030

31-
:::image type="content" source="./media/azure-vpn-client-prerequisites-check/error.png" alt-text="Screenshot of prerequistes test status results." lightbox="./media/azure-vpn-client-prerequisites-check/error.png":::
31+
:::image type="content" source="./media/azure-vpn-client-prerequisites-check/error.png" alt-text="Screenshot of prerequisites test status results." lightbox="./media/azure-vpn-client-prerequisites-check/error.png":::
3232

3333
## Disable automatic prerequisites checks
3434

0 commit comments

Comments
 (0)