Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-rbac-constrained-delegation-edit-conditions

rolyon · rolyon · commit 86285cf5ecbb · 2024-04-15T12:52:07.000-07:00
diff --git a/articles/communication-services/concepts/call-automation/azure-communication-services-azure-cognitive-services-integration.md b/articles/communication-services/concepts/call-automation/azure-communication-services-azure-cognitive-services-integration.md
@@ -5,7 +5,7 @@ description: Provides a how-to guide for connecting Azure Communication Services
 author: kunaal
 ms.service: azure-communication-services
 ms.subservice: call-automation
-ms.topic: include
+ms.topic: conceptual
 ms.date: 11/27/2023
 ms.author: kpunjabi
 ms.custom: references_regions
diff --git a/articles/communication-services/concepts/call-automation/call-automation-teams-interop.md b/articles/communication-services/concepts/call-automation/call-automation-teams-interop.md
@@ -6,7 +6,7 @@ author: ovishesh
 
 ms.service: azure-communication-services
 ms.subservice: call-automation
-ms.topic: include
+ms.topic: conceptual
 ms.date: 02/22/2023
 ms.author: visho
 ms.custom: public_preview
diff --git a/articles/communication-services/concepts/call-automation/play-action.md b/articles/communication-services/concepts/call-automation/play-action.md
@@ -4,7 +4,7 @@ titleSuffix: An Azure Communication Services concept document
 description: Conceptual information about playing audio in call using Call Automation.
 author: Kunaal
 ms.service: azure-communication-services
-ms.topic: include
+ms.topic: conceptual
 ms.date: 08/11/2023
 ms.author: kpunjabi
 ---
diff --git a/articles/communication-services/concepts/call-automation/play-ai-action.md b/articles/communication-services/concepts/call-automation/play-ai-action.md
@@ -5,7 +5,7 @@ description: Conceptual information about playing audio in a call using Call Aut
 author: Kunaal
 ms.service: azure-communication-services
 ms.subservice: call-automation
-ms.topic: include
+ms.topic: conceptual
 ms.date: 02/15/2023
 ms.author: kpunjabi
 ms.custom: private_preview
diff --git a/articles/communication-services/concepts/call-automation/recognize-action.md b/articles/communication-services/concepts/call-automation/recognize-action.md
@@ -3,7 +3,7 @@ title: Gathering user input
 description: Conceptual information about using Recognize action to gather user input with Call Automation.
 author: Kunaal
 ms.service: azure-communication-services
-ms.topic: include
+ms.topic: conceptual
 ms.date: 08/09/2023
 ms.author: kpunjabi
 ---
diff --git a/articles/communication-services/concepts/call-automation/recognize-ai-action.md b/articles/communication-services/concepts/call-automation/recognize-ai-action.md
@@ -4,7 +4,7 @@ titleSuffix: An Azure Communication Services concept document
 description: Conceptual information gathering user voice input using Call Automation and Azure AI services
 author: Kunaal
 ms.service: azure-communication-services
-ms.topic: include
+ms.topic: conceptual
 ms.date: 02/15/2023
 ms.author: kpunjabi
 ms.custom: private_preview
diff --git a/articles/communication-services/concepts/interop/enable-closed-captions.md b/articles/communication-services/concepts/interop/enable-closed-captions.md
@@ -5,7 +5,7 @@ description: Conceptual information about closed captions in Teams interop scena
 author: Kunaal
 ms.service: azure-communication-services
 ms.subservice: calling
-ms.topic: include
+ms.topic: conceptual
 ms.date: 03/22/2023
 ms.author: kpunjabi
 ms.custom: public_preview
diff --git a/articles/communication-services/concepts/voice-video-calling/known-issues-native.md b/articles/communication-services/concepts/voice-video-calling/known-issues-native.md
@@ -7,7 +7,7 @@ services: azure-communication-services
 
 ms.author: micahvivion
 ms.date: 03/20/2024
-ms.topic: include
+ms.topic: release-notes
 ms.service: azure-communication-services
 ---
 
diff --git a/articles/communication-services/concepts/voice-video-calling/media-streaming.md b/articles/communication-services/concepts/voice-video-calling/media-streaming.md
@@ -4,7 +4,7 @@ titleSuffix: An Azure Communication Services concept document
 description: Conceptual information about using Media Streaming APIs with Call Automation.
 author: Kunaal
 ms.service: azure-communication-services
-ms.topic: include
+ms.topic: overview
 ms.date: 10/25/2022
 ms.author: kpunjabi
 ms.custom: private_preview
diff --git a/articles/defender-for-iot/organizations/TOC.yml b/articles/defender-for-iot/organizations/TOC.yml
@@ -382,7 +382,7 @@
         items:
         - name: OT sensor (VMware ESXi) 
           href: appliance-catalog/virtual-sensor-vmware.md
-        - name: OT sensor (Hyper-V)
+        - name: OT sensor (Hyper-V) Gen 2
           href: appliance-catalog/virtual-sensor-hyper-v.md
         - name: On-premises management console (VMware ESXi)
           href: appliance-catalog/virtual-management-vmware.md
diff --git a/articles/defender-for-iot/organizations/appliance-catalog/index.yml b/articles/defender-for-iot/organizations/appliance-catalog/index.yml
@@ -53,7 +53,7 @@ landingContent:
         links:
           - text: OT sensor (VMware ESXi)
             url: virtual-sensor-vmware.md
-          - text: OT sensor (Microsoft Hyper-V)
+          - text: OT sensor (Microsoft Hyper-V) Gen 2
             url: virtual-sensor-hyper-v.md
           - text: On-premises management console (VMware ESXi)
             url: virtual-management-vmware.md
diff --git a/articles/defender-for-iot/organizations/appliance-catalog/virtual-sensor-hyper-v-gen-1.md b/articles/defender-for-iot/organizations/appliance-catalog/virtual-sensor-hyper-v-gen-1.md
@@ -0,0 +1,100 @@
+---
+title: OT sensor VM (Microsoft Hyper-V) Gen 1- Microsoft Defender for IoT
+description: Learn about deploying a Microsoft Defender for IoT OT sensor as a virtual appliance using Microsoft Hyper-V.
+ms.date: 03/27/2024
+ms.topic: reference
+---
+
+# OT network sensor VM (Microsoft Hyper-V) Gen 1
+
+This article describes an OT sensor deployment on a virtual appliance using Microsoft Hyper-V.
+
+| Appliance characteristic |Details |
+|---------|---------|
+|**Hardware profile** |  As required for your organization. For more information, see [Which appliances do I need?](../ot-appliance-sizing.md) |
+|**Performance** |  As required for your organization. For more information, see [Which appliances do I need?](../ot-appliance-sizing.md) |
+|**Physical specifications** | Virtual Machine |
+|**Status** | Supported |
+
+> [!NOTE]
+> We recommend using the 2nd Generation configuration, which offers better performance and increased security, for configuration see [Microsoft Hyper-V Gen 2](virtual-sensor-hyper-v.md).
+> [!IMPORTANT]
+> Versions 22.2.x of the sensor are incompatible with Hyper-V, and are no longer supported. We recommend using the latest version.
+
+## Prerequisites
+
+The on-premises management console supports both VMware and Hyper-V deployment options. Before you begin the installation, make sure you have the following items:
+
+- Microsoft Hyper-V hypervisor (Windows 10 Pro or Enterprise) installed and operational. For more information, see [Introduction to Hyper-V on Windows 10](/virtualization/hyper-v-on-windows/about).
+
+- Available hardware resources for the virtual machine. For more information, see [OT monitoring with virtual appliances](../ot-virtual-appliances.md).
+
+- The OT sensor software [downloaded from Defender for IoT in the Azure portal](../ot-deploy/install-software-ot-sensor.md#download-software-files-from-the-azure-portal).
+
+Make sure the hypervisor is running.
+
+> [!NOTE]
+> There is no need to pre-install an operating system on the VM, the sensor installation includes the operating system image.
+
+## Create the virtual machine
+
+This procedure describes how to create a virtual machine by using Hyper-V.
+
+**To create the virtual machine using Hyper-V**:
+
+1. Create a virtual disk in Hyper-V Manager (Fixed size, as required by the hardware profile).
+
+1. Select **format = VHDX**.
+
+1. Enter the name and location for the VHD.
+
+1. Enter the required size [according to your organization's needs](../ot-appliance-sizing.md) (select Fixed Size disk type).
+
+1. Review the summary, and select **Finish**.
+
+1. On the **Actions** menu, create a new virtual machine.
+
+1. Enter a name for the virtual machine.
+
+1. Select **Generation** and set it to **Generation 1**, and then select **Next**.
+
+1. Specify the memory allocation [according to your organization's needs](../ot-appliance-sizing.md), in standard RAM denomination (for example, 8192, 16384, 32768). Don't enable **Dynamic Memory**.
+
+1. Configure the network adaptor according to your server network topology. Under the "Hardware Acceleration" blade, disable "Virtual Machine Queue" for the monitoring (SPAN) network interface.
+
+1. Connect the VHDX, created previously, to the virtual machine.
+
+1. Review the summary, and select **Finish**.
+
+1. Right-click on the new virtual machine, and select **Settings**.
+
+1. Select **Add Hardware**, and add a new network adapter.
+
+1. Select the virtual switch that connects to the sensor management network.
+
+1. Allocate CPU resources [according to your organization's needs](../ot-appliance-sizing.md).
+
+1. Select **BIOS**, in **Startup order** move **IDE** to the top of the list, select **Apply** and then select **OK**.
+
+1. Connect the management console's ISO image to a virtual DVD drive.
+
+1. Start the virtual machine.
+
+1. On the **Actions** menu, select **Connect** to continue the software installation.
+
+## Software installation
+
+1. To start installing the OT sensor software, open the virtual machine console.
+
+    The VM starts from the ISO image, and the language selection screen will appear.
+
+1. Continue with the [generic procedure for installing sensor software](../how-to-install-software.md).
+
+## Next steps
+
+Continue understanding system requirements for physical or virtual appliances. For more information, see [Which appliances do I need?](../ot-appliance-sizing.md) and [OT monitoring with virtual appliances](../ot-virtual-appliances.md).
+
+Then, use any of the following procedures to continue:
+
+- [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](../legacy-central-management/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
@@ -1,24 +1,21 @@
 ---
-title: OT sensor VM (Microsoft Hyper-V) - Microsoft Defender for IoT
-description: Learn about deploying a Microsoft Defender for IoT OT sensor as a virtual appliance using Microsoft Hyper-V.
-ms.date: 04/24/2022
+title: OT sensor VM (Microsoft Hyper-V) Gen 2 - Microsoft Defender for IoT
+description: Learn about deploying a Microsoft Defender for IoT OT sensor as a virtual appliance using Microsoft Hyper-V 2nd generation.
+ms.date: 03/27/2024
 ms.topic: reference
 ---
 
-# OT network sensor VM (Microsoft Hyper-V)
+# OT network sensor VM (Microsoft Hyper-V) Gen 2
 
 This article describes an OT sensor deployment on a virtual appliance using Microsoft Hyper-V.
 
 | Appliance characteristic |Details |
 |---------|---------|
 |**Hardware profile** |  As required for your organization. For more information, see [Which appliances do I need?](../ot-appliance-sizing.md) |
-|**Performance** | 	 As required for your organization. For more information, see [Which appliances do I need?](../ot-appliance-sizing.md) |
+|**Performance** |  As required for your organization. For more information, see [Which appliances do I need?](../ot-appliance-sizing.md) |
 |**Physical specifications** | Virtual Machine |
 |**Status** | Supported |
 
-> [!IMPORTANT]
-> Versions 22.2.x of the sensor are incompatible with Hyper-V. Until the issue has been resolved, we recommend using versions 22.3.x and above.
-
 ## Prerequisites
 
 The on-premises management console supports both VMware and Hyper-V deployment options. Before you begin the installation, make sure you have the following items:
@@ -56,22 +53,24 @@ This procedure describes how to create a virtual machine by using Hyper-V.
 
 1. Select **Generation** and set it to **Generation 2**, and then select **Next**.
 
-1. Specify the memory allocation [according to your organization's needs](../ot-appliance-sizing.md), in standard RAM denomination (eg. 8192, 16384, 32768). Do not enable **Dynamic Memory**.
+1. Specify the memory allocation [according to your organization's needs](../ot-appliance-sizing.md), in standard RAM denomination (for example, 8192, 16384, 32768). Don't enable **Dynamic Memory**.
 
 1. Configure the network adaptor according to your server network topology. Under the "Hardware Acceleration" blade, disable "Virtual Machine Queue" for the monitoring (SPAN) network interface.
 
-1. Connect the VHDX created previously to the virtual machine.
+1. Connect the VHDX, created previously, to the virtual machine.
 
 1. Review the summary, and select **Finish**.
 
 1. Right-click on the new virtual machine, and select **Settings**.
 
 1. Select **Add Hardware**, and add a new network adapter.
 
-1. Select the virtual switch that will connect to the sensor management network.
+1. Select the virtual switch that connects to the sensor management network.
 
 1. Allocate CPU resources [according to your organization's needs](../ot-appliance-sizing.md).
 
+1. Select **Firmware**, in **Boot order** move **DVD Drive** to the top of the list, select **Apply** and then select **OK**.
+
 1. Connect the management console's ISO image to a virtual DVD drive.
 
 1. Start the virtual machine.
@@ -82,11 +81,12 @@ This procedure describes how to create a virtual machine by using Hyper-V.
 
 1. To start installing the OT sensor software, open the virtual machine console.
 
-    The VM will start from the ISO image, and the language selection screen will appear.
+    The VM starts from the ISO image, and the language selection screen will appear.
 
 1. Continue with the [generic procedure for installing sensor software](../how-to-install-software.md).
 
-
+> [!NOTE]
+> We recommend using the 2nd Generation configuration, which offers better performance and increased security, however to use the 1st Generation configuration, see [Microsoft Hyper-V Gen 1](virtual-sensor-hyper-v-gen-1.md).
 
 ## Next steps
 
diff --git a/articles/postgresql/flexible-server/how-to-connect-with-managed-identity.md b/articles/postgresql/flexible-server/how-to-connect-with-managed-identity.md
@@ -51,6 +51,8 @@ az ad sp list --display-name vm-name --query [*].appId --out tsv
 
 Now, connect as the Microsoft Entra administrator user to your Azure Database for PostgreSQL flexible server database, and run the following SQL statements, replacing `<identity_name>` with the name of the resources for which you created a system-assigned managed identity:
 
+Please note **pgaadauth_create_principal** must be run  on the Postgres database.
+
 ```sql
 select * from pgaadauth_create_principal('<identity_name>', false, false);
 ```
