Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-reliability-retirement-classic-admins

Author: rolyon

articles/databox/data-box-disk-limits.md

@@ -50,7 +50,6 @@ For the latest information on Azure storage service limits and best practices fo
 - If you don't have long paths enabled on the client, and any path and file name in your data copy exceeds 256 characters, the Data Box Split Copy Tool (DataBoxDiskSplitCopy.exe) or the Data Box Disk Validation tool (DataBoxDiskValidation.cmd) will report failures. To avoid this kind of failure, [enable long paths on your Windows client](/windows/win32/fileio/maximum-file-path-limitation?tabs=cmd#enable-long-paths-in-windows-10-version-1607-and-later).
 - To improve performance during data uploads, we recommend that you [enable large file shares on the storage account and increase share capacity to 100 TiB](../../articles/storage/files/storage-how-to-create-file-share.md#enable-large-file-shares-on-an-existing-account). Large file shares are only supported for storage accounts with locally redundant storage (LRS).
 - If there are any errors when uploading data to Azure, an error log is created in the target storage account. The path to this error log is available in the portal when the upload is complete and you can review the log to take corrective action. Don't delete data from the source without verifying the uploaded data.
-- File metadata and NTFS permissions aren't preserved when the data is uploaded to Azure Files. For example, the *Last modified* attribute of the files won't be kept when the data is copied.
 - If you specified managed disks in the order, review the following additional considerations:
 
     - You can only have one managed disk with a given name in a resource group across all the precreated folders and across all the Data Box Disk. This implies that the VHDs uploaded to the precreated folders should have unique names. Make sure that the given name doesn't match an already existing managed disk in a resource group. If VHDs have same names, then only one VHD is converted to managed disk with that name. The other VHDs are uploaded as page blobs into the staging storage account.

articles/managed-grafana/faq.md

@@ -5,37 +5,52 @@ author: maud-lv
 ms.author: malev
 ms.service: managed-grafana
 ms.topic: reference
-ms.date: 07/17/2023
-
+ms.date: 04/05/2024
 ---
 
 # Azure Managed Grafana FAQ
 
 This article answers frequently asked questions about Azure Managed Grafana.
 
-## Do you use open source Grafana for Managed Grafana?
+## Do you use open source Grafana for Azure Managed Grafana?
 
-No. Managed Grafana hosts a commercial version called [Grafana Enterprise](https://grafana.com/products/enterprise/grafana/) that Microsoft is licensing from Grafana Labs. While not all of the Enterprise features are available yet, Managed Grafana continues to add support as these features are fully integrated with Azure.
+No. Azure Managed Grafana hosts a commercial version called [Grafana Enterprise](https://grafana.com/products/enterprise/grafana/) that Microsoft is licensing from Grafana Labs. While not all of the Enterprise features are available yet, Azure Managed Grafana continues to add support as these features are fully integrated with Azure.
 
 > [!NOTE]
-> [Grafana Enterprise plugins](https://grafana.com/grafana/plugins/?enterprise=1&orderBy=weight&direction=asc) aren't included in the base service. They're purchasable as a separately licensed [addon option](./how-to-grafana-enterprise.md) for Managed Grafana.
+> [Grafana Enterprise plugins](https://grafana.com/grafana/plugins/?enterprise=1&orderBy=weight&direction=asc) aren't included in the base service. They're purchasable as a separately licensed [add-on option](./how-to-grafana-enterprise.md) for Azure Managed Grafana.
 
 ## Does Managed Grafana encrypt my data?
 
-Yes. Managed Grafana always encrypts all data at rest and in transit. It supports [encryption at rest](./encryption.md) using Microsoft-managed keys. All network communication is over TLS 1.2. You can further restrict network traffic using a [private link](./how-to-set-up-private-access.md) for connecting to Grafana and [managed private endpoints](./how-to-connect-to-data-source-privately.md) for data sources.
+Yes. Azure Managed Grafana always encrypts all data at rest and in transit. It supports [encryption at rest](./encryption.md) using Microsoft-managed keys. All network communication is over TLS 1.2. You can further restrict network traffic using a [private link](./how-to-set-up-private-access.md) for connecting to Grafana and [managed private endpoints](./how-to-connect-to-data-source-privately.md) for data sources.
 
-## Where do Managed Grafana data reside?
+## Where does the Azure Managed Grafana data reside?
 
-Customer data, including dashboards and data source configuration, created in Managed Grafana are stored in the region where the customer's Managed Grafana workspace is located. This data residency applies to all available regions. Customers may move, copy, or access their data from any location globally.
+Customer data, including dashboards and data source configuration, created in Azure Managed Grafana are stored in the region where the customer's Azure Managed Grafana workspace is located. This data residency applies to all available regions. Customers may move, copy, or access their data from any location globally.
 
-## Does Managed Grafana support Grafana's built-in SAML and LDAP authentications?
+## Does Azure Managed Grafana support Grafana's built-in SAML and LDAP authentications?
 
-No. Managed Grafana uses its implementation for Microsoft Entra authentication.
+No. Azure Managed Grafana uses its implementation for Microsoft Entra authentication.
 
 ## Can I install more plugins?
 
 No. Currently all Grafana plugins are preinstalled. Managed Grafana supports all popular plugins for Azure data sources.
 
+## In terms of pricing, what constitutes an active user in Azure Managed Grafana?
+
+The Azure Managed Grafana [pricing page](https://azure.microsoft.com/pricing/details/managed-grafana/) mentions a price per active user. 
+
+An active user is billed only once for accessing multiple Azure Managed Grafana instances under the same Azure Subscription. 
+
+Charges for active users are prorated during the first and the last calendar month of service usage. For example:
+
+- For an instance running from January 15 at 00:00 to January 25 at 23:59 with 10 users, the charge is for the prorated period they had access to the instance. Pricing is calculated for 10 users for 11 out of 31 days, which equals a charge for 3.54 active users.
+
+- For an instance running from January 15 at 00:00 to March 25 at 23:59:
+
+  - On January 31, the charge is for 10 users prorated for 16 days of January out of 31 days, totaling a charge for 5.16 active users.
+  - On February 28, the full monthly charge applies for 20 users.
+  - Upon deletion on March 25, the charge for March would be prorated for 15 users for 25 days out of 31 days, totaling a charge for 12.09 active users.
+
 ## Next steps
 
 > [!div class="nextstepaction"]

articles/virtual-desktop/includes/include-session-hosts-post-deployment.md

@@ -2,7 +2,7 @@
 author: dknappettmsft
 ms.author: daknappe
 ms.topic: include
-ms.date: 11/15/2023
+ms.date: 04/17/2024
 ---
 
 #### Licensing
@@ -15,6 +15,10 @@ To ensure your session hosts have licenses applied correctly, you'll need to do
 
 - For session hosts on Azure Stack HCI, you must license and activate the virtual machines you use before you use them with Azure Virtual Desktop. For activating Windows 10 and Windows 11 Enterprise multi-session, and Windows Server 2022 Datacenter: Azure Edition, use [Azure verification for VMs](/azure-stack/hci/deploy/azure-verification). For all other OS images (such as Windows 10 and Windows 11 Enterprise, and other editions of Windows Server), you should continue to use existing activation methods. For more information, see [Activate Windows Server VMs on Azure Stack HCI](/azure-stack/hci/manage/vm-activate).
 
+> [!NOTE]
+> To ensure continued functionality with the latest security update, update your VMs on Azure Stack HCI to the latest cumulative update by June 17, 2024. This update is essential for VMs to continue using Azure benefits. For more information, see [Azure verification for VMs](/azure-stack/hci/deploy/azure-verification?tabs=wac#benefits-available-on-azure-stack-hci).
+
+
 <a name='azure-ad-joined-session-hosts'></a>
 
 #### Microsoft Entra joined session hosts

articles/virtual-desktop/prerequisites.md

@@ -5,7 +5,7 @@ ms.topic: overview
 ms.custom: references_regions
 author: dknappettmsft
 ms.author: daknappe
-ms.date: 11/06/2023
+ms.date: 04/17/2024
 ---
 # Prerequisites for Azure Virtual Desktop
 
@@ -188,6 +188,9 @@ If your license entitles you to use Azure Virtual Desktop, you don't need to ins
 
 For session hosts on Azure Stack HCI, you must license and activate the virtual machines you use before you use them with Azure Virtual Desktop. For activating Windows 10 and Windows 11 Enterprise multi-session, and Windows Server 2022 Datacenter: Azure Edition, use [Azure verification for VMs](/azure-stack/hci/deploy/azure-verification). For all other OS images (such as Windows 10 and Windows 11 Enterprise, and other editions of Windows Server), you should continue to use existing activation methods. For more information, see [Activate Windows Server VMs on Azure Stack HCI](/azure-stack/hci/manage/vm-activate).
 
+> [!NOTE]
+> To ensure continued functionality with the latest security update, update your VMs on Azure Stack HCI to the latest cumulative update by June 17, 2024. This update is essential for VMs to continue using Azure benefits. For more information, see [Azure verification for VMs](/azure-stack/hci/deploy/azure-verification?tabs=wac#benefits-available-on-azure-stack-hci).
+
 > [!TIP]
 > To simplify user access rights during initial development and testing, Azure Virtual Desktop supports [Azure Dev/Test pricing](https://azure.microsoft.com/pricing/dev-test/). If you deploy Azure Virtual Desktop in an Azure Dev/Test subscription, end users may connect to that deployment without separate license entitlement in order to perform acceptance tests or provide feedback.