Skip to content

Commit bd3919a

Browse files
authored
Merge pull request #282999 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 9f64a8f + 9e54c5e commit bd3919a

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

articles/defender-for-cloud/azure-devops-extension.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ procedureSection:
110110
# policy: 'azuredevops' | 'microsoft' | 'none'. Optional. The name of a well-known Microsoft policy to determine the tools/checks to run. If no configuration file or list of tools is provided, the policy may instruct MSDO which tools to run. Default: azuredevops.
111111
# categories: string. Optional. A comma-separated list of analyzer categories to run. Values: 'code', 'artifacts', 'IaC', 'containers'. Example: 'IaC, containers'. Defaults to all.
112112
# languages: string. Optional. A comma-separated list of languages to analyze. Example: 'javascript,typescript'. Defaults to all.
113-
# tools: string. Optional. A comma-separated list of analyzer tools to run. Values: 'bandit', 'binskim', 'checkov', 'eslint', 'templateanalyzer', 'terrascan', 'trivy'. Example 'templatenanalyzer, trivy'
113+
# tools: string. Optional. A comma-separated list of analyzer tools to run. Values: 'bandit', 'binskim', 'checkov', 'eslint', 'templateanalyzer', 'terrascan', 'trivy'. Example 'templateanalyzer, trivy'
114114
# break: boolean. Optional. If true, will fail this build step if any high severity level results are found. Default: false.
115115
# publish: boolean. Optional. If true, will publish the output SARIF results file to the chosen pipeline artifact. Default: true.
116116
# artifactName: string. Optional. The name of the pipeline artifact to publish the SARIF result file to. Default: CodeAnalysisLogs*.

articles/virtual-network/virtual-network-tap-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ The accounts you use to apply TAP configuration on network interfaces must be as
4747

4848
- [Big Switch Big Monitoring Fabric](https://www.arista.com/en/bigswitch)
4949

50-
- [Corelight, Inc.](https://corelight.com/)
51-
5250
### Security analytics, network/application performance management
5351

5452
- [Awake Security](https://www.arista.com/partner/technology-partners)
@@ -75,6 +73,8 @@ The accounts you use to apply TAP configuration on network interfaces must be as
7573

7674
- [Vectra Cognito](https://www.vectra.ai/products/cognito-platform)
7775

76+
- [Corelight, Inc.](https://corelight.com/)
77+
7878
## Next steps
7979

8080
- Learn how to [Create a virtual network TAP](tutorial-tap-virtual-network-cli.md).

articles/vpn-gateway/bgp-how-to-cli.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ This exercise continues to build the configuration shown in the diagram. Be sure
121121

122122
* The local network gateway can be in the same location and resource group as the VPN gateway, or it can be in a different location and resource group. This example shows the gateways in different resource groups in different locations.
123123
* The minimum prefix that you need to declare for the local network gateway is the host address of your BGP peer IP address on your VPN device. In this case, it's a /32 prefix of 10.51.255.254/32.
124+
* You can also leave the prefix empty if you're using BGP to connect to this network. Azure VPN gateway will internally add a route of your BGP peer IP address to the corresponding IPsec tunnel.
124125
* As a reminder, you must use different BGP ASNs between your on-premises networks and the Azure virtual network. If they're the same, you need to change your VNet ASN if your on-premises VPN devices already use the ASN to peer with other BGP neighbors.
125126

126127
Before you proceed, make sure that you've completed the [Enable BGP for your VPN gateway](#enablebgp) section of this exercise. Notice that in this example, you create a new resource group. Also, notice the two additional parameters for the local network gateway: `Asn` and `BgpPeerAddress`.

articles/vpn-gateway/vpn-gateway-about-vpn-gateway-settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ The values in this article specifically apply to VPN gateways (virtual network g
2121

2222
## <a name="gwtype"></a>Gateways and gateway types
2323

24-
A virtual network gateway is composed of two or more Azure-managed VMs that are automatically configured and deployed to a specific subnet that you create called the **gateway subnet**. The gateway VMs contain routing tables and run specific gateway services. When you create a virtual network gateway, the gateway VMs are automatically deployed to the gateway subnet (always named *GatwaySubnet*), and configured with the settings that you specified. The process can take 45 minutes or more to complete, depending on the gateway SKU that you selected.
24+
A virtual network gateway is composed of two or more Azure-managed VMs that are automatically configured and deployed to a specific subnet that you create called the **gateway subnet**. The gateway VMs contain routing tables and run specific gateway services. When you create a virtual network gateway, the gateway VMs are automatically deployed to the gateway subnet (always named *GatewaySubnet*), and configured with the settings that you specified. The process can take 45 minutes or more to complete, depending on the gateway SKU that you selected.
2525

2626
One of the settings that you specify when creating a virtual network gateway is the **gateway type**. The gateway type determines how the virtual network gateway is used and the actions that the gateway takes. A virtual network can have two virtual network gateways; one VPN gateway and one ExpressRoute gateway. The -GatewayType 'Vpn' specifies that the type of virtual network gateway created is a **VPN gateway**. This distinguishes it from an ExpressRoute gateway.
2727

0 commit comments

Comments
 (0)