Merge branch 'release-d4iot-deployment-plus' of https://github.com/MicrosoftDocs/azure-docs-pr into release-deployment-only

batamig · batamig · commit 3af75fee11f0 · 2023-03-27T11:27:21.000+03:00
diff --git a/articles/defender-for-iot/organizations/TOC.yml b/articles/defender-for-iot/organizations/TOC.yml
@@ -427,8 +427,10 @@
       href: how-to-troubleshoot-the-sensor-and-on-premises-management-console.md
 - name: Reference
   items:
-  - name: Data retention
-    href: references-data-retention.md
+  - name: Sample connectivity models
+    href: best-practices/sample-connectivity-models.md
+  - name: Networking requirements
+    href: networking-requirements.md
   - name: OT monitoring appliances
     items:
     - name: Overview
@@ -474,9 +476,23 @@
         href: appliance-catalog/hpe-proliant-dl20-smb-legacy.md
       - name: Neousys Nuvo-500LP (L100 Rugged)
         href: appliance-catalog/neousys-nuvo-5006lp.md
+  - name: Supported protocols
+    href: concept-supported-protocols.md
   - name: Alert reference
     href: alert-engine-messages.md
     displayName: alerts
+  - name: Sensor health message reference
+    href: sensor-health-messages.md
+  - name: CLI command reference
+    items:
+    - name: CLI users and access
+      href: references-work-with-defender-for-iot-cli-commands.md
+      displayName: shell, login, cli, command-line, commands, users, user
+    - name: OT sensor CLI reference
+      href: cli-ot-sensor.md
+      displayName: shell, login, cli, command-line, commands, users, user
+  - name: Data retention
+    href: references-data-retention.md
   - name: API reference
     items:
     - name: Working with Defender for IoT APIs
@@ -505,16 +521,6 @@
         href: api/management-inventory-apis.md
       - name: Partner integration
         href: api/management-integration-apis.md
-  - name: Sensor health message reference
-    href: sensor-health-messages.md
-  - name: Defender for IoT CLI
-    items:
-    - name: CLI users and access
-      href: references-work-with-defender-for-iot-cli-commands.md
-      displayName: shell, login, cli, command-line, commands, users, user
-    - name: OT sensor CLI reference
-      href: cli-ot-sensor.md
-      displayName: shell, login, cli, command-line, commands, users, user
   - name: Frequently asked questions
     items:
     - name: General FAQ
@@ -525,8 +531,6 @@
       href: faqs-eiot.md
 - name: Resources
   items:
-  - name: OT network pre-deployment checklist
-    href: pre-deployment-checklist.md
   - name: Custom columns sample script
     href: custom-columns-sample-script.md
   - name: Regional availability
diff --git a/articles/defender-for-iot/organizations/api/management-integration-apis.md b/articles/defender-for-iot/organizations/api/management-integration-apis.md
@@ -298,7 +298,7 @@ This API returns data about a specific device per a given device ID.
 | **u_mac_address_objects** |JSON array of MAC addresses | Not nullable | Array of [MAC address](#mac_address_object-fields) objects  |
 | **u_protocol_objects** | JSON array of protocols | Not nullable  | An array of [protocol](#protocol_object-fields) objects  |
 | **u_vlans**  |JSON array of VLAN objects | Not nullable | An array of [VLAN](#vlan_object-fields) objects  |
-| **u_purdue_layer**  | String | Not nullable |Defines the default [Purdue layer](../plan-network-monitoring.md#purdue-reference-model-and-defender-for-iot) for this device type. |
+| **u_purdue_layer**  | String | Not nullable |Defines the default [Purdue layer](../best-practices/understand-network-architecture.md) for this device type. |
 | **u_sensor_ids** |JSON array of sensor ID objects |Not nullable | An array of [sensor ID](#sensor_id_object-fields) objects  |
 | **u_cm_device_url** |String |Not nullable  | The URL used to access the device on the on-premises management console. |
 | **u_device_urls** |JSON array of URL objects |Not nullable  | An array of [device URL](#device_url_object-fields) objects |
@@ -732,6 +732,7 @@ curl -k -H "Authorization: <Authorization token>" "https://<IP Address>/external
 ```rest
 curl -k -H "Authorization: 1234b734a9244d54ab8d40aedddcabcd" "https://127.0.0.1/external/v3/integration/devicecves/1664781014000"
 ```
+
 ---
 
 ## Next steps
diff --git a/articles/defender-for-iot/organizations/appliance-catalog/dell-edge-5200.md b/articles/defender-for-iot/organizations/appliance-catalog/dell-edge-5200.md
@@ -54,5 +54,5 @@ Continue understanding system requirements for physical or virtual appliances. F
 
 Then, use any of the following procedures to continue:
 
-- [Download software for an on-premises management console](../how-to-manage-the-on-premises-management-console.md#download-software-for-the-on-premises-management-console)
-- [Install software](../how-to-install-software.md)
+- [Download software for an OT sensor](../ot-deploy/install-software-ot-sensor.md#download-software-files-from-the-azure-portal)
+- [Download software files for an on-premises management console](../ot-deploy/install-software-on-premises-management-console.md#download-software-files-from-the-azure-portal)
diff --git a/articles/defender-for-iot/organizations/appliance-catalog/dell-poweredge-r340-xl-legacy.md b/articles/defender-for-iot/organizations/appliance-catalog/dell-poweredge-r340-xl-legacy.md
@@ -194,5 +194,5 @@ Continue understanding system requirements for physical or virtual appliances. F
 
 Then, use any of the following procedures to continue:
 
-- [Download software for an on-premises management console](../how-to-manage-the-on-premises-management-console.md#download-software-for-the-on-premises-management-console)
-- [Install software](../how-to-install-software.md)
+- [Download software for an OT sensor](../ot-deploy/install-software-ot-sensor.md#download-software-files-from-the-azure-portal)
+- [Download software files for an on-premises management console](../ot-deploy/install-software-on-premises-management-console.md#download-software-files-from-the-azure-portal)
diff --git a/articles/defender-for-iot/organizations/appliance-catalog/dell-poweredge-r350-e1800.md b/articles/defender-for-iot/organizations/appliance-catalog/dell-poweredge-r350-e1800.md
@@ -224,5 +224,5 @@ Continue understanding system requirements for physical or virtual appliances. F
 
 Then, use any of the following procedures to continue:
 
-- [Download software for an on-premises management console](../how-to-manage-the-on-premises-management-console.md#download-software-for-the-on-premises-management-console)
-- [Install software](../how-to-install-software.md)
+- [Download software for an OT sensor](../ot-deploy/install-software-ot-sensor.md#download-software-files-from-the-azure-portal)
+- [Download software files for an on-premises management console](../ot-deploy/install-software-on-premises-management-console.md#download-software-files-from-the-azure-portal)
diff --git a/articles/defender-for-iot/organizations/appliance-catalog/hpe-edgeline-el300.md b/articles/defender-for-iot/organizations/appliance-catalog/hpe-edgeline-el300.md
@@ -148,5 +148,5 @@ Continue understanding system requirements for physical or virtual appliances. F
 
 Then, use any of the following procedures to continue:
 
-- [Download software for an on-premises management console](../how-to-manage-the-on-premises-management-console.md#download-software-for-the-on-premises-management-console)
-- [Install software](../how-to-install-software.md)
+- [Download software for an OT sensor](../ot-deploy/install-software-ot-sensor.md#download-software-files-from-the-azure-portal)
+- [Download software files for an on-premises management console](../ot-deploy/install-software-on-premises-management-console.md#download-software-files-from-the-azure-portal)
diff --git a/articles/defender-for-iot/organizations/appliance-catalog/hpe-proliant-dl20-legacy.md b/articles/defender-for-iot/organizations/appliance-catalog/hpe-proliant-dl20-legacy.md
@@ -153,5 +153,5 @@ Continue understanding system requirements for physical or virtual appliances. F
 
 Then, use any of the following procedures to continue:
 
-- [Download software for an on-premises management console](../how-to-manage-the-on-premises-management-console.md#download-software-for-the-on-premises-management-console)
-- [Install software](../how-to-install-software.md)
+- [Download software for an OT sensor](../ot-deploy/install-software-ot-sensor.md#download-software-files-from-the-azure-portal)
+- [Download software files for an on-premises management console](../ot-deploy/install-software-on-premises-management-console.md#download-software-files-from-the-azure-portal)
diff --git a/articles/defender-for-iot/organizations/appliance-catalog/hpe-proliant-dl20-plus-enterprise.md b/articles/defender-for-iot/organizations/appliance-catalog/hpe-proliant-dl20-plus-enterprise.md
@@ -170,5 +170,5 @@ Continue understanding system requirements for physical or virtual appliances. F
 
 Then, use any of the following procedures to continue:
 
-- [Download software for an on-premises management console](../how-to-manage-the-on-premises-management-console.md#download-software-for-the-on-premises-management-console)
-- [Install software](../how-to-install-software.md)
+- [Download software for an OT sensor](../ot-deploy/install-software-ot-sensor.md#download-software-files-from-the-azure-portal)
+- [Download software files for an on-premises management console](../ot-deploy/install-software-on-premises-management-console.md#download-software-files-from-the-azure-portal)
diff --git a/articles/defender-for-iot/organizations/appliance-catalog/hpe-proliant-dl20-plus-smb.md b/articles/defender-for-iot/organizations/appliance-catalog/hpe-proliant-dl20-plus-smb.md
@@ -188,5 +188,5 @@ Continue understanding system requirements for physical or virtual appliances. F
 
 Then, use any of the following procedures to continue:
 
-- [Download software for an on-premises management console](../how-to-manage-the-on-premises-management-console.md#download-software-for-the-on-premises-management-console)
-- [Install software](../how-to-install-software.md)
+- [Download software for an OT sensor](../ot-deploy/install-software-ot-sensor.md#download-software-files-from-the-azure-portal)
+- [Download software files for an on-premises management console](../ot-deploy/install-software-on-premises-management-console.md#download-software-files-from-the-azure-portal)
diff --git a/articles/defender-for-iot/organizations/appliance-catalog/hpe-proliant-dl20-smb-legacy.md b/articles/defender-for-iot/organizations/appliance-catalog/hpe-proliant-dl20-smb-legacy.md
@@ -168,5 +168,5 @@ Continue understanding system requirements for physical or virtual appliances. F
 
 Then, use any of the following procedures to continue:
 
-- [Download software for an on-premises management console](../how-to-manage-the-on-premises-management-console.md#download-software-for-the-on-premises-management-console)
-- [Install software](../how-to-install-software.md)
+- [Download software for an OT sensor](../ot-deploy/install-software-ot-sensor.md#download-software-files-from-the-azure-portal)
+- [Download software files for an on-premises management console](../ot-deploy/install-software-on-premises-management-console.md#download-software-files-from-the-azure-portal)
diff --git a/articles/defender-for-iot/organizations/appliance-catalog/hpe-proliant-dl360.md b/articles/defender-for-iot/organizations/appliance-catalog/hpe-proliant-dl360.md
@@ -169,5 +169,5 @@ Continue understanding system requirements for physical or virtual appliances. F
 
 Then, use any of the following procedures to continue:
 
-- [Download software for an on-premises management console](../how-to-manage-the-on-premises-management-console.md#download-software-for-the-on-premises-management-console)
-- [Install software](../how-to-install-software.md)
+- [Download software for an OT sensor](../ot-deploy/install-software-ot-sensor.md#download-software-files-from-the-azure-portal)
+- [Download software files for an on-premises management console](../ot-deploy/install-software-on-premises-management-console.md#download-software-files-from-the-azure-portal)
diff --git a/articles/defender-for-iot/organizations/appliance-catalog/neousys-nuvo-5006lp.md b/articles/defender-for-iot/organizations/appliance-catalog/neousys-nuvo-5006lp.md
@@ -143,5 +143,5 @@ Continue understanding system requirements for physical or virtual appliances. F
 
 Then, use any of the following procedures to continue:
 
-- [Download software for an on-premises management console](../how-to-manage-the-on-premises-management-console.md#download-software-for-the-on-premises-management-console)
-- [Install software](../how-to-install-software.md)
+- [Download software for an OT sensor](../ot-deploy/install-software-ot-sensor.md#download-software-files-from-the-azure-portal)
+- [Download software files for an on-premises management console](../ot-deploy/install-software-on-premises-management-console.md#download-software-files-from-the-azure-portal)
diff --git a/articles/defender-for-iot/organizations/appliance-catalog/virtual-management-hyper-v.md b/articles/defender-for-iot/organizations/appliance-catalog/virtual-management-hyper-v.md
@@ -86,5 +86,5 @@ Continue understanding system requirements for physical or virtual appliances. F
 
 Then, use any of the following procedures to continue:
 
-- [Download software for an on-premises management console](../how-to-manage-the-on-premises-management-console.md#download-software-for-the-on-premises-management-console)
-- [Install Microsoft Defender for IoT on-premises management console software](../ot-deploy/install-software-on-premises-management-console.md)
+- [Download software for an OT sensor](../ot-deploy/install-software-ot-sensor.md#download-software-files-from-the-azure-portal)
+- [Download software files for an on-premises management console](../ot-deploy/install-software-on-premises-management-console.md#download-software-files-from-the-azure-portal)
diff --git a/articles/defender-for-iot/organizations/appliance-catalog/virtual-management-vmware.md b/articles/defender-for-iot/organizations/appliance-catalog/virtual-management-vmware.md
@@ -72,5 +72,5 @@ Continue understanding system requirements for physical or virtual appliances. F
 
 Then, use any of the following procedures to continue:
 
-- [Download software for an on-premises management console](../how-to-manage-the-on-premises-management-console.md#download-software-for-the-on-premises-management-console)
-- [Install Microsoft Defender for IoT on-premises management console software](../ot-deploy/install-software-on-premises-management-console.md)
+- [Download software for an OT sensor](../ot-deploy/install-software-ot-sensor.md#download-software-files-from-the-azure-portal)
+- [Download software files for an on-premises management console](../ot-deploy/install-software-on-premises-management-console.md#download-software-files-from-the-azure-portal)
diff --git a/articles/defender-for-iot/organizations/appliance-catalog/virtual-sensor-hyper-v.md b/articles/defender-for-iot/organizations/appliance-catalog/virtual-sensor-hyper-v.md
@@ -91,5 +91,5 @@ Continue understanding system requirements for physical or virtual appliances. F
 
 Then, use any of the following procedures to continue:
 
-- [Download software for an on-premises management console](../how-to-manage-the-on-premises-management-console.md#download-software-for-the-on-premises-management-console)
-- [Install OT monitoring software on OT sensors](../ot-deploy/install-software-ot-sensor.md)
+- [Download software for an OT sensor](../ot-deploy/install-software-ot-sensor.md#download-software-files-from-the-azure-portal)
+- [Download software files for an on-premises management console](../ot-deploy/install-software-on-premises-management-console.md#download-software-files-from-the-azure-portal)
diff --git a/articles/defender-for-iot/organizations/appliance-catalog/ys-techsystems-ys-fit2.md b/articles/defender-for-iot/organizations/appliance-catalog/ys-techsystems-ys-fit2.md
@@ -153,5 +153,5 @@ Continue understanding system requirements for physical or virtual appliances. F
 
 Then, use any of the following procedures to continue:
 
-- [Download software for an on-premises management console](../how-to-manage-the-on-premises-management-console.md#download-software-for-the-on-premises-management-console)
-- [Install software](../how-to-install-software.md)
+- [Download software for an OT sensor](../ot-deploy/install-software-ot-sensor.md#download-software-files-from-the-azure-portal)
+- [Download software files for an on-premises management console](../ot-deploy/install-software-on-premises-management-console.md#download-software-files-from-the-azure-portal)
diff --git a/articles/defender-for-iot/organizations/best-practices/sample-connectivity-models.md b/articles/defender-for-iot/organizations/best-practices/sample-connectivity-models.md
@@ -2,7 +2,7 @@
 title: Sample OT  network connectivity models - Microsoft Defender for IoT
 description: This article describes sample connectivity methods for Microsoft Defender for IoT OT sensor connections.
 ms.date: 11/08/2022
-ms.topic: best-practice
+ms.topic: install-set-up-deploy
 ---
 
 # Sample OT network connectivity models
diff --git a/articles/defender-for-iot/organizations/cli-ot-sensor.md b/articles/defender-for-iot/organizations/cli-ot-sensor.md
@@ -28,7 +28,7 @@ For more information, see [Access the CLI](../references-work-with-defender-for-
 
 Use the following commands to verify that the Defender for IoT application on the OT sensor are working correctly, including the web console and traffic analysis processes.
 
-Health checks are also available from the OT sensor console. For more information, see [Troubleshoot the sensor and on-premises management console](../how-to-troubleshoot-the-sensor-and-on-premises-management-console.md).
+Health checks are also available from the OT sensor console.
 
 |User  |Command  |Full command syntax   |
 |---------|---------|---------|
diff --git a/articles/defender-for-iot/organizations/concept-supported-protocols.md b/articles/defender-for-iot/organizations/concept-supported-protocols.md
@@ -12,7 +12,7 @@ This article lists the protocols that are supported by default in Microsoft Defe
 
 ## Supported protocols for OT device discovery
 
-Defender for IoT can detect the following protocols when identifying assets and devices in your network:
+OT network sensors can detect the following protocols when identifying assets and devices in your network:
 
 |Brand / Vendor |Protocols  |
 |---------|---------|
@@ -47,6 +47,7 @@ Defender for IoT can detect the following protocols when identifying assets and
 |**Toshiba**     |Toshiba Computer Link         |
 |**Yokogawa**     |   Centum ODEQ (Centum / ProSafe DCS)<br> HIS Equalize<br> FA-M3<br> Vnet/IP      |
 
+
 [!INCLUDE [active-monitoring-protocols](includes/active-monitoring-protocols.md)]
 
 ## Supported protocols for Enterprise IoT device discovery
diff --git a/articles/defender-for-iot/organizations/faqs-ot.md b/articles/defender-for-iot/organizations/faqs-ot.md
@@ -49,13 +49,11 @@ You can change user passwords or recover access to privileged users on both the
 
 For information on how to activate your sensor, see [Sign in and activate the sensor](how-to-activate-and-set-up-your-sensor.md#sign-in-and-activate-the-sensor).
 
-For information on how to activate your on-premises management console, see [Activate the on-premises management console](how-to-activate-and-set-up-your-on-premises-management-console.md#activate-the-on-premises-management-console).
-
 ## How to change the network configuration
 
 Change network configuration settings before or after you activate your sensor using either of the following options:
 
-- **From the sensor UI**: [Update the sensor network configuration](how-to-manage-individual-sensors.md#update-the-sensor-network-configuration)
+- **From the sensor UI**: Update the OT sensor network configuration
 - **From the sensor CLI**: [Network configuration](cli-ot-sensor.md#network-configuration)
 
 For more information, see [Activate and set up your sensor](how-to-activate-and-set-up-your-sensor.md), [Getting started with advanced CLI commands](references-work-with-defender-for-iot-cli-commands.md), and [CLI command reference from OT network sensors](cli-ot-sensor.md).
@@ -64,9 +62,7 @@ For more information, see [Activate and set up your sensor](how-to-activate-and-
 
 After installing the software for your sensor or on-premises management console, you'll want to perform the [Post-installation validation](ot-deploy/post-install-validation-ot-software.md).
 
-You can also use our [UI and CLI tools](how-to-troubleshoot-the-sensor-and-on-premises-management-console.md#check-system-health) to check system health and review your overall system statistics.
-
-For more information, see [Troubleshoot the sensor and on-premises management console](how-to-troubleshoot-the-sensor-and-on-premises-management-console.md).
+You can also use our UI and CLI tools to check system health and review your overall system statistics.
 
 ## Next steps
 
diff --git a/articles/defender-for-iot/organizations/networking-requirements.md b/articles/defender-for-iot/organizations/networking-requirements.md
diff --git a/articles/defender-for-iot/organizations/references-data-retention.md b/articles/defender-for-iot/organizations/references-data-retention.md
