Skip to content

Commit c481c34

Browse files
authored
Merge pull request #204911 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 7eb4cb1 + a87cb14 commit c481c34

File tree

9 files changed

+38
-22
lines changed

9 files changed

+38
-22
lines changed

articles/active-directory/cloud-infrastructure-entitlement-management/faqs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ For information about permissions usage reports, see [Generate and download the
107107

108108
## Does Permissions Management integrate with third-party ITSM (Information Technology Service Management) tools?
109109

110-
Permissions Management integrates with ServiceNow.
110+
Integration with ITMS tools, such as ServiceNow, is in the future roadmap.
111111

112112
## How is Permissions Management being deployed?
113113

articles/active-directory/cloud-infrastructure-entitlement-management/onboard-enable-tenant.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ To enable Permissions Management in your organization:
2727

2828
> [!NOTE]
2929
> During public preview, Permissions Management doesn't perform a license check.
30+
> The public preview environment will only be available until October 7th, 2022. You will be no longer be able view or access your configuration and data in the public preview environment after that date.
31+
> Once you complete all the steps and confirm to use Microsoft Entra Permissions Management, access to the public preview environment will be lost. You can take a note of your configuration before you start.
32+
> To start using generally available Microsoft Entra Permissions Management, you must purchase a license or begin a trial. From the public preview console, initiate the workflow by selecting Start.
33+
34+
35+
3036

3137
## How to enable Permissions Management on your Azure AD tenant
3238

articles/active-directory/fundamentals/active-directory-how-to-find-tenant.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ Azure subscriptions have a trust relationship with Azure Active Directory (Azure
2828

2929
1. Select **Properties**.
3030

31-
1. Then, scroll down to the **Tenant ID** field. Your tenant ID will be in the box.
31+
1. Scroll down to the **Tenant ID** field. Your tenant ID will be in the box.
3232

3333
:::image type="content" source="media/active-directory-how-to-find-tenant/portal-tenant-id.png" alt-text="Azure Active Directory - Properties - Tenant ID - Tenant ID field":::
3434

3535
## Find tenant ID with PowerShell
3636

37-
You can also find the tenant programmatically. To find the tenant ID with Azure PowerShell, use the cmdlet `Get-AzTenant`.
37+
To find the tenant ID with Azure PowerShell, use the cmdlet `Get-AzTenant`.
3838

3939
```azurepowershell-interactive
4040
Connect-AzAccount
@@ -45,7 +45,7 @@ For more information, see this Azure PowerShell cmdlet reference for [Get-AzTena
4545

4646

4747
## Find tenant ID with CLI
48-
If you want to use a command-line interface to find the tenant ID, you can do so with [Azure CLI](/cli/azure/install-azure-cli) or [Microsoft 365 CLI](https://pnp.github.io/cli-microsoft365/).
48+
The [Azure CLI](/cli/azure/install-azure-cli) or [Microsoft 365 CLI](https://pnp.github.io/cli-microsoft365/) can be used to find the tenant ID.
4949

5050
For Azure CLI, use one of the commands **az login**, **az account list**, or **az account tenant list** as shown in the following example. Notice the **tenantId** property for each of your subscriptions in the output from each command.
5151

articles/active-directory/fundamentals/active-directory-troubleshooting-support-howto.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ If you are unable to find answers by using self-help resources, you can open an
3434
### How to open a support ticket for Azure AD in the Azure portal
3535

3636
> [!NOTE]
37-
> * For billing or subscription issues, you must use the [Microsoft 365 admin center](https://admin.microsoft.com).
38-
> * If you're using Azure AD B2C, open a support ticket by first switching to an Azure AD tenant that has an Azure subscription associated with it. Typically, this is your employee tenant or the default tenant created for you when you signed up for an Azure subscription. To learn more, see [how an Azure subscription is related to Azure AD](active-directory-how-subscriptions-associated-directory.md).
37+
> If you're using Azure AD B2C, open a support ticket by first switching to an Azure AD tenant that has an Azure subscription associated with it. Typically, this is your employee tenant or the default tenant created for you when you signed up for an Azure subscription. To learn more, see [how an Azure subscription is related to Azure AD](active-directory-how-subscriptions-associated-directory.md).
3938
4039
1. Sign in to [the Azure portal](https://portal.azure.com) and open **Azure Active Directory**.
4140

articles/active-directory/fundamentals/active-directory-users-profile-azure-portal.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ As you'll see, there's more information available in a user's profile than what
5454

5555
>[!Note]
5656
>You must use Windows Server Active Directory to update the identity, contact info, or job info for users whose source of authority is Windows Server Active Directory. After you complete your update, you must wait for the next synchronization cycle to complete before you'll see the changes.
57+
>
58+
> If you're having issues updating a user's Profile picture, please ensure that your Office 365 Exchange Online Enterprise App is Enabled for users to sign-in.
5759
5860
## Next steps
5961
After you've updated your users' profiles, you can perform the following basic processes:

articles/active-directory/governance/entitlement-management-organization.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,9 @@ Only users from configured connected organizations can request access packages t
158158

159159
> [!NOTE]
160160
> As part of rolling out this new feature, all connected organizations created before 09/09/20 were considered **configured**. If you had an access package that allowed users from any organization to sign up, you should review your list of connected organizations that were created before that date to ensure none are miscategorized as **configured**. An admin can update the **State** property as appropriate. For guidance, see [Update a connected organization](#update-a-connected-organization).
161+
> [!NOTE]
162+
> In some cases, a user might request an access package using their personal account having the same domain as the connected organization resulting in a new suggested connected organization. In this case, make sure the user is using their organization account instead and the portal will identify this user coming from the configured connected organization Azure AD tenant.
163+
161164

162165
## Next steps
163166

articles/automation/update-management/remove-vms.md

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,23 @@ Sign in to the [Azure portal](https://portal.azure.com).
1818

1919
## To remove your machines
2020

21-
1. In the Azure portal, launch **Cloud Shell** from the top navigation of the Azure portal. If you are unfamiliar with Azure Cloud Shell, see [Overview of Azure Cloud Shell](../../cloud-shell/overview.md).
21+
### To identify Azure VM
2222

23-
2. Use the following method to identify the UUID of an Azure virtual machine or non-Azure machine that you want to remove from management.
23+
1. In the Azure portal, launch **Cloud Shell** from the top navigation of the Azure portal. If you are unfamiliar with Azure Cloud Shell, see [Overview of Azure Cloud Shell](../../cloud-shell/overview.md).
2424

25-
# [Azure VM](#tab/azure-vm)
25+
2. Use the following method to identify the UUID of an Azure virtual machine that you want to remove from management.
2626

2727
```azurecli
2828
az vm show -g MyResourceGroup -n MyVm -d
2929
```
3030

31-
# [Non-Azure machine](#tab/non-azure-machine)
31+
### To identify Non-Azure machine
32+
33+
1. In the Azure portal, navigate to **Log Analytics workspaces**. Select your workspace from the list.
34+
35+
2. In your Log Analytics workspace, select **Logs** from the left-hand menu.
36+
37+
3. Use the following query to identify the UUID of a non-Azure machine that you want to remove from management.
3238

3339
```kusto
3440
Heartbeat
@@ -37,17 +43,17 @@ Sign in to the [Azure portal](https://portal.azure.com).
3743
| summarize by Computer, VMUUID
3844
```
3945

40-
---
46+
### To remove the identified Azure or Non-Azure machine
4147

42-
3. In the Azure portal, navigate to **Log Analytics workspaces**. Select your workspace from the list.
48+
1. In the Azure portal, navigate to **Log Analytics workspaces**. Select your workspace from the list.
4349

44-
4. In your Log Analytics workspace, select **Computer Groups** from the left-hand menu.
50+
2. In your Log Analytics workspace, select **Computer Groups** from the left-hand menu.
4551

46-
5. From **Computer Groups** in the right-hand pane, the **Saved groups** tab is shown by default.
52+
3. From **Computer Groups** in the right-hand pane, the **Saved groups** tab is shown by default.
4753

48-
6. From the table, click the icon **Run query** to the right of the item **MicrosoftDefaultComputerGroup** with the **Legacy category** value **Updates**.
54+
4. From the table, click the icon **Run query** to the right of the item **MicrosoftDefaultComputerGroup** with the **Legacy category** value **Updates**.
4955

50-
7. In the query editor, review the query and find the UUID for the machine. Remove the UUID for the machine and repeat the steps for any other machines you want to remove.
56+
5. In the query editor, review the query and find the UUID for the machine. Remove the UUID for the machine and repeat the steps for any other machines you want to remove.
5157

5258
> [!NOTE]
5359
> For added protection, before making edits be sure to make a copy of the query. Then you can restore it if a problem occurs.
@@ -60,15 +66,15 @@ Sign in to the [Azure portal](https://portal.azure.com).
6066
| distinct Computer
6167
```
6268

63-
8. Save the saved search when you're finished editing it by selecting **Save > Save as function** from the top bar. When prompted, specify the following:
69+
6. Save the saved search when you're finished editing it by selecting **Save > Save as function** from the top bar. When prompted, specify the following:
6470

6571
* **Name**: Updates__MicrosoftDefaultComputerGroup
6672
* **Save as computer Group** is selected
6773
* **Legacy category**: Updates
6874

69-
>[!NOTE]
70-
>Machines are still shown after you have unenrolled them because we report on all machines assessed in the last 24 hours. After removing the machine, you need to wait 24 hours before they are no longer listed.
75+
> [!NOTE]
76+
> Machines are still shown after you have unenrolled them because we report on all machines assessed in the last 24 hours. After removing the machine, you need to wait 24 hours before they are no longer listed.
7177
7278
## Next steps
7379

74-
To re-enable managing your Azure or non-Azure machine, see [Enable Update Management by browsing the Azure portal](enable-from-portal.md) or [Enable Update Management from an Azure VM](enable-from-vm.md).
80+
To re-enable managing your Azure or non-Azure machine, see [Enable Update Management by browsing the Azure portal](enable-from-portal.md) or [Enable Update Management from an Azure VM](enable-from-vm.md).

articles/devops-project/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ms.author: gwallace
2323

2424
## Advantages of using DevOps Starter
2525

26-
DevOps starter the following supports two CI/CD providers, to automate your deployments
26+
DevOps starter supports the following two CI/CD providers, to automate your deployments
2727
* [GitHub Actions](https://github.com/features/actions)
2828
* [Azure DevOps](https://azure.microsoft.com/services/devops)
2929

articles/search/cognitive-search-working-with-skillsets.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: HeidiSteen
77
ms.author: heidist
88
ms.service: cognitive-search
99
ms.topic: conceptual
10-
ms.date: 07/13/2022
10+
ms.date: 07/14/2022
1111
---
1212

1313
# Skillset concepts in Azure Cognitive Search

0 commit comments

Comments
 (0)