Skip to content

Commit d8abfe9

Browse files
authored
Merge branch 'MicrosoftDocs:master' into master
2 parents d4f8605 + c5ff0e5 commit d8abfe9

File tree

21 files changed

+956
-362
lines changed

21 files changed

+956
-362
lines changed

articles/active-directory/develop/TOC.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -733,9 +733,9 @@
733733
- name: Videos
734734
href: identity-videos.md
735735
- name: Microsoft identity platform developer blog
736-
href: https://developer.microsoft.com/en-us/identity/blogs/
736+
href: https://developer.microsoft.com/identity/blogs/
737737
- name: Azure AD blog
738-
href: https://cloudblogs.microsoft.com/enterprisemobility/?product=azure-active-directory
738+
href: https://techcommunity.microsoft.com/t5/azure-active-directory-identity/bg-p/Identity
739739
- name: Azure roadmap
740740
href: https://azure.microsoft.com/roadmap/?category=security-identity
741741
- name: Try Sign in with Microsoft
@@ -744,4 +744,4 @@
744744
href: ../managed-identities-azure-resources/overview.md
745745
- name: Getting help
746746
displayName: support, help options
747-
href: developer-support-help-options.md
747+
href: developer-support-help-options.md

articles/active-directory/managed-identities-azure-resources/how-to-use-vm-token.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,9 @@ This section documents the possible error responses. A "200 OK" status is a succ
365365
| | invalid_scope | The requested scope is invalid, unknown, or malformed. | |
366366
| 500 Internal server error | unknown | Failed to retrieve token from the Active directory. For details see logs in *\<file path\>* | Verify that managed identities for Azure resources has been enabled on the VM. See [Configure managed identities for Azure resources on a VM using the Azure portal](qs-configure-portal-windows-vm.md) if you need assistance with VM configuration.<br><br>Also verify that your HTTP GET request URI is formatted correctly, particularly the resource URI specified in the query string. See the "Sample request" in the preceding REST section for an example, or [Azure services that support Azure AD authentication](./services-support-managed-identities.md) for a list of services and their respective resource IDs.
367367

368+
> [!IMPORTANT]
369+
> - IMDS is not intended to be used behind a proxy and doing so is unsupported. For examples of how to bypass proxies, refer to the [Azure Instance Metadata Samples](https://github.com/microsoft/azureimds).
370+
368371
## Retry guidance
369372

370373
It is recommended to retry if you receive a 404, 429, or 5xx error code (see [Error handling](#error-handling) above).

articles/active-directory/verifiable-credentials/get-started-request-api.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ Authorization: Bearer <token>
233233
}
234234
```
235235

236-
For the complete code, check out one of the following code samples, [C#](https://github.com/Azure-Samples/active-directory-verifiable-credentials-dotnet/blob/main/1-asp-net-core-api-idtokenhint/IssuerController.cs) and [Node.js](https://github.com/Azure-Samples/active-directory-verifiable-credentials-node/blob/main/1-node-api-idtokenhint/issuer.js).
236+
For the complete code, check out one of the following code samples, [C#](https://github.com/Azure-Samples/active-directory-verifiable-credentials-dotnet/blob/main/AspNetCoreVerifiableCredentials/IssuerController.cs) and [Node.js](https://github.com/Azure-Samples/active-directory-verifiable-credentials-node/blob/main/1-node-api-idtokenhint/issuer.js).
237237

238238
## Presentation request example
239239

@@ -318,7 +318,7 @@ try
318318
}
319319
```
320320

321-
For the complete code, see the [issuance](https://github.com/Azure-Samples/active-directory-verifiable-credentials-dotnet/blob/main/1-asp-net-core-api-idtokenhint/IssuerController.cs) and [presentation](https://github.com/Azure-Samples/active-directory-verifiable-credentials-dotnet/blob/main/1-asp-net-core-api-idtokenhint/VerifierController.cs) code on the GitHub repo.
321+
For the complete code, see the [issuance](https://github.com/Azure-Samples/active-directory-verifiable-credentials-dotnet/blob/main/AspNetCoreVerifiableCredentials/IssuerController.cs) and [presentation](https://github.com/Azure-Samples/active-directory-verifiable-credentials-dotnet/blob/main/AspNetCoreVerifiableCredentials/VerifierController.cs) code on the GitHub repo.
322322
323323
# [Node.js](#tab/nodejs)
324324

articles/applied-ai-services/form-recognizer/concept-custom.md

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ manager: nitinme
77
ms.service: applied-ai-services
88
ms.subservice: forms-recognizer
99
ms.topic: conceptual
10-
ms.date: 10/07/2021
10+
ms.date: 10/16/2021
1111
ms.author: lajanuar
1212
recommendations: false
1313
---
@@ -20,8 +20,7 @@ Form Recognizer uses advanced machine learning technology to detect and extract
2020

2121
* **Composed models**. A composed model is created by taking a collection of custom models and assigning them to a single model that encompasses your form types. When a document is submitted to a composed model, the service performs a classification step to decide which custom model accurately represents the form presented for analysis.
2222

23-
:::image type="content" source="media/analyze.png" alt-text="Screenshot: Form Recognizer tool analyze-a-custom-form window.":::
24-
23+
:::image type="content" source="media/analyze-studio.png" alt-text="Screenshot: Form Recognizer tool analyze-a-custom-form window.":::
2524

2625
## What is a custom model?
2726

@@ -31,7 +30,7 @@ A custom model is a machine learning program trained to recognize form fields wi
3130

3231
With composed models, you can assign multiple custom models to a composed model called with a single model ID. This is useful when you have trained several models and want to group them to analyze similar form types. For example, your composed model may include custom models trained to analyze your supply, equipment, and furniture purchase orders. Instead of manually trying to select the appropriate model, you can use a composed model to determine the appropriate custom model for each analysis and extraction.
3332

34-
## Try Form Recognizer Studio (Preview)
33+
## Form Recognizer Studio (Preview)
3534

3635
* Form Recognizer studio is available with the preview (v3.0) API.
3736

@@ -40,13 +39,13 @@ With composed models, you can assign multiple custom models to a composed model
4039
> [!div class="nextstepaction"]
4140
> [Try Form Recognizer Studio](https://formrecognizer.appliedai.azure.com/studio/customform/projects)
4241
43-
## Try Form Recognizer Sample labeling tool
42+
## Sample Labeling tool
4443

4544
You can see how data is extracted from custom forms by trying our Sample Labeling tool. You'll need the following:
4645

4746
* An Azure subscription—you can [create one for free](https://azure.microsoft.com/free/cognitive-services/)
4847

49-
* A [Form Recognizer instance](https://ms.portal.azure.com/#create/Microsoft.CognitiveServicesFormRecognizer) ) in the Azure portal. You can use the free pricing tier (`F0`) to try the service. After your resource deploys, click **Go to resource** to get your API key and endpoint.
48+
* A [Form Recognizer instance](https://ms.portal.azure.com/#create/Microsoft.CognitiveServicesFormRecognizer) in the Azure portal. You can use the free pricing tier (`F0`) to try the service. After your resource deploys, click **Go to resource** to get your API key and endpoint.
5049

5150
:::image type="content" source="media/containers/keys-and-endpoint.png" alt-text="Screenshot: keys and endpoint location in the Azure portal.":::
5251

@@ -74,8 +73,8 @@ In the Form Recognizer UI:
7473
* The total size of the training data is 500 pages or less.
7574
* If your PDFs are password-locked, you must remove the lock before submission.
7675
* For unsupervised learning (without labeled data):
77-
* data must contain keys and values.
78-
* keys must appear above or to the left of the values; they can't appear below or to the right.
76+
* Data must contain keys and values.
77+
* Keys must appear above or to the left of the values; they can't appear below or to the right.
7978

8079
> [!TIP]
8180
> **Training data**
@@ -102,6 +101,26 @@ In the Form Recognizer UI:
102101

103102
* Explore our [**REST API (preview)**](https://westus.dev.cognitive.microsoft.com/docs/services/form-recognizer-api-v3-0-preview-1/operations/AnalyzeDocument) to learn more about the preview version and new capabilities.
104103

104+
### Try signature detection
105+
106+
1. Build your training data set.
107+
108+
1. Navigate to the [Form Recognizer Studio](https://formrecognizer.appliedai.azure.com/studio) and select **Custom form** under Custom models:
109+
110+
:::image type="content" source="media/label-tool/select-custom-form.png" alt-text="Screenshot: Form Recognizer Studio select custom form.":::
111+
112+
1. Follow the workflow to create a new project:
113+
114+
1. Follow the Custom model input requirements.
115+
116+
1. Create a label with the type **Signature**.
117+
118+
1. Label your documents. For signature fields, using region labeling is recommended for better accuracy.
119+
120+
:::image type="content" source="media/label-tool/signature-label-region-too.png" alt-text="Screenshot: Label signature field.":::
121+
122+
Once your training set has been labeled, you can train your custom model and use it to analyze documents. The signature fields will specify whether a signature was detected or not.
123+
105124
## Next steps
106125

107126
* Complete a Form Recognizer quickstart:
103 KB
Loading
30.9 KB
Loading
255 KB
Loading
188 KB
Loading

articles/automation/change-tracking/remove-vms-from-change-tracking.md

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,42 @@
11
---
2-
title: Remove VMs from Azure Automation Change Tracking and Inventory
3-
description: This article tells how to remove VMs from Change Tracking and Inventory.
2+
title: Remove machines from Azure Automation Change Tracking and Inventory
3+
description: This article tells how to remove Azure and non-Azure machines from Change Tracking and Inventory.
44
services: automation
55
ms.subservice: change-inventory-management
66
ms.topic: conceptual
7-
ms.date: 05/26/2021
7+
ms.date: 10/20/2021
88
---
99

10-
# Remove VMs from Change Tracking and Inventory
10+
# Remove machines from Change Tracking and Inventory
1111

12-
When you're finished tracking changes on the VMs in your environment, you can stop managing them with the [Change Tracking and Inventory](overview.md) feature. To stop managing them, you will edit the saved search query `MicrosoftDefaultComputerGroup` in your Log Analytics workspace that is linked to your Automation account.
12+
When you're finished tracking changes on your Azure or non-Azure machines in your environment, you can stop managing them with the [Change Tracking and Inventory](overview.md) feature. To stop managing them, you will edit the saved search query `MicrosoftDefaultComputerGroup` in your Log Analytics workspace that is linked to your Automation account.
1313

1414
## Sign into the Azure portal
1515

1616
Sign in to the [Azure portal](https://portal.azure.com).
1717

18-
## To remove your VMs
18+
## To remove your machines
1919

2020
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).
2121

22-
2. Use the following command to identify the UUID of a machine that you want to remove from management.
22+
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.
2323

24-
```azurecli
25-
az vm show -g MyResourceGroup -n MyVm -d
26-
```
24+
# [Azure VM](#tab/azure-vm)
25+
26+
```azurecli
27+
az vm show -g MyResourceGroup -n MyVm -d
28+
```
29+
30+
# [Non-Azure machine](#tab/non-azure-machine)
31+
32+
```kusto
33+
Heartbeat
34+
| where TimeGenerated > ago(30d)
35+
| where ResourceType == "machines" and (ComputerEnvironment == "Non-Azure")
36+
| summarize by Computer, VMUUID
37+
```
38+
39+
---
2740

2841
3. In the Azure portal, navigate to **Log Analytics workspaces**. Select your workspace from the list.
2942

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

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,41 @@
11
---
2-
title: Remove VMs from Azure Automation Update Management
3-
description: This article tells how to remove machines managed with Update Management.
2+
title: Remove machines from Azure Automation Update Management
3+
description: This article tells how to remove Azure and non-Azure machines managed with Update Management.
44
services: automation
55
ms.topic: conceptual
6-
ms.date: 06/03/2021
6+
ms.date: 10/20/2021
77
ms.custom: mvc
88
---
99
# Remove VMs from Update Management
1010

11-
When you're finished managing updates on your VMs in your environment, you can stop managing VMs with the [Update Management](overview.md) feature. To stop managing them, you will edit the saved search query `MicrosoftDefaultComputerGroup` in your Log Analytics workspace that is linked to your Automation account.
11+
When you're finished managing updates on your Azure or non-Azure machines in your environment, you can stop managing them with the [Update Management](overview.md) feature. To stop managing them, you will edit the saved search query `MicrosoftDefaultComputerGroup` in your Log Analytics workspace that is linked to your Automation account.
1212

1313
## Sign into the Azure portal
1414

1515
Sign in to the [Azure portal](https://portal.azure.com).
1616

17-
## To remove your VMs
17+
## To remove your machines
1818

1919
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).
2020

21-
2. Use the following command to identify the UUID of a machine that you want to remove from management.
21+
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.
2222

23-
```azurecli
24-
az vm show -g MyResourceGroup -n MyVm -d
25-
```
23+
# [Azure VM](#tab/azure-vm)
24+
25+
```azurecli
26+
az vm show -g MyResourceGroup -n MyVm -d
27+
```
28+
29+
# [Non-Azure machine](#tab/non-azure-machine)
30+
31+
```kusto
32+
Heartbeat
33+
| where TimeGenerated > ago(30d)
34+
| where ResourceType == "machines" and (ComputerEnvironment == "Non-Azure")
35+
| summarize by Computer, VMUUID
36+
```
37+
38+
---
2639

2740
3. In the Azure portal, navigate to **Log Analytics workspaces**. Select your workspace from the list.
2841

@@ -32,7 +45,7 @@ Sign in to the [Azure portal](https://portal.azure.com).
3245

3346
6. From the table, click the icon **Run query** to the right of the item **MicrosoftDefaultComputerGroup** with the **Legacy category** value **Updates**.
3447

35-
7. In the query editor, review the query and find the UUID for the VM. Remove the UUID for the VM and repeat the steps for any other VMs you want to remove.
48+
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.
3649

3750
> [!NOTE]
3851
> For added protection, before making edits be sure to make a copy of the query. Then you can restore it if a problem occurs.
@@ -56,4 +69,4 @@ Sign in to the [Azure portal](https://portal.azure.com).
5669
5770
## Next steps
5871

59-
To re-enable managing your virtual 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).
72+
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).

0 commit comments

Comments
 (0)