Skip to content

Commit 25c1280

Browse files
Merge pull request #300811 from limwainstein/remove-merge-devices
Remove merge devices
2 parents da5dd4f + 0a1d1e3 commit 25c1280

File tree

5 files changed

+5
-37
lines changed

5 files changed

+5
-37
lines changed

articles/defender-for-iot/organizations/device-inventory.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Defender for IoT device inventory is available in the following locations:
4444

4545
|Location |Description | Extra inventory support |
4646
|---------|---------|---------|
47-
|**Azure portal** | OT devices detected from all cloud-connected OT sensors. | - If you also use [Microsoft Sentinel](iot-solution.md), incidents in Microsoft Sentinel are linked to related devices in Defender for IoT. <br><br>- Use Defender for IoT [workbooks](workbooks.md) for visibility into all cloud-connected device inventory, including related alerts and vulnerabilities. <br><br>- If you have a [legacy Enterprise IoT plan](whats-new-archive.md#enterprise-iot-protection-now-included-in-microsoft-365-e5-and-e5-security-licenses) on your Azure subscription, the Azure portal also includes devices detected by Microsoft Defender for Endpoint agents. If you have an [Enterprise IoT sensor](eiot-sensor.md), the Azure portal also includes devices detected by the Enterprise IoT sensor. |
47+
|**Azure portal** | OT devices detected from all cloud-connected OT sensors. | - If you also use [Microsoft Sentinel](iot-solution.md), incidents in Microsoft Sentinel are linked to related devices in Defender for IoT. <br><br>- Use Defender for IoT [workbooks](workbooks.md) for visibility into all cloud-connected device inventory, including related alerts and vulnerabilities. |
4848
| **Microsoft Defender XDR** | Enterprise IoT devices detected by Microsoft Defender for Endpoint agents | Correlate devices across Microsoft Defender XDR in purpose-built alerts, vulnerabilities, and recommendations. |
4949
|**OT network sensor consoles** | Devices detected by that OT sensor | - View all detected devices across a network device map<br><br>- View related events on the **Event timeline** |
5050

articles/defender-for-iot/organizations/how-to-manage-device-inventory-for-organizations.md

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -145,36 +145,6 @@ In the **Device inventory** page, select the device you want to delete, and then
145145

146146
At the prompt, select **Yes** to confirm that you want to delete the device from Defender for IoT.
147147

148-
## Merge duplicate devices
149-
150-
You may need to merge duplicate devices if the sensor has discovered separate network entities that are associated with a single, unique device.
151-
152-
Examples of this scenario might include a laptop with both WiFi and a physical network card, a switch with multiple interfaces, an HMI with four network cards, or a single workstation with multiple network cards.
153-
154-
> [!NOTE]
155-
> Once the devices are merged, they cannot be unmerged. To unmerge devices, you'll need to delete the merged device and wait for it to be rediscovered by the sensors as it was originally.
156-
157-
**To manually merge devices**:
158-
159-
1. In the **Device inventory** page, select two or more devices you would like to merge, and then select **Merge** :::image type="icon" source="media/how-to-manage-device-inventory-on-the-cloud/merge-devices-icon.png" border="false"::: in the toolbar at the top of the page.
160-
You can merge up to 10 devices at a time, if all selected devices are in the same zone or site.
161-
162-
OT devices can only be merged with other OT devices. Enterprise IoT devices and devices detected by Microsoft Defender for Endpoint agents can be merged with other Enterprise IoT or Defender for Endpoint devices.
163-
164-
1. In the **Merge** pane, select one of the following:
165-
166-
- Select **Merge** to merge the selected devices and return to the device inventory page.
167-
168-
- Select **Merge & View** to merge the devices and open the merged device details.
169-
170-
For example:
171-
172-
:::image type="content" source="media/how-to-manage-device-inventory-on-the-cloud/merge-devices-pane.png" alt-text="Screenshot of merging devices screen in the device inventory." lightbox="media/how-to-manage-device-inventory-on-the-cloud/merge-devices-pane.png":::
173-
174-
A success message appears at the top right confirming that the devices have been merged into a single, unique device.
175-
176-
The merged device that is now listed in the grid retains the details of the device with the most recent activity or an update to its identifying details.
177-
178148
## Next steps
179149

180150
For more information, see:

articles/defender-for-iot/organizations/ot-deploy/ot-deploy-path.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ For more information, see [Control the OT traffic monitored by Microsoft Defende
158158

159159
### Verify and update your detected device inventory
160160

161-
After your devices are fully detected, review the device inventory and modify the device details as needed. For example, you might identify duplicate device entries that can be merged, device types or other properties to modify, and more.
161+
After your devices are fully detected, review the device inventory and modify the device details as needed. For example, you might identify device types or other properties to modify, and more.
162162

163163
For more information, see [Verify and update your detected device inventory](update-device-inventory.md).
164164

articles/defender-for-iot/organizations/release-notes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ Version 22.3.7 includes the same features as 22.3.6. If you have version 22.3.6
296296
- [Support for transient devices](device-inventory.md#supported-devices)
297297
- [Autoresolved notifications](how-to-work-with-the-sensor-device-map.md#device-notification-responses)
298298
- [Device data retention updated to 90 days](references-data-retention.md#device-data-retention-periods)
299-
- [Merging](how-to-investigate-sensor-detections-in-a-device-inventory.md#merge-devices) and [deleting](how-to-investigate-sensor-detections-in-a-device-inventory.md#delete-devices) devices on OT sensors now include confirmation messages when the action has completed
299+
- [Deleting](how-to-investigate-sensor-detections-in-a-device-inventory.md#delete-devices) devices on OT sensors now includes confirmation messages when the action has completed
300300
- Support for [deleting multiple devices](how-to-investigate-sensor-detections-in-a-device-inventory.md#delete-devices) on OT sensors
301301
- An enhanced [editing device details](how-to-investigate-sensor-detections-in-a-device-inventory.md#edit-device-details) process on the OT sensor, using an **Edit** button in the toolbar at the top of the page
302302
- [Enhanced UI on the OT sensor for uploading an SSL/TLS certificate](ot-deploy/activate-deploy-sensor.md#define-ssltls-certificate-settings)
@@ -384,7 +384,7 @@ This version includes the following new updates and fixes:
384384

385385
- [Device inventory enhancements in the sensor console](how-to-investigate-sensor-detections-in-a-device-inventory.md):
386386

387-
- Merge duplicate devices, delete single devices, and delete inactive devices by admin users
387+
- Delete single devices, and delete inactive devices by admin users
388388
- **Last seen** value in the device details pane is replaced by **Last activity**
389389

390390
- [New parameters for the *devicecves* API](api/management-integration-apis.md): `sensorId`, `score`, and `deviceIds`

articles/defender-for-iot/organizations/whats-new-archive.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,7 @@ The **Device inventory** GA includes the following UI enhancements:
628628

629629
|Enhancement |Description |
630630
|---------|---------|
631-
|**Grid-level enhancements**| - **[Export the entire device inventory](how-to-manage-device-inventory-for-organizations.md#export-the-device-inventory-to-csv)** to review offline and compare notes with your teams <br>- **[Delete irrelevant devices](how-to-manage-device-inventory-for-organizations.md#delete-a-device)** that no longer exist or are no longer functional <br>- **[Merge devices](how-to-manage-device-inventory-for-organizations.md#merge-duplicate-devices)** to fine-tune the device list if the sensor has discovered separate network entities that are associated with a single, unique device. For example, a PLC with four network cards, a laptop with both WiFi and a physical network card, or a single workstation with multiple network cards.<br>- **[Edit your table views](how-to-manage-device-inventory-for-organizations.md#reference-of-editable-fields)** to reflect only the data you're interested in viewing |
631+
|**Grid-level enhancements**| - **[Export the entire device inventory](how-to-manage-device-inventory-for-organizations.md#export-the-device-inventory-to-csv)** to review offline and compare notes with your teams <br>- **[Delete irrelevant devices](how-to-manage-device-inventory-for-organizations.md#delete-a-device)** that no longer exist or are no longer functional <br>- **[Edit your table views](how-to-manage-device-inventory-for-organizations.md#reference-of-editable-fields)** to reflect only the data you're interested in viewing |
632632
|**Device-level enhancements**| - **[Edit device details](how-to-manage-device-inventory-for-organizations.md#edit-device-details)** by annotating organization-specific contextual details, such as relative importance, descriptive tags, and business function information |
633633
|**Filter and search enhancements** | - **[Run deep searches on any device inventory field](how-to-manage-device-inventory-for-organizations.md#view-the-device-inventory)** to quickly find the devices that matter most <br>- **[Filter the device inventory by any field](how-to-manage-device-inventory-for-organizations.md#view-the-device-inventory)**. For example, filter by *Type* to identify *Industrial* devices, or time fields to determine active and inactive devices.|
634634

@@ -964,8 +964,6 @@ For more information, see [Install OT agentless monitoring software](how-to-inst
964964

965965
Starting in OT sensor versions 22.2.4, you can now take the following actions from the sensor console's **Device inventory** page:
966966

967-
- **Merge duplicate devices**. You might need to merge devices if the sensor has discovered separate network entities that are associated with a single, unique device. Examples of this scenario might include a PLC with four network cards, a laptop with both WiFi and a physical network card, or a single workstation with multiple network cards.
968-
969967
- **Delete single devices**. Now, you can delete a single device that hasn't communicated for at least 10 minutes.
970968

971969
- **Delete inactive devices by admin users**. Now, all admin users, in addition to the **cyberx** user, can delete inactive devices.

0 commit comments

Comments
 (0)