Merge branch 'MicrosoftDocs:main' into same-port-preview

jaesoni · web-flow · commit 824d4bf92d70 · 2023-02-27T15:57:36.000+05:30
diff --git a/articles/active-directory-b2c/phone-based-mfa.md b/articles/active-directory-b2c/phone-based-mfa.md
@@ -18,6 +18,9 @@ ms.subservice: B2C
 
 With Azure Active Directory (Azure AD) Multi-Factor Authentication (MFA), users can choose to receive an automated voice call at a phone number they register for verification. Malicious users could take advantage of this method by creating multiple accounts and placing phone calls without completing the MFA registration process. These numerous failed sign-ups could exhaust the allowed sign-up attempts, preventing other users from signing up for new accounts in your Azure AD B2C tenant. To help protect against these attacks, you can use Azure Monitor to monitor phone authentication failures and mitigate fraudulent sign-ups.
 
+> [!IMPORTANT]
+> Authenticator app (TOTP) provides stronger security than SMS/Phone multi-factor authentication. To set this up please read our instructions for [enabling multi-factor authentication in Azure Active Directory B2C](multi-factor-authentication.md).
+
 ## Prerequisites
 
 Before you begin, create a [Log Analytics workspace](azure-monitor.md).
diff --git a/articles/active-directory-b2c/roles-resource-access-control.md b/articles/active-directory-b2c/roles-resource-access-control.md
@@ -3,14 +3,14 @@ title: Roles and resource access control
 titleSuffix: Azure AD B2C
 description: Learn how to use roles to control resource access.
 services: active-directory-b2c
-author: kengaderdus
+author: garrodonnell
 manager: CelesteDG
 
 ms.service: active-directory
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 11/25/2021
-ms.author: kengaderdus
+ms.date: 02/24/2023
+ms.author: godonnell
 ms.subservice: B2C
 ---
 # Roles and resource access control
diff --git a/articles/defender-for-cloud/TOC.yml b/articles/defender-for-cloud/TOC.yml
@@ -102,7 +102,7 @@
     items:
     - name: The Defender for Cloud multicloud solution
       href: multicloud.yml
-    - name: Zero trust infrastructure and integrations
+    - name: Zero Trust infrastructure and integrations
       href: zero-trust.md
     - name: Planning multicloud security
       items:
diff --git a/articles/defender-for-cloud/zero-trust.md b/articles/defender-for-cloud/zero-trust.md
@@ -3,9 +3,13 @@ title: Zero trust infrastructure and integrations
 description: Independent software vendors (ISVs) can integrate their solutions with Microsoft Defender for Cloud to help customers adopt a Zero Trust model and keep their organizations secure.
 ms.date: 02/26/2023
 ms.topic: conceptual
+ms.collection:
+  -       zerotrust-services
 ---
 
-# Zero trust infrastructure and integrations
+# Zero Trust infrastructure and integrations
+
+[!INCLUDE [zero-trust-principles](../../includes/security/zero-trust-principles.md)]
 
 Infrastructure comprises the hardware, software, micro-services, networking infrastructure, and facilities required to support IT services for an organization. Zero Trust infrastructure solutions assess, monitor, and prevent security threats to these services.
 
diff --git a/articles/defender-for-iot/organizations/architecture-connections.md b/articles/defender-for-iot/organizations/architecture-connections.md
@@ -1,7 +1,7 @@
 ---
 title: OT sensor cloud connection methods - Microsoft Defender for IoT
 description: Learn about the architecture models available for connecting your sensors to Microsoft Defender for IoT.
-ms.topic: conceptual
+ms.topic: concept-article
 ms.date: 02/23/2023
 ---
 
diff --git a/articles/defender-for-iot/organizations/best-practices/plan-network-monitoring.md b/articles/defender-for-iot/organizations/best-practices/plan-network-monitoring.md
@@ -1,7 +1,7 @@
 ---
 title: Plan your sensor connections for OT monitoring - Microsoft Defender for IoT
 description: Learn about best practices for planning your OT network monitoring with Microsoft Defender for IoT.
-ms.topic: conceptual
+ms.topic: best-practice
 ms.date: 06/02/2022
 ---
 
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: conceptual
+ms.topic: best-practice
 ---
 
 # Sample OT network connectivity models
diff --git a/articles/defender-for-iot/organizations/best-practices/traffic-mirroring-methods.md b/articles/defender-for-iot/organizations/best-practices/traffic-mirroring-methods.md
@@ -2,7 +2,7 @@
 title: Traffic mirroring methods - Microsoft Defender for IoT
 description: This article describes traffic mirroring methods for OT monitoring with Microsoft Defender for IoT.
 ms.date: 09/20/2022
-ms.topic: how-to
+ms.topic: best-practice
 ---
 
 # Traffic mirroring methods for OT monitoring
diff --git a/articles/defender-for-iot/organizations/best-practices/understand-network-architecture.md b/articles/defender-for-iot/organizations/best-practices/understand-network-architecture.md
@@ -2,7 +2,7 @@
 title: Understand your OT network architecture - Microsoft Defender for IoT
 description: Describes the Purdue reference module in relation to Microsoft Defender for IoT to help you understand more about your own OT network architecture.
 ms.date: 06/02/2022
-ms.topic: conceptual
+ms.topic: concept-article
 ---
 
 # Understand your OT network architecture
diff --git a/articles/defender-for-iot/organizations/billing.md b/articles/defender-for-iot/organizations/billing.md
@@ -1,7 +1,7 @@
 ---
 title: Subscription billing
 description: Learn how you're billed for the Microsoft Defender for IoT service on your Azure subscription.
-ms.topic: conceptual
+ms.topic: concept-article
 ms.date: 10/30/2022
 ---
 
diff --git a/articles/defender-for-iot/organizations/concept-enterprise.md b/articles/defender-for-iot/organizations/concept-enterprise.md
@@ -1,7 +1,7 @@
 ---
 title: Securing IoT devices in the enterprise with Microsoft Defender for Endpoint
 description: Learn how integrating Microsoft Defender for Endpoint and Microsoft Defender for IoT's security content and network sensors enhances your IoT network security.
-ms.topic: conceptual
+ms.topic: concept-article
 ms.date: 10/19/2022
 ---
 
diff --git a/articles/defender-for-iot/organizations/concept-sentinel-integration.md b/articles/defender-for-iot/organizations/concept-sentinel-integration.md
@@ -2,7 +2,7 @@
 title: OT threat monitoring in enterprise security operation center (SOC) teams - Microsoft Defender for IoT
 description: Learn about how integration with Microsoft Sentinel can help security operation center teams bridge the gap between IT and OT security.
 ms.date: 03/24/2022
-ms.topic: conceptual
+ms.topic: integration
 ---
 
 # OT threat monitoring in enterprise SOCs
diff --git a/articles/defender-for-iot/organizations/concept-supported-protocols.md b/articles/defender-for-iot/organizations/concept-supported-protocols.md
@@ -1,8 +1,8 @@
 ---
 title: Protocols supported by Microsoft Defender for IoT
-description: Learn about protocols that are supported by Microsoft Defender for IoT.
+description: Learn about protocols that Microsoft Defender for IoT supports.
 ms.date: 01/30/2023
-ms.topic: article
+ms.topic: concept-article
 ---
 
 # Microsoft Defender for IoT - supported IoT, OT, ICS, and SCADA protocols
diff --git a/articles/defender-for-iot/organizations/custom-columns-sample-script.md b/articles/defender-for-iot/organizations/custom-columns-sample-script.md
@@ -1,7 +1,7 @@
 ---
 title: Sample automation script for custom columns on on-premises management consoles - Microsoft Defender for IoT
 description: Use a sample script when adding custom columns to your on-premises management console Device inventory page.
-ms.topic: how-to
+ms.topic: sample
 ms.date: 07/12/2022
 
 ---
diff --git a/articles/defender-for-iot/organizations/extra-deploy-enterprise-iot.md b/articles/defender-for-iot/organizations/extra-deploy-enterprise-iot.md
@@ -1,7 +1,7 @@
 ---
 title: Extra deployment steps and samples for Enterprise IoT deployment - Microsoft Defender for IoT
 description: Describes extra deployment and validation procedures to use when deploying an Enterprise IoT network sensor.
-ms.topic: how-to
+ms.topic: install-set-up-deploy
 ms.date: 08/08/2022
 ---
 
diff --git a/articles/defender-for-iot/organizations/faqs-eiot.md b/articles/defender-for-iot/organizations/faqs-eiot.md
@@ -1,7 +1,7 @@
 ---
 title: FAQs for Enterprise IoT networks - Microsoft Defender for IoT
 description: Find answers to the most frequently asked questions about Microsoft Defender for IoT Enterprise IoT networks.
-ms.topic: conceptual
+ms.topic: faq
 ms.date: 07/07/2022
 ---
 
diff --git a/articles/defender-for-iot/organizations/faqs-general.md b/articles/defender-for-iot/organizations/faqs-general.md
@@ -1,7 +1,7 @@
 ---
 title: General FAQs - Microsoft Defender for IoT
 description: Find answers to the most frequently asked questions about Microsoft Defender for IoT features and service.
-ms.topic: conceptual
+ms.topic: faq
 ms.date: 07/07/2022
 ---
 
diff --git a/articles/defender-for-iot/organizations/faqs-ot.md b/articles/defender-for-iot/organizations/faqs-ot.md
@@ -1,7 +1,7 @@
 ---
 title: FAQs for OT networks - Microsoft Defender for IoT
 description: Find answers to the most frequently asked questions about Microsoft Defender for IoT OT networks.
-ms.topic: conceptual
+ms.topic: faq
 ms.date: 07/07/2022
 ---
 
diff --git a/articles/defender-for-iot/organizations/getting-started.md b/articles/defender-for-iot/organizations/getting-started.md
@@ -1,7 +1,7 @@
 ---
 title: Get started with OT network security monitoring - Microsoft Defender for IoT
 description: Use this quickstart to set up a trial OT plan with Microsoft Defender for IoT and understand the next steps required to configure your network sensors.
-ms.topic: quickstart
+ms.topic: get-started
 ms.date: 12/25/2022
 ---
 
diff --git a/articles/defender-for-iot/organizations/how-to-activate-and-set-up-your-on-premises-management-console.md b/articles/defender-for-iot/organizations/how-to-activate-and-set-up-your-on-premises-management-console.md
@@ -2,7 +2,7 @@
 title: Activate and set up your on-premises management console 
 description: Activating the management console ensures that sensors are registered with Azure and send information to the on-premises management console, and that the on-premises management console carries out management tasks on connected sensors.
 ms.date: 06/06/2022
-ms.topic: how-to
+ms.topic: install-set-up-deploy
 ---
 
 # Activate and set up your on-premises management console
diff --git a/articles/defender-for-iot/organizations/how-to-activate-and-set-up-your-sensor.md b/articles/defender-for-iot/organizations/how-to-activate-and-set-up-your-sensor.md
@@ -2,7 +2,7 @@
 title: Activate and set up your sensor
 description: This article describes how to sign in and activate a sensor console.
 ms.date: 06/06/2022
-ms.topic: how-to
+ms.topic: install-set-up-deploy
 ---
 
 # Activate and set up your sensor
diff --git a/articles/defender-for-iot/organizations/how-to-deploy-certificates.md b/articles/defender-for-iot/organizations/how-to-deploy-certificates.md
@@ -2,7 +2,7 @@
 title: Deploy SSL/TLS certificates on OT appliances - Microsoft Defender for IoT.
 description: Learn how to deploy SSL/TLS certificates on Microsoft Defender for IoT OT network sensors and on-premises management consoles.
 ms.date: 01/05/2023
-ms.topic: how-to
+ms.topic: install-set-up-deploy
 ---
 
 # Deploy SSL/TLS certificates on OT appliances
diff --git a/articles/defender-for-iot/organizations/how-to-manage-the-on-premises-management-console.md b/articles/defender-for-iot/organizations/how-to-manage-the-on-premises-management-console.md
@@ -2,7 +2,7 @@
 title: Manage the on-premises management console 
 description: Learn about on-premises management console options like backup and restore, defining the host name, and setting up a proxy to sensors.
 ms.date: 06/02/2022
-ms.topic: article
+ms.topic: how-to
 ---
 
 # Manage the on-premises management console
diff --git a/articles/defender-for-iot/organizations/how-to-troubleshoot-the-sensor-and-on-premises-management-console.md b/articles/defender-for-iot/organizations/how-to-troubleshoot-the-sensor-and-on-premises-management-console.md
@@ -2,7 +2,7 @@
 title: Troubleshoot the sensor and on-premises management console
 description: Troubleshoot your sensor and on-premises management console to eliminate any problems you might be having.
 ms.date: 06/15/2022
-ms.topic: article
+ms.topic: troubleshooting
 ---
 # Troubleshoot the sensor and on-premises management console
 
diff --git a/articles/defender-for-iot/organizations/integrations/arcsight.md b/articles/defender-for-iot/organizations/integrations/arcsight.md
@@ -1,7 +1,7 @@
 ---
 title: Integrate ArcSight with Microsoft Defender for IoT
 description: Learn how to send Microsoft Defender for IoT alerts to ArcSight.
-ms.topic: how-to
+ms.topic: integration
 ms.date: 08/02/2022
 ---
 
diff --git a/articles/defender-for-iot/organizations/integrations/logrhythm.md b/articles/defender-for-iot/organizations/integrations/logrhythm.md
@@ -1,7 +1,7 @@
 ---
 title: Integrate LogRhythm with Microsoft Defender for IoT
 description: Learn how to send Microsoft Defender for IoT alerts to ALogRhythmrcSight.
-ms.topic: how-to
+ms.topic: integration
 ms.date: 08/02/2022
 ---
 
diff --git a/articles/defender-for-iot/organizations/integrations/netwitness.md b/articles/defender-for-iot/organizations/integrations/netwitness.md
@@ -1,7 +1,7 @@
 ---
 title: Integrate RSA NetWitness with Microsoft Defender for IoT
 description: Learn how to send Microsoft Defender for IoT alerts to RSA NetWitness.
-ms.topic: how-to
+ms.topic: integration
 ms.date: 08/02/2022
 ---
 
diff --git a/articles/defender-for-iot/organizations/integrations/send-cloud-data-to-partners.md b/articles/defender-for-iot/organizations/integrations/send-cloud-data-to-partners.md
@@ -2,7 +2,7 @@
 title: Stream Microsoft Defender for IoT cloud alerts to a partner SIEM - Microsoft Defender for IoT
 description: Learn how to send Microsoft Defender for IoT data on the cloud to a partner SIEM via Microsoft Sentinel and Azure Event Hubs, using Splunk as an example.
 ms.date: 12/26/2022
-ms.topic: how-to
+ms.topic: integration
 ---
 
 # Stream Defender for IoT cloud alerts to a partner SIEM
diff --git a/articles/defender-for-iot/organizations/integrations/service-now-legacy.md b/articles/defender-for-iot/organizations/integrations/service-now-legacy.md
@@ -1,7 +1,7 @@
 ---
 title: Microsoft Defender for IoT integration with ServiceNow (legacy)
 description: In this tutorial, learn how to integrate the legacy ServiceNow integration with Microsoft Defender for IoT.
-ms.topic: tutorial
+ms.topic: reference
 ms.date: 08/11/2022
 ---
 
diff --git a/articles/defender-for-iot/organizations/manage-users-overview.md b/articles/defender-for-iot/organizations/manage-users-overview.md
@@ -2,7 +2,7 @@
 title: User management for Microsoft Defender for IoT
 description: Learn about the different options for user and user role management for Microsoft Defender for IoT.
 ms.date: 11/13/2022
-ms.topic: conceptual
+ms.topic: overview
 ---
 
 # Microsoft Defender for IoT user management
diff --git a/articles/defender-for-iot/organizations/onboard-sensors.md b/articles/defender-for-iot/organizations/onboard-sensors.md
@@ -2,7 +2,7 @@
 title: Onboard sensors to Defender for IoT in the Azure portal
 description: Learn how to onboard sensors to Defender for IoT in the Azure portal.
 ms.date: 06/02/2022
-ms.topic: how-to
+ms.topic: install-set-up-deploy
 ---
 
 # Onboard OT sensors to Defender for IoT
diff --git a/articles/defender-for-iot/organizations/ot-appliance-sizing.md b/articles/defender-for-iot/organizations/ot-appliance-sizing.md
@@ -2,7 +2,7 @@
 title: Which OT appliances do I need? - Microsoft Defender for IoT
 description: Learn about the deployment options for Microsoft Defender for IoT sensors and on-premises management consoles.
 ms.date: 04/04/2022
-ms.topic: conceptual
+ms.topic: limits-and-quotas
 ---
 
 # Which appliances do I need?
diff --git a/articles/defender-for-iot/organizations/ot-deploy/install-software-on-premises-management-console.md b/articles/defender-for-iot/organizations/ot-deploy/install-software-on-premises-management-console.md
@@ -2,7 +2,7 @@
 title: Install Microsoft Defender for IoT on-premises management console software - Microsoft Defender for IoT
 description: Learn how to install Microsoft Defender for IoT on-premises management console software. Use this article if you're reinstalling software on a pre-configured appliance, or if you've chosen to install software on your own appliances.
 ms.date: 12/13/2022
-ms.topic: how-to
+ms.topic: install-set-up-deploy
 ---
 
 # Install Microsoft Defender for IoT on-premises management console software
diff --git a/articles/defender-for-iot/organizations/ot-deploy/install-software-ot-sensor.md b/articles/defender-for-iot/organizations/ot-deploy/install-software-ot-sensor.md
@@ -2,7 +2,7 @@
 title: Install OT network monitoring software on OT sensors - Microsoft Defender for IoT
 description: Learn how to install agentless monitoring software for an OT sensor for Microsoft Defender for IoT. Use this article when reinstalling software on a pre-configured appliance, or if you've chosen to install software on your own appliances.
 ms.date: 12/13/2022
-ms.topic: how-to
+ms.topic: install-set-up-deploy
 ---
 
 # Install OT monitoring software on OT sensors
diff --git a/articles/defender-for-iot/organizations/ot-deploy/post-install-validation-ot-software.md b/articles/defender-for-iot/organizations/ot-deploy/post-install-validation-ot-software.md
@@ -2,7 +2,7 @@
 title: Post-installation validation of OT network monitoring software - Microsoft Defender for IoT
 description: Learn how to test your system post installation of OT network monitoring software for Microsoft Defender for IoT. Use this article after you've reinstalled software on a pre-configured appliance, or if you've chosen to install software on your own appliances.
 ms.date: 12/13/2022
-ms.topic: how-to
+ms.topic: install-set-up-deploy
 ---
 
 # Post-installation validation of OT network monitoring software
diff --git a/articles/defender-for-iot/organizations/ot-pre-configured-appliances.md b/articles/defender-for-iot/organizations/ot-pre-configured-appliances.md
@@ -2,7 +2,7 @@
 title: Preconfigured appliances for OT network monitoring
 description: Learn about the appliances available for use with Microsoft Defender for IoT OT sensors and on-premises management consoles.
 ms.date: 07/11/2022
-ms.topic: conceptual
+ms.topic: limits-and-quotas
 ---
 
 # Pre-configured physical appliances for OT monitoring
diff --git a/articles/defender-for-iot/organizations/ot-virtual-appliances.md b/articles/defender-for-iot/organizations/ot-virtual-appliances.md
@@ -2,7 +2,7 @@
 title: OT monitoring with virtual appliances - Microsoft Defender for IoT
 description: Learn about system requirements for virtual appliances used for the Microsoft Defender for IoT OT sensors and on-premises management console.
 ms.date: 05/03/2022
-ms.topic: conceptual
+ms.topic: limits-and-quotas
 ---
 
 # OT monitoring with virtual appliances
diff --git a/articles/defender-for-iot/organizations/pre-deployment-checklist.md b/articles/defender-for-iot/organizations/pre-deployment-checklist.md
@@ -2,7 +2,7 @@
 title: OT network pre-deployment checklist
 description: Use this checklist as a worksheet to ensure that your OT network is ready for a Microsoft Defender for IoT deployment.
 ms.date: 02/22/2022
-ms.topic: reference
+ms.topic: checklist
 ---
 
 
diff --git a/articles/defender-for-iot/organizations/references-work-with-defender-for-iot-cli-commands.md b/articles/defender-for-iot/organizations/references-work-with-defender-for-iot-cli-commands.md
@@ -2,7 +2,7 @@
 title: CLI command users and access for OT monitoring - Microsoft Defender for IoT
 description: Learn about the users supported for the Microsoft Defender for IoT CLI commands and how to access the CLI.
 ms.date: 01/01/2023
-ms.topic: conceptual
+ms.topic: concept-article
 ---
 
 # Defender for IoT CLI users and access
diff --git a/articles/defender-for-iot/organizations/release-notes-archive.md b/articles/defender-for-iot/organizations/release-notes-archive.md
@@ -1,7 +1,7 @@
 ---
 title: What's new archive for Microsoft Defender for IoT for organizations
 description: Learn about the features and enhancements released for Microsoft Defender for IoT for organizations more than 6 months ago.
-ms.topic: overview
+ms.topic: concept-article
 ms.date: 08/07/2022
 ---
 
diff --git a/articles/defender-for-iot/organizations/release-notes-sentinel.md b/articles/defender-for-iot/organizations/release-notes-sentinel.md
@@ -2,7 +2,7 @@
 title: Microsoft Defender for IoT solution versions in Microsoft Sentinel
 description: Learn about the updates available in each version of the Microsoft Defender for IoT solution, available from the Microsoft Sentinel content hub.
 ms.date: 09/22/2022
-ms.topic: overview
+ms.topic: release-notes
 ---
 
 # Microsoft Defender for IoT solution versions in Microsoft Sentinel
diff --git a/articles/defender-for-iot/organizations/release-notes.md b/articles/defender-for-iot/organizations/release-notes.md
@@ -1,7 +1,7 @@
 ---
 title: OT monitoring software versions - Microsoft Defender for IoT
 description: This article lists Microsoft Defender for IoT on-premises OT monitoring software versions, including release and support dates and highlights for new features.
-ms.topic: overview
+ms.topic: release-notes
 ms.date: 1/02/2023
 ---
 
diff --git a/articles/defender-for-iot/organizations/roles-azure.md b/articles/defender-for-iot/organizations/roles-azure.md
diff --git a/articles/defender-for-iot/organizations/roles-on-premises.md b/articles/defender-for-iot/organizations/roles-on-premises.md
diff --git a/articles/defender-for-iot/organizations/track-user-activity.md b/articles/defender-for-iot/organizations/track-user-activity.md
diff --git a/articles/defender-for-iot/organizations/update-ot-software.md b/articles/defender-for-iot/organizations/update-ot-software.md
diff --git a/articles/defender-for-iot/organizations/whats-new.md b/articles/defender-for-iot/organizations/whats-new.md
diff --git a/articles/hdinsight/hdinsight-troubleshoot-yarn.md b/articles/hdinsight/hdinsight-troubleshoot-yarn.md
diff --git a/articles/iot-central/core/concepts-device-implementation.md b/articles/iot-central/core/concepts-device-implementation.md
diff --git a/articles/key-vault/general/monitor-key-vault.md b/articles/key-vault/general/monitor-key-vault.md
