Skip to content

Commit 9afb389

Browse files
authored
Merge pull request #279489 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents c768ac1 + 75f494c commit 9afb389

File tree

5 files changed

+17
-18
lines changed

5 files changed

+17
-18
lines changed

articles/azure-arc/servers/arc-gateway.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ There are six main steps to use the feature:
8282

8383
1. Execute the following command to add the connectedmachine extension:
8484

85-
`az extension add --allow-limited preview true --yes --source [whl file path]`
85+
`az extension add --allow-preview true --source [whl file path]`
8686

8787
### Step 2: Create an Arc gateway resource
8888

articles/azure-monitor/app/opentelemetry-nodejs-migrate.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,14 @@ This guide provides two options to upgrade from the Azure Monitor Application In
4040
Remove all Application Insights instrumentation from your code. Delete any sections where the Application Insights client is initialized, modified, or called.
4141

4242
4. Enable Application Insights with the Azure Monitor OpenTelemetry Distro.
43-
43+
> [!IMPORTANT]
44+
> *Before* you import anything else, `useAzureMonitor` must be called. There might be telemetry loss if other libraries are imported first.
4445
Follow [getting started](opentelemetry-enable.md?tabs=nodejs) to onboard to the Azure Monitor OpenTelemetry Distro.
4546

4647
#### Azure Monitor OpenTelemetry Distro changes and limitations
4748

48-
The APIs from the Application Insights SDK 2.X aren't available in the Azure Monitor OpenTelemetry Distro. You can access these APIs through a nonbreaking upgrade path in the Application Insights SDK 3.X.
49+
* The APIs from the Application Insights SDK 2.X aren't available in the Azure Monitor OpenTelemetry Distro. You can access these APIs through a nonbreaking upgrade path in the Application Insights SDK 3.X.
50+
* Filtering dependencies, logs, and exceptions by operation name is not yet supported.
4951
5052
## [Upgrade](#tab/upgrade)
5153

articles/managed-grafana/how-to-connect-to-data-source-privately.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Managed private endpoints work with Azure services that support private link. Us
3434
- Azure SQL server
3535
- Private link services
3636
- Azure Databricks
37-
- Azure Database for PostgreSQL flexible servers
37+
- Azure Database for PostgreSQL flexible servers ([Only for servers that have public access networking](/azure/postgresql/flexible-server/concepts-networking-private-link))
3838

3939
## Prerequisites
4040

articles/storage/blobs/object-replication-overview.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ Object replication requires that blob versioning is enabled on both the source a
5858

5959
If your storage account has object replication policies in effect, you cannot disable blob versioning for that account. You must delete any object replication policies on the account before disabling blob versioning.
6060

61+
> [!NOTE]
62+
> Only blobs are copied to the destination. A blob's version ID is not copied. The blob that is placed at the destination location is assigned a new version ID.
63+
6164
### Deleting a blob in the source account
6265

6366
When a blob in the source account is deleted, the current version of the blob becomes a previous version, and there's no longer a current version. All existing previous versions of the blob are preserved. This state is replicated to the destination account. For more information about how to delete operations affect blob versions, see [Versioning on delete operations](versioning-overview.md#versioning-on-delete-operations).

articles/virtual-desktop/azure-stack-hci-overview.md

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
---
2-
title: Azure Virtual Desktop with Azure Stack HCI
2+
title: Azure Virtual Desktop for Azure Stack HCI
33
description: Learn about using Azure Virtual Desktop with Azure Stack HCI, enablng you to deploy session hosts where you need them.
44
ms.topic: conceptual
55
author: dknappettmsft
66
ms.author: daknappe
77
ms.date: 04/11/2024
88
---
99

10-
# Azure Virtual Desktop with Azure Stack HCI
10+
# Azure Virtual Desktop for Azure Stack HCI
1111

1212
> [!IMPORTANT]
13-
> Azure Virtual Desktop with Azure Stack HCI is currently in preview for Azure Government and Azure China. See the [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/) for legal terms that apply to Azure features that are in beta, preview, or otherwise not yet released into general availability.
13+
> Azure Virtual Desktop for Azure Stack HCI is currently in preview for Azure Government and Azure China. See the [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/) for legal terms that apply to Azure features that are in beta, preview, or otherwise not yet released into general availability.
1414
15-
Using Azure Virtual Desktop with Azure Stack HCI, you can deploy session hosts for Azure Virtual Desktop where you need them. If you already have an existing on-premises virtual desktop infrastructure (VDI) deployment, Azure Virtual Desktop with Azure Stack HCI can improve your experience. If you're already using Azure Virtual Desktop with your session hosts in Azure, you can extend your deployment to your on-premises infrastructure to better meet your performance or data locality needs.
15+
Using Azure Virtual Desktop for Azure Stack HCI, you can deploy session hosts for Azure Virtual Desktop where you need them. If you already have an existing on-premises virtual desktop infrastructure (VDI) deployment, Azure Virtual Desktop with Azure Stack HCI can improve your experience. If you're already using Azure Virtual Desktop with your session hosts in Azure, you can extend your deployment to your on-premises infrastructure to better meet your performance or data locality needs.
1616

1717
Azure Virtual Desktop service components, such as host pools, workspaces, and application groups are all deployed in Azure, but you can choose to deploy session hosts on Azure Stack HCI. As Azure Virtual Desktop with Azure Stack HCI isn't an Azure Arc-enabled service, it's not supported as a standalone service outside of Azure, in a multicloud environment, or on other Azure Arc-enabled servers.
1818

1919
## Benefits
2020

21-
Using Azure Virtual Desktop with Azure Stack HCI, you can:
21+
Using Azure Virtual Desktop for Azure Stack HCI, you can:
2222

2323
- Improve performance for Azure Virtual Desktop users in areas with poor connectivity to the Azure public cloud by giving them session hosts closer to their location.
2424

@@ -57,13 +57,13 @@ Finally, users can connect using the same [Remote Desktop clients](users/remote-
5757

5858
## Licensing and pricing
5959

60-
To run Azure Virtual Desktop with Azure Stack HCI, you need to make sure you're licensed correctly and be aware of the pricing model. There are three components that affect how much it costs to run Azure Virtual Desktop with Azure Stack HCI:
60+
To run Azure Virtual Desktop for Azure Stack HCI, you need to make sure you're licensed correctly and be aware of the pricing model. There are three components that affect how much it costs to run Azure Virtual Desktop with Azure Stack HCI:
6161

62-
- **User access rights.** The same licenses that grant access to Azure Virtual Desktop on Azure also apply to Azure Virtual Desktop with Azure Stack HCI. Learn more at [Azure Virtual Desktop pricing](https://azure.microsoft.com/pricing/details/virtual-desktop/).
62+
- **User access rights.** The same licenses that grant access to Azure Virtual Desktop on Azure also apply to Azure Virtual Desktop for Azure Stack HCI. Learn more at [Azure Virtual Desktop pricing](https://azure.microsoft.com/pricing/details/virtual-desktop/).
6363

6464
- **Azure Stack HCI service fee.** Learn more at [Azure Stack HCI pricing](https://azure.microsoft.com/pricing/details/azure-stack/hci/).
6565

66-
- **Azure Virtual Desktop on Azure Stack HCI service fee.** This fee requires you to pay for each active virtual CPU (vCPU) for your Azure Virtual Desktop session hosts running on Azure Stack HCI. Learn more at [Azure Virtual Desktop pricing](https://azure.microsoft.com/pricing/details/virtual-desktop/).
66+
- **Azure Virtual Desktop for Azure Stack HCI service fee.** This fee requires you to pay for each active virtual CPU (vCPU) for your Azure Virtual Desktop session hosts running on Azure Stack HCI. Learn more at [Azure Virtual Desktop pricing](https://azure.microsoft.com/pricing/details/virtual-desktop/).
6767

6868
## Data storage
6969

@@ -73,12 +73,6 @@ There are different classifications of data for Azure Virtual Desktop, such as c
7373

7474
Azure Virtual Desktop with Azure Stack HCI has the following limitations:
7575

76-
- You can't use some Azure Virtual Desktop features when session hosts running on Azure Stack HCI, such as:
77-
78-
- [Azure Virtual Desktop Insights](insights.md)
79-
- [Session host scaling with Azure Automation](set-up-scaling-script.md)
80-
- [Per-user access pricing](licensing.md)
81-
8276
- Each host pool must only contain session hosts on Azure or on Azure Stack HCI. You can't mix session hosts on Azure and on Azure Stack HCI in the same host pool.
8377

8478
- Azure Stack HCI supports many types of hardware and on-premises networking capabilities, so performance and user density might vary compared to session hosts running on Azure. Azure Virtual Desktop's [virtual machine sizing guidelines](/windows-server/remote/remote-desktop-services/virtual-machine-recs) are broad, so you should use them for initial performance estimates and monitor after deployment.

0 commit comments

Comments
 (0)