Skip to content

Commit c063d8f

Browse files
authored
Merge pull request #296091 from MicrosoftDocs/main
Publish to live, Tuesday 4 AM PST, 3/11
2 parents ce25449 + 5c51b25 commit c063d8f

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

articles/active-directory-b2c/billing.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: kengaderdus
55
manager: CelesteDG
66
ms.service: azure-active-directory
77
ms.topic: reference
8-
ms.date: 09/11/2024
8+
ms.date: 03/10/2025
99
ms.author: kengaderdus
1010
ms.subservice: b2c
1111
ms.custom: fasttrack-edit
@@ -29,7 +29,7 @@ A monthly active user (MAU) is a unique user that performs an authentication wit
2929

3030
If Azure AD B2C [Go-Local add-on](data-residency.md#go-local-add-on) is available in your country/region, and you enable it, you'll be charged per MAU, which is an added charge to your Azure AD B2C [Premium P1 or P2 pricing](https://azure.microsoft.com/pricing/details/active-directory-b2c/) license. Learn more [About Local Data Residency add-on](#about-go-local-add-on)
3131

32-
Also, if you choose to provide higher levels of assurance by using multifactor authentication (MFA) for Voice and SMS, you'll be charged a worldwide flat fee for each MFA attempt that month, whether the sign in is successful or unsuccessful.
32+
Also, if you choose to provide higher levels of assurance by using multifactor authentication (MFA) for Voice and SMS, you'll be charged a fee for each MFA attempt that month, whether the sign in is successful or unsuccessful.
3333

3434

3535
> [!IMPORTANT]
@@ -85,7 +85,7 @@ A subscription linked to an Azure AD B2C tenant can be used for the billing of A
8585
### Create the link
8686

8787
1. Sign in to the [Azure portal](https://portal.azure.com).
88-
1. If you have access to multiple tenants, select the **Settings** icon in the top menu to switch to your Azure AD B2C tenant from the **Directories + subscriptions** menu.
88+
1. If you have access to multiple tenants, select the **Settings** icon in the top menu to switch to your Microsoft Entra tenant from the **Directories + subscriptions** menu.
8989
1. Select **Create a resource**, and then, in the **Search services and Marketplace** field, search for and select **Azure Active Directory B2C**.
9090
1. Select **Create**.
9191
1. Select **Link an existing Azure AD B2C Tenant to my Azure subscription**.

articles/azure-signalr/signalr-howto-use-management-sdk.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@ Create your instance of `ServiceHubContext` from a `ServiceManager`:
9090
var serviceHubContext = await serviceManager.CreateHubContextAsync("<Your Hub Name>",cancellationToken);
9191
```
9292

93+
> [!NOTE]
94+
>
95+
> Creating `ServiceHubContext` is a rather expensive operation. It's recommended to reuse the same `ServiceHubContext` instance for the same hub.
96+
9397
### Negotiation
9498

9599
In [default mode](concept-service-mode.md#default-mode), an endpoint `/<Your Hub Name>/negotiate` is exposed for negotiation by Azure SignalR Service SDK. SignalR clients reach this endpoint and then redirect to Azure SignalR Service later.

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ 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 below to jump to articles with more details about each appliance.
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.
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

14-
Microsoft has partnered with [Arrow Electronics](https://www.arrow.com/) to provide preconfigured appliances. To purchase a preconfigured appliance, contact Arrow at: [[email protected]](mailto:[email protected][email protected]&subject=Information%20about%20Microsoft%20Defender%20for%20IoT%20pre-configured%20appliances&body=Dear%20Arrow%20Representative,%0D%0DOur%20organization%20is%20interested%20in%20receiving%20quotes%20for%20Microsoft%20Defender%20for%20IoT%20appliances%20as%20well%20as%20fulfillment%20options.%0D%0DThe%20purpose%20of%20this%20communication%20is%20to%20inform%20you%20of%20a%20project%20which%20involves%20[NUMBER]%20sites%20and%20[NUMBER]%20sensors%20for%20[ORGANIZATION%20NAME].%20Having%20reviewed%20potential%20appliances%20suitable%20for%20our%20project,%20we%20would%20like%20to%20obtain%20more%20information%20about:%20___________%0D%0D%0DI%20would%20appreciate%20being%20contacted%20by%20an%20Arrow%20representative%20to%20receive%20a%20quote%20for%20the%20items%20mentioned%20above.%0DI%20understand%20the%20quote%20and%20appliance%20delivery%20shall%20be%20in%20accordance%20with%20the%20relevant%20Arrow%20terms%20and%20conditions%20for%20Microsoft%20Defender%20for%20IoT%20pre-configured%20appliances.%0D%0D%0DBest%20Regards,%0D%0D%0D%0D%0D%0D//////////////////////////////%20%0D/////////%20Replace%20[NUMBER]%20with%20appropriate%20values%20related%20to%20your%20request.%0D/////////%20Replace%20[ORGANIZATION%20NAME]%20with%20the%20name%20of%20the%20organization%20you%20represent.%0D//////////////////////////////%0D%0D).
14+
Microsoft is partnered with [Arrow Electronics](https://www.arrow.com/) to provide preconfigured appliances. To purchase a preconfigured appliance, contact Arrow at: [[email protected]](mailto:[email protected][email protected]&subject=Information%20about%20Microsoft%20Defender%20for%20IoT%20pre-configured%20appliances&body=Dear%20Arrow%20Representative,%0D%0DOur%20organization%20is%20interested%20in%20receiving%20quotes%20for%20Microsoft%20Defender%20for%20IoT%20appliances%20as%20well%20as%20fulfillment%20options.%0D%0DThe%20purpose%20of%20this%20communication%20is%20to%20inform%20you%20of%20a%20project%20which%20involves%20[NUMBER]%20sites%20and%20[NUMBER]%20sensors%20for%20[ORGANIZATION%20NAME].%20Having%20reviewed%20potential%20appliances%20suitable%20for%20our%20project,%20we%20would%20like%20to%20obtain%20more%20information%20about:%20___________%0D%0D%0DI%20would%20appreciate%20being%20contacted%20by%20an%20Arrow%20representative%20to%20receive%20a%20quote%20for%20the%20items%20mentioned%20above.%0DI%20understand%20the%20quote%20and%20appliance%20delivery%20shall%20be%20in%20accordance%20with%20the%20relevant%20Arrow%20terms%20and%20conditions%20for%20Microsoft%20Defender%20for%20IoT%20pre-configured%20appliances.%0D%0D%0DBest%20Regards,%0D%0D%0D%0D%0D%0D//////////////////////////////%20%0D/////////%20Replace%20[NUMBER]%20with%20appropriate%20values%20related%20to%20your%20request.%0D/////////%20Replace%20[ORGANIZATION%20NAME]%20with%20the%20name%20of%20the%20organization%20you%20represent.%0D//////////////////////////////%0D%0D).
1515

1616
## Advantages of preconfigured appliances
1717

18-
Preconfigured physical appliances have been validated for Defender for IoT OT system monitoring, and have the following advantages over installing your own software:
18+
Preconfigured physical appliances are validated for Defender for IoT OT system monitoring, and have the following advantages over installing your own software:
1919

2020
- **Performance** over the total assets monitored
2121
- **Compatibility** with new Defender for IoT releases, with validations for upgrades and driver support
@@ -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](appliance-catalog/hpe-proliant-dl360.md) <br><br><br><br> [Dell PowerEdge R660](appliance-catalog/dell-poweredge-r660.md) | **Max bandwidth**: 3 Gbps <br>**Max devices**: 12K <br> 16 core CPU/ 32G RAM/ 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) |
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) |
3333
|**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 |
3434
|**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 |
3535
|**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 |
3636
|**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 |
3737

3838
> [!NOTE]
39-
> The performance, capacity, and activity of an OT/IoT network may vary depending on its size, capacity, protocols distribution, and overall activity. For deployments, it is 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 will differ 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. 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>
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
-13.5 KB
Loading

0 commit comments

Comments
 (0)