Skip to content

Commit ecc815e

Browse files
authored
Merge pull request #207790 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 34da217 + 87e319d commit ecc815e

File tree

6 files changed

+24
-9
lines changed

6 files changed

+24
-9
lines changed

articles/active-directory/develop/active-directory-certificate-credentials.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ To compute the assertion, you can use one of the many JWT libraries in the langu
3939

4040
Claim type | Value | Description
4141
---------- | ---------- | ----------
42-
`aud` | `https://login.microsoftonline.com/{tenantId}/oauth2/V2.0/token` | The "aud" (audience) claim identifies the recipients that the JWT is intended for (here Azure AD) See [RFC 7519, Section 4.1.3](https://tools.ietf.org/html/rfc7519#section-4.1.3). In this case, that recipient is the login server (login.microsoftonline.com).
42+
`aud` | `https://login.microsoftonline.com/{tenantId}/oauth2/v2.0/token` | The "aud" (audience) claim identifies the recipients that the JWT is intended for (here Azure AD) See [RFC 7519, Section 4.1.3](https://tools.ietf.org/html/rfc7519#section-4.1.3). In this case, that recipient is the login server (login.microsoftonline.com).
4343
`exp` | 1601519414 | The "exp" (expiration time) claim identifies the expiration time on or after which the JWT MUST NOT be accepted for processing. See [RFC 7519, Section 4.1.4](https://tools.ietf.org/html/rfc7519#section-4.1.4). This allows the assertion to be used until then, so keep it short - 5-10 minutes after `nbf` at most. Azure AD does not place restrictions on the `exp` time currently.
4444
`iss` | {ClientID} | The "iss" (issuer) claim identifies the principal that issued the JWT, in this case your client application. Use the GUID application ID.
4545
`jti` | (a Guid) | The "jti" (JWT ID) claim provides a unique identifier for the JWT. The identifier value MUST be assigned in a manner that ensures that there is a negligible probability that the same value will be accidentally assigned to a different data object; if the application uses multiple issuers, collisions MUST be prevented among values produced by different issuers as well. The "jti" value is a case-sensitive string. [RFC 7519, Section 4.1.7](https://tools.ietf.org/html/rfc7519#section-4.1.7)
@@ -61,7 +61,7 @@ The signature is computed by applying the certificate as described in the [JSON
6161
}
6262
.
6363
{
64-
"aud": "https: //login.microsoftonline.com/contoso.onmicrosoft.com/oauth2/V2.0/token",
64+
"aud": "https: //login.microsoftonline.com/contoso.onmicrosoft.com/oauth2/v2.0/token",
6565
"exp": 1484593341,
6666
"iss": "97e0a5b7-d745-40b6-94fe-5f77d35c6e05",
6767
"jti": "22b3bb26-e046-42df-9c96-65dbd72c1c81",

articles/active-directory/enterprise-users/licensing-directory-independence.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ms.collection: M365-identity-device-management
1818

1919
# Understand how multiple Azure Active Directory tenant organizations interact
2020

21-
In Azure Active Directory (Azure AD, part of Microsoft Entra, each Azure AD organization is fully independent: a peer that is logically independent from the other Azure AD organizations that you manage. This independence between organizations includes resource independence, administrative independence, and synchronization independence. There is no parent-child relationship between organizations.
21+
In Azure Active Directory (Azure AD), part of Microsoft Entra, each Azure AD organization is fully independent: a peer that is logically independent from the other Azure AD organizations that you manage. This independence between organizations includes resource independence, administrative independence, and synchronization independence. There is no parent-child relationship between organizations.
2222

2323
## Resource independence
2424

articles/api-management/api-management-howto-aad.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ Now that you've enabled access for users in an Azure AD tenant, you can:
150150

151151
Follow these steps to grant:
152152
* `User.Read` **delegated** permission for Microsoft Graph API.
153-
153+
* `Directory.ReadAll` **application** permission for Microsoft Graph API.
154154
1. Update the first 3 lines of the following Azure CLI script to match your environment and run it.
155155

156156
```azurecli
@@ -160,8 +160,8 @@ Follow these steps to grant:
160160
#Login and Set the Subscription
161161
az login
162162
az account set --subscription $subId
163-
#Assign the following permission: Microsoft Graph Delegated Permission: User.Read
164-
az rest --method PATCH --uri "https://graph.microsoft.com/v1.0/$($tenantId)/applications/$($appObjectID)" --body "{'requiredResourceAccess':[{'resourceAccess': [{'id': 'e1fe6dd8-ba31-4d61-89e7-88639da4683d','type': 'Scope'}],'resourceAppId': '00000003-0000-0000-c000-000000000000'}]}"
163+
#Assign the following permission: Microsoft Graph Delegated Permission: User.Read, Microsoft Graph Application Permission: Directory.ReadAll
164+
az rest --method PATCH --uri "https://graph.microsoft.com/v1.0/$($tenantId)/applications/$($appObjectID)" --body "{'requiredResourceAccess':[{'resourceAccess': [{'id': 'e1fe6dd8-ba31-4d61-89e7-88639da4683d','type': 'Scope'},{'id': '7ab1d382-f21e-4acd-a863-ba3e13f7da61','type': 'Role'}],'resourceAppId': '00000003-0000-0000-c000-000000000000'}]}"
165165
```
166166

167167
1. Sign out and sign back in to the Azure portal.

articles/event-hubs/monitor-event-hubs-reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ See [Monitoring Azure Event Hubs](monitor-event-hubs.md) for details on collecti
1515
1616

1717
## Metrics
18-
This section lists all the automatically collected platform metrics collected for Azure Event Hubs. The resource provider for these metrics is **Microsoft.EventHub/clusters** or **Microsoft.EventHub/clusters**.
18+
This section lists all the automatically collected platform metrics collected for Azure Event Hubs. The resource provider for these metrics is **Microsoft.EventHub/clusters** or **Microsoft.EventHub/namespaces**.
1919

2020
### Request metrics
2121
Counts the number of data and management operations requests.

articles/migrate/tutorial-migrate-vmware-agent.md

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Migrate VMware VMs with agent-based Azure Migrate Server Migration
33
description: Learn how to run an agent-based migration of VMware VMs with Azure Migrate.
4-
author: rahulg1190
4+
author: rahug1190
55
ms.author: rahugup
66
ms.manager: bsiva
77
ms.topic: tutorial
@@ -64,6 +64,13 @@ Assign the Virtual Machine Contributor role to the account, so that you have per
6464
- Write to an Azure managed disk.
6565

6666

67+
### Assign permissions to register the Replication Appliance in Azure AD
68+
69+
If you are following the least privilege principle, assign the **Application Developer** Azure AD role to the user registering the Replication Appliance. Follow the [Assign administrator and non-administrator roles to users with Azure Active Directory](/azure/active-directory/fundamentals/active-directory-users-assign-role-azure-portal) guide to do so.
70+
71+
> [!IMPORTANT]
72+
> If the user registering the Replication Appliance is an Azure AD Global administrator, that user already has the required permissions.
73+
6774
### Set up an Azure network
6875

6976
[Set up an Azure network](../virtual-network/manage-virtual-network.md#create-a-virtual-network). On-premises machines are replicated to Azure managed disks. When you fail over to Azure for migration, Azure VMs are created from these managed disks, and joined to the Azure network you set up.
@@ -197,11 +204,19 @@ Finish setting up and registering the replication appliance.
197204
1. In appliance setup, select **Setup connectivity**.
198205
2. Select the NIC (by default there's only one NIC) that the replication appliance uses for VM discovery, and to do a push installation of the Mobility service on source machines.
199206
3. Select the NIC that the replication appliance uses for connectivity with Azure. Then select **Save**. You cannot change this setting after it's configured.
207+
208+
> [!TIP]
209+
> If for some reason you need to change the NIC selection and you have not clicked the **Finalize configuration** button in step 12, you can do so by clearing your browser cookies and restarting the **Configuration Server Management Wizard**.
210+
200211
4. If the appliance is located behind a proxy server, you need to specify proxy settings.
201212
- Specify the proxy name as **http://ip-address**, or **http://FQDN**. HTTPS proxy servers aren't supported.
202213
5. When prompted for the subscription, resource groups, and vault details, add the details that you noted when you downloaded the appliance template.
203214
6. In **Install third-party software**, accept the license agreement. Select **Download and Install** to install MySQL Server.
204215
7. Select **Install VMware PowerCLI**. Make sure all browser windows are closed before you do this. Then select **Continue**.
216+
217+
> [!NOTE]
218+
> In newer versions of the Replication Appliance the **VMware PowerCLI** installation is not required.
219+
205220
8. In **Validate appliance configuration**, prerequisites are verified before you continue.
206221
9. In **Configure vCenter Server/vSphere ESXi server**, enter the FQDN or IP address of the vCenter server, or vSphere host, where the VMs you want to replicate are located. Enter the port on which the server is listening. Enter a friendly name to be used for the VMware server in the vault.
207222
10. Enter the credentials for the account you [created](#prepare-an-account-to-discover-vms) for VMware discovery. Select **Add** > **Continue**.

articles/synapse-analytics/security/how-to-grant-workspace-managed-identity-permissions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Select that same container or file system to grant the *Storage Blob Data Contri
8282

8383
1. Select **Save** to add the role assignment.
8484

85-
#### Step 9: Verify that the Storage Blob Data Contributor role is assigned to the managed identity
85+
#### Step 4: Verify that the Storage Blob Data Contributor role is assigned to the managed identity
8686

8787
Select **Access Control(IAM)** and then select **Role assignments**.
8888

0 commit comments

Comments
 (0)