Merge pull request #215030 from batamig/eiot-redux

Eiot redux

Author: PMEds28

.openpublishing.redirection.defender-for-iot.json

@@ -1,5 +1,10 @@
 {
     "redirections": [
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/tutorial-getting-started-eiot-sensor.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/concept-enterprise",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/defender-for-iot/organizations/resources-frequently-asked-questions.md",
             "redirect_url": "/azure/defender-for-iot/organizations/faqs-general",

articles/defender-for-iot/index.yml

@@ -46,9 +46,9 @@ conceptualContent:
         - url: organizations/tutorial-onboarding.md
           itemType: tutorial
           text: Get started with for OT security monitoring
-        - url: organizations/tutorial-getting-started-eiot-sensor.md
-          itemType: tutorial
-          text: Get started with Enterprise IoT security monitoring
+        - url: organizations/concept-enterprise.md
+          itemType: concept
+          text: Securing IoT devices in the enterprise
         - url: organizations/best-practices/understand-network-architecture.md
           itemType: concept
           text: Understand your OT network architecture

articles/defender-for-iot/organizations/TOC.yml

@@ -7,32 +7,36 @@
     href: overview.md
   - name: What's new?
     items:
-    - name: Whats new in Defender for IoT
+    - name: What's new in Defender for IoT
       href: release-notes.md
     - name: Microsoft Sentinel solution release notes
       href: release-notes-sentinel.md
 - name: Quickstarts
   expanded: false
   items:
-  - name: Get started with Defender for IoT
+  - name: Get started with OT security monitoring
     href: getting-started.md
+  - name: Enable Enterprise IoT security
+    href: eiot-defender-for-endpoint.md
 - name: Tutorials
   expanded: false
   items:
-  - name: Set up OT network security
+  - name: Onboard and activate a virtual OT sensor
     href: tutorial-onboarding.md
-  - name: Set up Enterprise IoT network security
-    href: tutorial-getting-started-eiot-sensor.md
   - name: Integrate with Microsoft Sentinel
-    items: 
+    items:
     - name: Connect Defender for IoT data to Microsoft Sentinel
       href: ../../sentinel/iot-solution.md?toc=/azure/defender-for-iot/organizations/toc.json&bc=/azure/defender-for-iot/breadcrumb/toc.json
     - name: Investigate Defender for IoT incidents with Microsoft Sentinel
       href: ../../sentinel/iot-advanced-threat-monitoring.md?toc=/azure/defender-for-iot/organizations/toc.json&bc=/azure/defender-for-iot/breadcrumb/toc.json
 - name: Concepts
   items:
-    - name: System architecture
+    - name: Subscription billing
+      href: billing.md
+    - name: OT system architecture
       href: architecture.md
+    - name: OT sensor cloud connection methods
+      href: architecture-connections.md
     - name: OT network monitoring best practices
       items:
       - name: Understand your network architecture
@@ -41,22 +45,20 @@
         href: best-practices/plan-network-monitoring.md
       - name: Sample connectivity models
         href: best-practices/sample-connectivity-models.md
-    - name: OT threat monitoring in enterprise SOCs
-      href: concept-sentinel-integration.md
-    - name: OT security system architecture
+    - name: OT monitoring appliance catalog
       items:
-      - name: OT sensor cloud connection methods
-        href: architecture-connections.md
-      - name: OT monitoring appliance catalog
-        items:
-        - name: Which appliances do I need?
-          href: ot-appliance-sizing.md
-        - name: Pre-configured appliances
-          href: ot-pre-configured-appliances.md
-        - name: OT monitoring with virtual appliances
-          href: ot-virtual-appliances.md
-      - name: Supported OT protocols
-        href: concept-supported-protocols.md
+      - name: Which appliances do I need?
+        href: ot-appliance-sizing.md
+      - name: Pre-configured appliances
+        href: ot-pre-configured-appliances.md
+      - name: OT monitoring with virtual appliances
+        href: ot-virtual-appliances.md
+    - name: Supported OT protocols
+      href: concept-supported-protocols.md
+    - name: Monitoring OT threats in enterprise SOCs
+      href: concept-sentinel-integration.md
+    - name: Securing IoT devices in the enterprise
+      href: concept-enterprise.md
 - name: How-to guides
   items:
   - name: Visualize devices
@@ -138,111 +140,111 @@
         href: tutorial-servicenow.md
       - name: Legacy integration
         href: integrations/service-now-legacy.md
-  - name: System deployment
+  - name: Set up OT network monitoring
     items:
-    - name: Manage plans on Azure subscriptions
+    - name: Prepare your network
+      href: how-to-set-up-your-network.md
+    - name: Configure traffic mirroring
+      items:
+      - name: Overview
+        href: best-practices/traffic-mirroring-methods.md
+      - name: Configure a switch SPAN port
+        href: traffic-mirroring/configure-mirror-span.md
+      - name: Configure a remote SPAN (RSPAN)
+        href: traffic-mirroring/configure-mirror-rspan.md
+      - name: Configure active and passive aggregation (TAP)
+        href: traffic-mirroring/configure-mirror-tap.md
+      - name: Configure ERSPAN mirroring
+        href: traffic-mirroring/configure-mirror-erspan.md
+      - name: Configure mirroring with an ESXi vSwitch
+        href: traffic-mirroring/configure-mirror-esxi.md
+      - name: Configure mirroring with a Hyper-V vSwitch
+        href: traffic-mirroring/configure-mirror-hyper-v.md
+    - name: Manage OT plans on Azure subscriptions
       href: how-to-manage-subscriptions.md
-    - name: Onboard sensors
+    - name: Onboard OT sensors
       href: onboard-sensors.md
+    - name: Install OT system software
+      href: how-to-install-software.md
     - name: Activate and set up your sensor
       href: how-to-activate-and-set-up-your-sensor.md
-    - name: OT system setup
-      items:
-      - name: Set up OT network monitoring
-        href: how-to-set-up-your-network.md
-      - name: Configure traffic mirroring
-        items:
-        - name: Overview
-          href: best-practices/traffic-mirroring-methods.md
-        - name: Configure a switch SPAN port
-          href: traffic-mirroring/configure-mirror-span.md
-        - name: Configure a remote SPAN (RSPAN)
-          href: traffic-mirroring/configure-mirror-rspan.md
-        - name: Configure active and passive aggregation (TAP)
-          href: traffic-mirroring/configure-mirror-tap.md
-        - name: Configure ERSPAN mirroring
-          href: traffic-mirroring/configure-mirror-erspan.md
-        - name: Configure mirroring with an ESXi vSwitch
-          href: traffic-mirroring/configure-mirror-esxi.md
-        - name: Configure mirroring with a Hyper-V vSwitch
-          href: traffic-mirroring/configure-mirror-hyper-v.md
-      - name: Deploy OT certificates
-        href: how-to-deploy-certificates.md
-      - name: Install OT system software
-        href: how-to-install-software.md
-      - name: Connect OT sensors to the cloud
-        items:
-        - name: Connect OT sensors to Defender for IoT
-          href: connect-sensors.md
-        - name: Connect OT sensors with a proxy (legacy)
-          href: how-to-connect-sensor-by-proxy.md
-      - name: Activate and set up your on-premises management console
-        href: how-to-activate-and-set-up-your-on-premises-management-console.md
-      - name: Add support for proprietary protocols
-        href: resources-manage-proprietary-protocols.md
-    - name: Enterprise IoT system setup
+    - name: Deploy OT certificates
+      href: how-to-deploy-certificates.md
+    - name: Connect OT sensors to the cloud
       items:
-      - name: Extra deployment steps and samples
-        href: extra-deploy-enterprise-iot.md
-  - name: System maintenance
+      - name: Connect OT sensors to Defender for IoT
+        href: connect-sensors.md
+      - name: Connect OT sensors with a proxy (legacy)
+        href: how-to-connect-sensor-by-proxy.md
+    - name: Activate and set up your on-premises management console
+      href: how-to-activate-and-set-up-your-on-premises-management-console.md
+    - name: Add support for proprietary protocols
+      href: resources-manage-proprietary-protocols.md
+  - name: Set up Enterprise IoT network monitoring
+    items:
+    - name: Manage Enterprise IoT plans on Azure subscriptions
+      href: manage-subscriptions-enterprise.md
+    - name: Discover Enterprise IoT devices
+      href: eiot-sensor.md
+    - name: Extra deployment steps and samples
+      href: extra-deploy-enterprise-iot.md
+  - name: Manage sensors from the Azure portal
+    href: how-to-manage-sensors-on-the-cloud.md
+  - name: OT system maintenance
     items:
-    - name: Manage sensors from the Azure portal
-      href: how-to-manage-sensors-on-the-cloud.md
     - name: Maintain threat intelligence packages
       href: how-to-work-with-threat-intelligence-packages.md
-    - name: OT system maintenance
+    - name: Update OT monitoring software
+      href: update-ot-software.md
+      displayName: upgrade
+    - name: Manage OT sensors
       items:
-      - name: Update OT monitoring software
-        href: update-ot-software.md
-        displayName: upgrade
-      - name: Manage OT sensors
-        items:
-        - name: Manage individual sensors
-          href: how-to-manage-individual-sensors.md
-        - name: Control OT traffic monitoring
-          href: how-to-control-what-traffic-is-monitored.md
-        - name: Detect Windows workstations and servers by script
-          href: detect-windows-endpoints-script.md
-        - name: Configure active monitoring
-          items:
-          - name: Planning and prerequisites
-            href: configure-active-monitoring.md
-          - name: Configure Windows Endpoint Monitoring
-            href: configure-windows-endpoint-monitoring.md
-          - name: Configure reverse DNS lookup
-            href: configure-reverse-dns-lookup.md
-        - name: Manage sensors from the on-premises management console
-          href: how-to-manage-sensors-from-the-on-premises-management-console.md
-      - name: Manage OT sensor users
-        items:
-        - name: Create and manage users
-          href: how-to-create-and-manage-users.md
-        - name: Integrate with active directory
-          href: integrate-with-active-directory.md
-        - name: Define global user access control
-          href: how-to-define-global-user-access-control.md
-      - name: Enrich device information
-        items:
-        - name: Work with device notifications
-          href: how-to-work-with-device-notifications.md
-        - name: Enhance port and VLAN name resolution
-          href: how-to-enhance-port-and-vlan-name-resolution.md
-        - name: Import device information
-          href: how-to-import-device-information.md
-      - name: Track sensor activity
-        href: how-to-track-sensor-activity.md
-      - name: Set up SNMP MIB monitoring
-        href: how-to-set-up-snmp-mib-monitoring.md
-      - name: Manage proprietary protocols (Horizon)
-        href: resources-manage-proprietary-protocols.md
-      - name: Manage an OT on-premises management console
+      - name: Manage individual sensors
+        href: how-to-manage-individual-sensors.md
+      - name: Control OT traffic monitoring
+        href: how-to-control-what-traffic-is-monitored.md
+      - name: Detect Windows workstations and servers by script
+        href: detect-windows-endpoints-script.md
+      - name: Configure active monitoring
         items:
-        - name: Set up high availability
-          href: how-to-set-up-high-availability.md
-        - name: Manage the on-premises management console
-          href: how-to-manage-the-on-premises-management-console.md
-      - name: Troubleshoot the sensor and on-premises management console
-        href: how-to-troubleshoot-the-sensor-and-on-premises-management-console.md
+        - name: Planning and prerequisites
+          href: configure-active-monitoring.md
+        - name: Configure Windows Endpoint Monitoring
+          href: configure-windows-endpoint-monitoring.md
+        - name: Configure reverse DNS lookup
+          href: configure-reverse-dns-lookup.md
+      - name: Manage sensors from the on-premises management console
+        href: how-to-manage-sensors-from-the-on-premises-management-console.md
+    - name: Manage OT sensor users
+      items:
+      - name: Create and manage users
+        href: how-to-create-and-manage-users.md
+      - name: Integrate with active directory
+        href: integrate-with-active-directory.md
+      - name: Define global user access control
+        href: how-to-define-global-user-access-control.md
+    - name: Enrich device information
+      items:
+      - name: Work with device notifications
+        href: how-to-work-with-device-notifications.md
+      - name: Enhance port and VLAN name resolution
+        href: how-to-enhance-port-and-vlan-name-resolution.md
+      - name: Import device information
+        href: how-to-import-device-information.md
+    - name: Track sensor activity
+      href: how-to-track-sensor-activity.md
+    - name: Set up SNMP MIB monitoring
+      href: how-to-set-up-snmp-mib-monitoring.md
+    - name: Manage proprietary protocols (Horizon)
+      href: resources-manage-proprietary-protocols.md
+    - name: Manage an OT on-premises management console
+      items:
+      - name: Set up high availability
+        href: how-to-set-up-high-availability.md
+      - name: Manage the on-premises management console
+        href: how-to-manage-the-on-premises-management-console.md
+    - name: Troubleshoot the sensor and on-premises management console
+      href: how-to-troubleshoot-the-sensor-and-on-premises-management-console.md
 - name: Reference
   items:
   - name: OT monitoring appliances
@@ -267,11 +269,11 @@
         href: appliance-catalog/ys-techsystems-ys-fit2.md
     - name: Virtual appliances
       items:
-      - name: OT sensor (VMWare ESXi) 
+      - name: OT sensor (VMware ESXi) 
         href: appliance-catalog/virtual-sensor-vmware.md
       - name: OT sensor (Hyper-V)
         href: appliance-catalog/virtual-sensor-hyper-v.md
-      - name: On-premises management console (VMWare ESXi)
+      - name: On-premises management console (VMware ESXi)
         href: appliance-catalog/virtual-management-vmware.md
       - name: On-premises management console (Microsoft Hyper-V)
         href: appliance-catalog/virtual-management-hyper-v.md

articles/defender-for-iot/organizations/appliance-catalog/index.yml

@@ -47,11 +47,11 @@ landingContent:
     linkLists:
       - linkListType: deploy
         links:
-          - text: OT sensor (VMWare ESXi)
+          - text: OT sensor (VMware ESXi)
             url: virtual-sensor-vmware.md
           - text: OT sensor (Microsoft Hyper-V)
             url: virtual-sensor-hyper-v.md
-          - text: On-premises management console (VMWare ESXi)
+          - text: On-premises management console (VMware ESXi)
             url: virtual-management-vmware.md
           - text: On-premises management console (Microsoft Hyper-V)
             url: virtual-management-hyper-v.md