Skip to content

Commit 007c69e

Browse files
authored
Merge pull request #208771 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 a7ae2c6 + d6991a3 commit 007c69e

18 files changed

+73
-71
lines changed

articles/active-directory/privileged-identity-management/azure-pim-resource-rbac.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ You may have a compliance requirement where you must provide a complete list of
5555

5656
1. Select the resource you want to export role assignments for, such as a subscription.
5757

58-
1. Select **Members**.
58+
1. Select **Assignments**.
5959

6060
1. Select **Export** to open the Export membership pane.
6161

articles/azure-cache-for-redis/cache-private-link.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,9 @@ To create a private endpoint, follow these steps.
187187
1. In the **Resource** tab, select your subscription, choose the resource type as `Microsoft.Cache/Redis`, and then select the cache you want to connect the private endpoint to.
188188

189189
1. Select the **Next: Configuration** button at the bottom of the page.
190-
190+
1. Select the **Next: Virtual Network** button at the bottom of the page.
191191
1. In the **Configuration** tab, select the virtual network and subnet you created in the previous section.
192-
192+
1. In the **Virtual Network** tab, select the virtual network and subnet you created in the previous section.
193193
1. Select the **Next: Tags** button at the bottom of the page.
194194

195195
1. Optionally, in the **Tags** tab, enter the name and value if you wish to categorize the resource.
@@ -403,4 +403,4 @@ It's only linked to your VNet. Because it's not in your VNet, NSG rules don't ne
403403
## Next steps
404404

405405
- To learn more about Azure Private Link, see the [Azure Private Link documentation](../private-link/private-link-overview.md).
406-
- To compare various network isolation options for your cache, see [Azure Cache for Redis network isolation options documentation](cache-network-isolation.md).
406+
- To compare various network isolation options for your cache, see [Azure Cache for Redis network isolation options documentation](cache-network-isolation.md).

articles/event-hubs/authenticate-application.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ For Schema Registry built-in roles, see [Schema Registry roles](schema-registry-
3030
## Authenticate from an application
3131
A key advantage of using Azure AD with Event Hubs is that your credentials no longer need to be stored in your code. Instead, you can request an OAuth 2.0 access token from Microsoft identity platform. Azure AD authenticates the security principal (a user, a group, or service principal) running the application. If authentication succeeds, Azure AD returns the access token to the application, and the application can then use the access token to authorize requests to Azure Event Hubs.
3232

33-
Following sections shows you how to configure your native application or web application for authentication with Microsoft identity platform 2.0. For more information about Microsoft identity platform 2.0, see [Microsoft identity platform (v2.0) overview](../active-directory/develop/v2-overview.md).
33+
The following sections show you how to configure your native application or web application for authentication with Microsoft identity platform 2.0. For more information about Microsoft identity platform 2.0, see [Microsoft identity platform (v2.0) overview](../active-directory/develop/v2-overview.md).
3434

3535
For an overview of the OAuth 2.0 code grant flow, see [Authorize access to Azure Active Directory web applications using the OAuth 2.0 code grant flow](../active-directory/develop/v2-oauth2-auth-code-flow.md).
3636

articles/event-hubs/event-hubs-scalability.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ There are two factors which influence scaling with Event Hubs.
1313

1414
## Throughput units
1515

16-
The throughput capacity of Event Hubs is controlled by *throughput units*. Throughput units are pre-purchased units of capacity. A single throughput lets you:
16+
The throughput capacity of Event Hubs is controlled by *throughput units*. Throughput units are pre-purchased units of capacity. A single throughput unit lets you:
1717

1818
* Ingress: Up to 1 MB per second or 1000 events per second (whichever comes first).
1919
* Egress: Up to 2 MB per second or 4096 events per second.
@@ -33,11 +33,11 @@ For more information about the auto-inflate feature, see [Automatically scale th
3333

3434
## Processing units
3535

36-
[Event Hubs Premium](./event-hubs-premium-overview.md) provides superior performance and better isolation within a managed multitenant PaaS environment. The resources in a Premium tier are isolated at the CPU and memory level so that each tenant workload runs in isolation. This resource container is called a *Processing Unit*(PU). You can purchase 1, 2, 4, 8 or 16 processing Units for each Event Hubs Premium namespace.
36+
[Event Hubs Premium](./event-hubs-premium-overview.md) provides superior performance and better isolation within a managed multitenant PaaS environment. The resources in a Premium tier are isolated at the CPU and memory level so that each tenant workload runs in isolation. This resource container is called a *Processing Unit* (PU). You can purchase 1, 2, 4, 8 or 16 processing Units for each Event Hubs Premium namespace.
3737

3838
How much you can ingest and stream with a processing unit depends on various factors such as your producers, consumers, the rate at which you're ingesting and processing, and much more.
3939

40-
For example, Event Hubs Premium namespace with 1 PU and 1 event hub(100 partitions) can approximately offer core capacity of ~5-10 MB/s ingress and 10-20 MB/s egress for both AMQP or Kafka workloads.
40+
For example, Event Hubs Premium namespace with 1 PU and 1 event hub (100 partitions) can approximately offer core capacity of ~5-10 MB/s ingress and 10-20 MB/s egress for both AMQP or Kafka workloads.
4141

4242
To learn about configuring PUs for a premium tier namespace, see [Configure processing units](configure-processing-units-premium-namespace.md).
4343

articles/event-hubs/includes/event-hubs-partition-count.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ ms.custom: "include file"
1111

1212
---
1313

14-
As [partition](../event-hubs-features.md#partitions) is a data organization mechanism that allows you to publish and consume data in a parallel manner, we recommend that you balance scaling units(TUs, PUs or CUs) and partitions to achieve optimal scale. In general we recommend users to maintain a maximum throughput of 1 MB/s per partition and choose the partition count to match the maximum throughput you want to handle. For example, if your use case requires 20 MB/s, it is recommended to choose at least 20 partitions to achieve the optimal throughput.
14+
As [partition](../event-hubs-features.md#partitions) is a data organization mechanism that allows you to publish and consume data in a parallel manner, we recommend that you balance scaling units (TUs, PUs or CUs) and partitions to achieve optimal scale. In general we recommend users to maintain a maximum throughput of 1 MB/s per partition and choose the partition count to match the maximum throughput you want to handle. For example, if your use case requires 20 MB/s, it is recommended to choose at least 20 partitions to achieve the optimal throughput.
1515

16-
However, if you have a model in which your application has an affinity to a particular partition, increasing the number of partitions may not be of any benefit to you. For more information, see [availability and consistency](../event-hubs-availability-and-consistency.md).
16+
However, if you have a model in which your application has an affinity to a particular partition, increasing the number of partitions may not be of any benefit to you. For more information, see [availability and consistency](../event-hubs-availability-and-consistency.md).

articles/private-link/private-endpoint-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ A private-link resource is the destination target of a specified private endpoin
8383
| Azure Device Provisioning Service | Microsoft.Devices/provisioningServices | iotDps |
8484
| Azure IoT Hub | Microsoft.Devices/IotHubs | iotHub |
8585
| Azure IoT Central | Microsoft.IoTCentral/IoTApps | IoTApps |
86-
| Azure Digital Twins | Microsoft.DigitalTwins/digitalTwinsInstances | digitaltwinsinstance |
86+
| Azure Digital Twins | Microsoft.DigitalTwins/digitalTwinsInstances | API |
8787
| Azure Event Grid | Microsoft.EventGrid/domains | domain |
8888
| Azure Event Grid | Microsoft.EventGrid/topics | topic |
8989
| Azure Event Hub | Microsoft.EventHub/namespaces | namespace |
@@ -216,4 +216,4 @@ The following table shows an example of a dual port NSG rule:
216216
## Next steps
217217

218218
- For more information about private endpoints and Private Link, see [What is Azure Private Link?](private-link-overview.md).
219-
- To get started with creating a private endpoint for a web app, see [Quickstart: Create a private endpoint by using the Azure portal](create-private-endpoint-portal.md).
219+
- To get started with creating a private endpoint for a web app, see [Quickstart: Create a private endpoint by using the Azure portal](create-private-endpoint-portal.md).

articles/site-recovery/avs-tutorial-dr-drill-azure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Complete the previous tutorials:
3939

4040
## Verify VM properties
4141

42-
Before you run a test failover, verify the VM properties, and make sure that the [VMware VM](vmware-physical-azure-support-matrix.md#replicated-machines) complies with Azure requirements.
42+
Before you run a test failover, verify the VM properties, and make sure that the [VMware vSphere VM](vmware-physical-azure-support-matrix.md#replicated-machines) complies with Azure requirements.
4343

4444
1. In **Protected Items**, click **Replicated Items** > and the VM.
4545
2. In the **Replicated item** pane, there's a summary of VM information, health status, and the

articles/site-recovery/avs-tutorial-failover.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ Verify properties as follows:
7474

7575
In some scenarios, failover requires additional processing that takes around 8 to 10 minutes to complete. You might notice longer test failover times for:
7676

77-
* VMware VMs running a Mobility service version older than 9.8.
78-
* VMware Linux VMs.
79-
* VMware VMs that don't have the DHCP service enabled.
80-
* VMware VMs that don't have the following boot drivers: storvsc, vmbus, storflt, intelide, atapi.
77+
* VMware vSphere VMs running a Mobility service version older than 9.8.
78+
* VMware vSphere Linux VMs.
79+
* VMware vSphere VMs that don't have the DHCP service enabled.
80+
* VMware vSphere VMs that don't have the following boot drivers: storvsc, vmbus, storflt, intelide, atapi.
8181

8282
> [!WARNING]
8383
> Don't cancel a failover in progress. Before failover is started, VM replication is stopped. If you cancel a failover in progress, failover stops, but the VM won't replicate again.

articles/site-recovery/avs-tutorial-prepare-avs.md

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ This is the second tutorial in a series that shows you how to set up disaster re
2020
In this article, you learn how to:
2121

2222
> [!div class="checklist"]
23-
> * Prepare an account on the vCenter server or vSphere ESXi host, to automate VM discovery.
24-
> * Prepare an account for automatic installation of the Mobility service on VMware VMs.
25-
> * Review VMware server and VM requirements and support.
23+
> * Prepare an account on the vCenter Server to automate VM discovery.
24+
> * Prepare an account for automatic installation of the Mobility service on VMware vSphere VMs.
25+
> * Review VMware vCenter Server and VM requirements and support.
2626
> * Prepare to connect to Azure VMs after failover.
2727
2828
> [!NOTE]
@@ -42,10 +42,10 @@ Site Recovery needs access to Azure VMware Solution servers to:
4242

4343
Create the account as follows:
4444

45-
1. To use a dedicated account, create a role at the vCenter level. Give the role a name such as
45+
1. To use a dedicated account, create a role at the vCenter Server level. Give the role a name such as
4646
**Azure_Site_Recovery**.
4747
2. Assign the role the permissions summarized in the table below.
48-
3. Create a user on the vCenter server or vSphere host. Assign the role to the user.
48+
3. Create a user on the vCenter Server. Assign the role to the user.
4949

5050
### VMware account permissions
5151

@@ -56,28 +56,27 @@ Create the account as follows:
5656

5757
## Prepare an account for Mobility service installation
5858

59-
The Mobility service must be installed on machines you want to replicate. Site Recovery can do a push installation of this service when you enable replication for a machine, or you can install it manually, or using installation tools.
59+
The Mobility service must be installed on machines you want to replicate. Azure Site Recovery can do a push installation of this service when you enable replication for a machine, or you can install it manually, or using installation tools.
6060

6161
- In this tutorial, we're going to install the Mobility service with the push installation.
62-
- For this push installation, you need to prepare an account that Site Recovery can use to access the VM. You specify this account
62+
- For this push installation, you need to prepare an account that Azure Site Recovery can use to access the VM. You specify this account
6363
when you set up disaster recovery in the Azure console.
6464

6565
Prepare the account as follows:
6666

67-
Prepare a domain or local account with permissions to install on the VM.
68-
67+
- Prepare a domain or local account with permissions to install on the VM.
6968
- **Windows VMs**: To install on Windows VMs if you're not using a domain account, disable Remote User Access
7069
control on the local machine. To do this, in the registry > **HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System**, add the
7170
DWORD entry **LocalAccountTokenFilterPolicy**, with a value of 1.
7271
- **Linux VMs**: To install on Linux VMs, prepare a root account on the source Linux server.
7372

7473

75-
## Check VMware requirements
74+
## Check Azure VMware Solution requirements
7675

77-
Make sure VMware servers and VMs comply with requirements.
76+
Make sure VMware vCenter Server and VMs comply with requirements.
7877

79-
1. Verify Azure VMware solution [software versions](../azure-vmware/concepts-private-clouds-clusters.md#vmware-software-versions).
80-
2. Verify [VMware server requirements](vmware-physical-azure-support-matrix.md#on-premises-virtualization-servers).
78+
1. Verify Azure VMware Solution [software versions](../azure-vmware/concepts-private-clouds-clusters.md#vmware-software-versions).
79+
2. Verify [VMware vCenter Server requirements](vmware-physical-azure-support-matrix.md#on-premises-virtualization-servers).
8180
3. For Linux VMs, [check](vmware-physical-azure-support-matrix.md#linux-file-systemsguest-storage) file system and storage requirements.
8281
4. Check [network](vmware-physical-azure-support-matrix.md#network) and [storage](vmware-physical-azure-support-matrix.md#storage) support.
8382
5. Check what's supported for [Azure networking](vmware-physical-azure-support-matrix.md#azure-vm-network-after-failover), [storage](vmware-physical-azure-support-matrix.md#azure-storage), and [compute](vmware-physical-azure-support-matrix.md#azure-compute), after failover.

0 commit comments

Comments
 (0)