Skip to content

Commit b08f640

Browse files
Merge pull request #303232 from MicrosoftDocs/main
Auto Publish – main to live - 2025-07-24 05:00 UTC
2 parents 0ffa998 + d2d52c3 commit b08f640

19 files changed

+280
-28
lines changed

articles/azure-vmware/connect-multiple-private-clouds-same-region.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.custom: engagement-fy23
1212

1313
The **AVS Interconnect** feature lets you create a network connection between two or more Azure VMware Solution private clouds located in the same region. It creates a routing link between the management and workload networks of the private clouds to enable network communication between the clouds.
1414

15-
You can connect a private cloud to multiple private clouds, and the connections are nontransitive. For example, if _private cloud A_ is connected to _private cloud B_, and _private cloud B_ is connected to _private cloud C_, private clouds A and B wouldn't communicate until they were directly connected.
15+
You can connect a private cloud to multiple private clouds, and the connections are nontransitive. For example, if _private cloud A_ is connected to _private cloud B_, and _private cloud B_ is connected to _private cloud C_, private clouds A and C wouldn't communicate until they were directly connected.
1616

1717
You can only connect private clouds in the same region. To connect private clouds in different regions, [use ExpressRoute Global Reach](tutorial-expressroute-global-reach-private-cloud.md) to connect them in the same way you connect your private cloud to your on-premises circuit.
1818

articles/cost-management-billing/automate/migrate-ea-usage-details-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Our new solutions provide many benefits over the EA Reporting Usage Details APIs
5959

6060
## Enterprise Usage APIs to migrate off
6161

62-
The following table summarizes the different APIs that you might be using today to ingest cost details data. If you're using one of the following APIs, you need to migrate to one of the new solutions outlined previously. All APIs are behind the *https://consumption.azure.com* endpoint.
62+
The following table summarizes the different APIs that you might be using today to ingest cost details data. If you're using one of the following APIs, you need to migrate to one of the new solutions outlined previously. All APIs are behind the `https://consumption.azure.com` endpoint.
6363

6464
| Endpoint | API Comments |
6565
| --- | ---|

articles/defender-for-iot/organizations/ot-pre-configured-appliances.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.topic: limits-and-quotas
77

88
# Preconfigured physical appliances for OT monitoring
99

10-
This article is one in a series of articles describing the [deployment path](ot-deploy/ot-deploy-path.md) for OT monitoring with Microsoft Defender for IoT, and lists the catalog of the preconfigured appliances available for Microsoft Defender for IoT OT appliances. Use the links in the tables in this article to jump to articles with more details about each appliance.
10+
This article is part of a series of articles that describes the [deployment path](ot-deploy/ot-deploy-path.md) for operational technology (OT) monitoring with Microsoft Defender for IoT. The article lists the catalog of the preconfigured appliances available for Microsoft Defender for IoT OT appliances. To jump to articles with more details about each appliance, use the links in the tables in this article
1111

1212
:::image type="content" source="media/deployment-paths/progress-plan-and-prepare.png" alt-text="Diagram of a progress bar with Plan and prepare highlighted." border="false" lightbox="media/deployment-paths/progress-plan-and-prepare.png":::
1313

@@ -29,14 +29,14 @@ You can [order](mailto:[email protected]?cc=DIoTHardwarePurchase@microsof
2929

3030
|Hardware profile |Appliance |SPAN/TAP throughput |Physical specifications |
3131
|---------|---------|---------|---------|
32-
|**C5600** | [HPE ProLiant DL360 Gen 11](appliance-catalog/hpe-proliant-dl360-gen11.md) <br><br><br><br> [Dell PowerEdge R660](appliance-catalog/dell-poweredge-r660.md) | **Max bandwidth**: 3 Gbps <br>**Max devices**: 12K <br> 24 core CPU/ 128G RAM/ 9.6 TB storage <br><br> **Max bandwidth**: 3 Gbps <br>**Max devices**: 12K <br> 20 core CPU/ 128G RAM/ 7.2 TB storage | **Mounting**: 1U with rail kit<br>**Ports**: 16x RJ45 or 8x SFP (optional) <br><br><br>**Mounting**: 1U with rail kit<br>**Ports**: 6x RJ45 1 GbE or SFP28 (optional) |
33-
|**E1800** | [HPE ProLiant DL20 Gen11](appliance-catalog/hpe-proliant-dl20-gen-11.md) <br>(4SFF)<br><br><br> [Dell PowerEdge R360](appliance-catalog/dell-poweredge-r360-e1800.md) | **Max bandwidth**: 1 Gbps<br>**Max devices**: 10K <br> 8 core CPU/ 32G RAM/ 2.4TB storage <br><br>**Max bandwidth**: 1 Gbps<br>**Max devices**: 10K <br> 8 core CPU/ 32G RAM/ 2.4TB storage | **Mounting**: 1U <br>**Ports**: 8x RJ45 or 6x SFP (OPT)<br><br><br> **Mounting**: 1U with rail kit<br>**Ports**: 8x RJ45 1 GbE |
34-
|**E500** | [Dell Edge 5200](appliance-catalog/dell-edge-5200.md) <br> (Rugged MIL-STD-810G) | **Max bandwidth**: 1 Gbps<br>**Max devices**: 10K <br> 8 core CPU/ 32G RAM/ 500GB storage | **Mounting**: Wall Mount<br>**Ports**: 3x RJ45 1Gbe |
35-
|**L500** | [HPE ProLiant DL20 Gen11 Plus](appliance-catalog/hpe-proliant-dl20-gen-11-nhp-2lff.md)<br> (NHP 2LFF) <br><br> [DELL XE4 SFF](appliance-catalog/dell-xe4-sff.md)| **Max bandwidth**: 200 Mbps<br>**Max devices**: 1,000 <br> 4 core CPU/ 16G RAM/ 1 TB storage <br> <br> **Max bandwidth**: 200 Mbps<br>**Max devices**: 1k <br> 6 core CPU/ 8G RAM/ 512GB storage | **Mounting**: 1U<br>**Ports**: 4x RJ45 <br><br><br>**Mounting**: Small form factor<br>**Ports**: 1x RJ45 |
36-
|**L100** | [YS-Techsystems YS-FIT2 ](appliance-catalog/ys-techsystems-ys-fit2.md)<br>(Rugged MIL-STD-810G) <br><br><br> [Dell Edge Gateway 3200](appliance-catalog/dell-edge-3200.md) | **Max bandwidth**: 10 Mbps <br>**Max devices**: 100 <br> 4 core CPU/ 8G RAM/ 128GB storage <br><br> **Max bandwidth**: 10 Mbps <br>**Max devices**: 100 <br> 4 core CPU/ 16G RAM/ 512GB storage | **Mounting**: DIN/VESA<br>**Ports**: 2x RJ45 <br><br><br> **Mounting**: 1U with rail kit<br>**Ports**: 6x RJ45 |
32+
|**C5600** | [HPE ProLiant DL360 Gen 11](appliance-catalog/hpe-proliant-dl360-gen11.md) <br><br><br><br> [Dell PowerEdge R660](appliance-catalog/dell-poweredge-r660.md) | **Max bandwidth**: 3 Gbps <br>**Max devices**: 12 K <br> 24 core CPU/ 128G RAM/ 9.6-TB storage <br><br> **Max bandwidth**: 3 Gbps <br>**Max devices**: 12 K <br> 20 core CPU/ 128G RAM/ 7.2-TB storage | **Mounting**: 1U with rail kit<br>**Ports**: 16x RJ45 or 8x Small Form-factor Pluggable (SFP) (optional) <br><br><br>**Mounting**: 1U with rail kit<br>**Ports**: 6x RJ45 1 GbE or SFP28 (optional) |
33+
|**E1800** | [HPE ProLiant DL20 Gen11](appliance-catalog/hpe-proliant-dl20-gen-11.md) <br>(4SFF)<br><br><br> [Dell PowerEdge R360](appliance-catalog/dell-poweredge-r360-e1800.md) | **Max bandwidth**: 1 Gbps<br>**Max devices**: 10K <br> Eight core CPU/ 32G RAM/ 2.4-TB storage <br><br>**Max bandwidth**: 1 Gbps<br>**Max devices**: 10K <br> Eight core CPU/ 32G RAM/ 2.4-TB storage | **Mounting**: 1U <br>**Ports**: 8x RJ45 or 6x SFP (OPT)<br><br><br> **Mounting**: 1U with rail kit<br>**Ports**: 8x RJ45 1 GbE |
34+
|**E500** | [Dell Edge 5200](appliance-catalog/dell-edge-5200.md) <br> (Rugged MIL-STD-810G) | **Max bandwidth**: 1 Gbps<br>**Max devices**: 10K <br> Eight core CPU/ 32G RAM/ 500GB storage | **Mounting**: Wall Mount<br>**Ports**: 3x RJ45 1Gbe |
35+
|**L500** | [HPE ProLiant DL20 Gen11 Plus](appliance-catalog/hpe-proliant-dl20-gen-11-nhp-2lff.md)<br> (NHP 2LFF) <br><br><br><br> [DELL XE4 Small Form Factor (SFF)](appliance-catalog/dell-xe4-sff.md)| **Max bandwidth**: 200 Mbps<br>**Max devices**: 1,000 <br> Four core CPU/ 16G RAM/ 1 TB storage <br> <br> **Max bandwidth**: 25 Mbps<br>**Max devices**: 1k <br> Six core CPU/ 8G RAM/ 512GB storage | **Mounting**: 1U<br>**Ports**: 4x RJ45 <br><br><br><br>**Mounting**: Small form factor<br>**Ports**: 1x RJ45 |
36+
|**L100** | [YS-Techsystems YS-FIT2 ](appliance-catalog/ys-techsystems-ys-fit2.md)<br>(Rugged MIL-STD-810G) <br><br><br> [Dell Edge Gateway 3200](appliance-catalog/dell-edge-3200.md) | **Max bandwidth**: 10 Mbps <br>**Max devices**: 100 <br> Four core CPU/ 8G RAM/ 128GB storage <br><br> **Max bandwidth**: 10 Mbps <br>**Max devices**: 100 <br> Four core CPU/ 16G RAM/ 512GB storage | **Mounting**: DIN/VESA<br>**Ports**: 2x RJ45 <br><br><br> **Mounting**: 1U with rail kit<br>**Ports**: 6x RJ45 |
3737

3838
> [!NOTE]
39-
> The performance, capacity, and activity of an OT/IoT network might vary depending on its size, capacity, protocols distribution, and overall activity. For deployments, it's important to factor in raw network speed, the size of the network to monitor, and application configuration. The selection of processors, memory, and network cards is heavily influenced by these deployment configurations. The amount of space needed on your disk differs depending on how long you store data, and the amount and type of data you store. <br><br>
39+
> The performance, capacity, and activity of an OT/IoT network might vary depending on its size, capacity, protocols distribution, and overall activity. For deployments, it's important to factor in raw network speed, the size of the network to monitor, and application configuration. These deployment configurations heavily influence the selection of processors, memory, and network cards. The amount of space needed on your disk differs depending on how long you store data, and the amount and type of data you store. <br><br>
4040
> *Performance values are presented as upper thresholds under the assumption of intermittent traffic profiles, such as those found in OT/IoT systems and machine-to-machine communication networks.*
4141
4242
## Next steps

articles/expressroute/expressroute-locations-providers.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ The following table shows connectivity locations and the service providers for e
133133
| **Portland** | [EdgeConnex POR01](https://www.edgeconnex.com/locations/north-america/portland-or/) | 1 | West US 2 | &check; | |
134134
| **Pune** | [STT GDC Pune DC1](https://www.sttelemediagdc.in/our-data-centres-in-india) | 2 | Central India | &check; | Airtel<br/>Lightstorm<br/>SIFY<br/>Tata Communications |
135135
| **Quebec City** | [Vantage](https://vantage-dc.com/data_centers/quebec-city-data-center-campus/) | 1 | Canada East | &check; | Bell Canada<br/>Equinix<br/>Megaport<br/>RISQ<br/>Telus |
136-
| **Queretaro (Mexico)** | [KIO Networks QR01](https://www.kionetworks.com/es-mx/) | 4 | Mexico Central | &check; | Axtel<br/>Cirion Technologies<br/>C3ntro<br/>DE-CIX<br/>Equinix<br/>Flo Networks<br/>KIO<br/>MCM Telecom<br/>Megaport |
136+
| **Queretaro (Mexico)** | [KIO Networks QR01](https://www.kio.tech/) | 4 | Mexico Central | &check; | Axtel<br/>Cirion Technologies<br/>C3ntro<br/>DE-CIX<br/>Equinix<br/>Flo Networks<br/>KIO<br/>MCM Telecom<br/>Megaport |
137137
| **Quincy** | Sabey Datacenter - Building A | 1 | West US 2 | &check; | |
138138

139139

@@ -152,7 +152,7 @@ The following table shows connectivity locations and the service providers for e
152152
| **Silicon Valley** | [Equinix SV1](https://www.equinix.com/locations/americas-colocation/united-states-colocation/silicon-valley-data-centers/sv1/) | 1 | West US | &check; | Aryaka Networks<br/>AT&T Dynamic Exchange<br/>AT&T NetBond<br/>British Telecom<br/>CenturyLink Cloud Connect<br/>China Unicom Global<br/>Colt<br/>Comcast<br/>Coresite<br/>Cox Business Cloud Port<br/>Digital Realty<br/>Equinix<br/>InterCloud<br/>Internet2<br/>IX Reach<br/>Level 3 Communications<br/>Megaport<br/>Momentum Telecom<br/>Orange<br/>Packet<br/>Sprint<br/>Tata Communications<br/>Telia Carrier<br/>Verizon<br/>Vodafone<br/>Zayo |
153153
| **Silicon Valley2** | [Coresite SV7](https://www.coresite.com/data-centers/locations/silicon-valley/sv7) | 1 | West US | &check; | Colt<br/>Coresite<br/>Momentum Telecom |
154154
| **Singapore** | [Equinix SG1](https://www.equinix.com/data-centers/asia-pacific-colocation/singapore-colocation/singapore-data-center/sg1) | 2 | Southeast Asia | &check; | Aryaka Networks<br/>AT&T NetBond<br/>British Telecom<br/>China Mobile International<br/>China Telecom Global<br/>Console Connect (PCCW Global Limited)<br/>Epsilon Global Communications<br/>Equinix<br/>GTT<br/>IPC<br/>InterCloud<br/>Level 3 Communications<br/>Megaport<br/>NTT Communications<br/>Orange<br/>SingTel<br/>Tata Communications<br/>Telstra Corporation<br/>Telefonica<br/>Verizon<br/>Vodafone<br/>Zenlayer |
155-
| **Singapore2** | [Global Switch Tai Seng](https://www.globalswitch.com/locations/singapore-data-centres/) | 2 | Southeast Asia | &check; | CenturyLink Cloud Connect<br/>China Mobile International<br/>China Unicom Global<br/>Colt<br/>Console Connect (PCCW Global Limited)<br/>DE-CIX<br/>Digital Realty<br/>Epsilon Global Communications<br/>Equinix<br/>Lightstorm<br/>Megaport<br/>SingTel<br/>TATA Communications<br/>Telehouse - KDDI<br/>Telia Carrier<br/>Zenlayer |
155+
| **Singapore2** | [Global Switch Tai Seng](https://www.globalswitch.com/destinations/singapore-tai-seng/) | 2 | Southeast Asia | &check; | CenturyLink Cloud Connect<br/>China Mobile International<br/>China Unicom Global<br/>Colt<br/>Console Connect (PCCW Global Limited)<br/>DE-CIX<br/>Digital Realty<br/>Epsilon Global Communications<br/>Equinix<br/>Lightstorm<br/>Megaport<br/>SingTel<br/>TATA Communications<br/>Telehouse - KDDI<br/>Telia Carrier<br/>Zenlayer |
156156
| **Stavanger** | [Green Mountain DC1](https://greenmountain.no/dc1-stavanger/) | 1 | Norway West | &check; | GlobalConnect<br/>Megaport<br/>Telenor |
157157
| **Stockholm** | [Equinix SK1](https://www.equinix.com/locations/europe-colocation/sweden-colocation/stockholm-data-centers/sk1/) | 1 | Sweden Central | &check; | Cinia<br/>Elisa<br/>Equinix<br/>GlobalConnect<br/>Interxion (Digital Realty)<br/>Megaport<br/>Telia Carrier |
158158
| **Sydney** | [Equinix SY2](https://www.equinix.com/locations/asia-colocation/australia-colocation/sydney-data-centers/sy2/) | 2 | Australia East | &check; | AARNet<br/>AT&T NetBond<br/>British Telecom<br/>Cello<br/>Console Connect (PCCW Global Limited)<br/>Devoli<br/>Equinix<br/>GTT<br/>Kordia<br/>Megaport<br/>NEXTDC<br/>NTT Communications<br/>Optus<br/>Orange<br/>Spark NZ<br/>Telstra Corporation<br/>TPG Telecom<br/>Verizon<br/>Vocus Group NZ |

articles/load-balancer/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
- name: What's new?
2626
href: whats-new.md
2727
- name: What is load balancing and content delivery?
28-
href: /azure/networking/load-balancer-content-delivery/load-balancing-content-delivery-overview.md
28+
href: /azure/networking/load-balancer-content-delivery/load-balancing-content-delivery-overview
2929
- name: Choose a load balancing solution
3030
href: /azure/architecture/guide/technology-choices/load-balancing-overview?toc=/azure/load-balancer/toc.json
3131
- name: FAQ

articles/load-balancer/gateway-partners.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Azure has a growing ecosystem of partners offering their network appliances for
8181

8282
**Ali Bidabadi - Senior Director, Global Cloud Consulting & Architecture**
8383

84-
[Learn more](https://fusecommunity.fortinet.com/blogs/daniel1/2021/10/19/deploy-fortigate-with-azure-gateway)
84+
[Learn more](https://www.fortinet.com/content/dam/fortinet/assets/solutions/azure/QSG-FortiWeb-for-Microsoft-Azure-Quick-Start-Guide.pdf)
8585

8686
### Glasnostic
8787

articles/migrate/azure-migrate-unsupported-regions.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,11 @@ List of available regions for the resource type:
6060
- France Central
6161
- UK south, UK west
6262
- Central India, South India, Jio India West
63+
- Indonesia Central
6364
- Italy North
6465
- Japan East, Japan West
6566
- Korea Central, Korea South
67+
- Malaysia West
6668
- Mexico Central
6769
- North Europe
6870
- Norway East
@@ -108,11 +110,13 @@ The supported locations:
108110
- East US, East US2
109111
- France Central, France South
110112
- Germany West Central
113+
- Indonesia Central
111114
- Israel Central
112115
- Italy North
113116
- Japan East, Japan West
114117
- Jio India West
115118
- Korea Central, Korea South
119+
- Malaysia West
116120
- Mexico Central
117121
- North Central US
118122
- North Europe

articles/migrate/migrate-support-matrix.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,13 @@ Europe | North Europe or West Europe
7070
France | France Central
7171
Germany | Germany West Central
7272
India | Central India or South India
73+
Indonesia| Indonesia Central
7374
Israel| Israel Central
7475
Italy | North Italy
7576
Japan | Japan East or Japan West
7677
Jio India | Jio India West
7778
Korea | Korea Central
79+
Malaysia | Malaysia West
7880
Mexico | Mexico Central
7981
New Zealand | New Zealand North
8082
Norway | Norway East

articles/private-link/create-network-security-perimeter-template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ If your environment meets the prerequisites and you're familiar with using ARM t
3131

3232
This template creates a private endpoint for an instance of Azure SQL Database.
3333

34-
The template that this quickstart uses is from [Azure Quickstart Templates](https://azure.microsoft.com/resources/templates/network-security-perimeter-create/).
34+
The template that this quickstart uses is from [Azure Quickstart Templates](https://github.com/Azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.network/network-security-perimeter-create).
3535

3636
:::code language="json" source="~/quickstart-templates/quickstarts/microsoft.network/network-security-perimeter-create/azuredeploy.json":::
3737

articles/reliability/TOC.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,7 @@
8686
- name: Azure Container Instances
8787
href: reliability-containers.md
8888
- name: Azure Container Registry
89-
items:
90-
- name: Availability zones
91-
href: /azure/container-registry/zone-redundancy?toc=/azure/reliability/toc.json&bc=/azure/reliability/breadcrumb/toc.json
92-
- name: Disaster recovery
93-
href: /azure/container-registry/container-registry-geo-replication?toc=/azure/reliability/toc.json&bc=/azure/reliability/breadcrumb/toc.json
89+
href: reliability-container-registry.md
9490
- name: Azure Kubernetes Service (AKS)
9591
href: reliability-aks.md
9692
- name: Azure Service Fabric

0 commit comments

Comments
 (0)