Skip to content

Commit 4f2a784

Browse files
Merge branch 'MicrosoftDocs:main' into patch-5
2 parents 221e833 + fa885ad commit 4f2a784

27 files changed

+193
-84
lines changed

articles/active-directory/devices/howto-vm-sign-in-azure-ad-windows.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: devices
88
ms.topic: how-to
9-
ms.date: 06/16/2022
9+
ms.date: 01/05/2023
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo
@@ -416,7 +416,7 @@ Set-MsolUser -UserPrincipalName [email protected] -StrongAuthenticationRequir
416416
If you haven't deployed Windows Hello for Business and if that isn't an option for now, you can configure a Conditional Access policy that excludes the Azure Windows VM Sign-In app from the list of cloud apps that require MFA. To learn more about Windows Hello for Business, see [Windows Hello for Business overview](/windows/security/identity-protection/hello-for-business/hello-identity-verification).
417417

418418
> [!NOTE]
419-
> Windows Hello for Business PIN authentication with RDP has been supported for several versions of Windows 10. Support for biometric authentication with RDP was added in Windows 10 version 1809. Using Windows Hello for Business authentication during RDP is available only for deployments that use a certificate trust model. It's currently not available for a key trust model.
419+
> Windows Hello for Business PIN authentication with RDP has been supported for several versions of Windows 10. Support for biometric authentication with RDP was added in Windows 10 version 1809. Using Windows Hello for Business authentication during RDP is available for deployments that use a certificate trust model or key trust model.
420420
421421
Share your feedback about this feature or report problems with using it on the [Azure AD feedback forum](https://feedback.azure.com/d365community/forum/22920db1-ad25-ec11-b6e6-000d3a4f0789).
422422

articles/api-management/api-management-policy-expressions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: dlepow
77

88
ms.service: api-management
99
ms.topic: article
10-
ms.date: 12/08/2022
10+
ms.date: 02/07/2022
1111
ms.author: danlep
1212
---
1313
# API Management policy expressions
@@ -213,7 +213,7 @@ The `context` variable is implicitly available in every policy [expression](api-
213213
|<a id="ref-context-user"></a>`context.User`|`Email`: `string`<br /><br /> `FirstName`: `string`<br /><br /> `Groups`: `IEnumerable<`[`IGroup`](#ref-igroup)`>`<br /><br /> `Id`: `string`<br /><br /> `Identities`: `IEnumerable<`[`IUserIdentity`](#ref-iuseridentity)`>`<br /><br /> `LastName`: `string`<br /><br /> `Note`: `string`<br /><br /> `RegistrationDate`: `DateTime`|
214214
|<a id="ref-iapi"></a>`IApi`|`Id`: `string`<br /><br /> `Name`: `string`<br /><br /> `Path`: `string`<br /><br /> `Protocols`: `IEnumerable<string>`<br /><br /> `ServiceUrl`: [`IUrl`](#ref-iurl)<br /><br /> `SubscriptionKeyParameterNames`: [`ISubscriptionKeyParameterNames`](#ref-isubscriptionkeyparameternames)|
215215
|<a id="ref-igroup"></a>`IGroup`|`Id`: `string`<br /><br /> `Name`: `string`|
216-
|<a id="ref-imessagebody"></a>`IMessageBody`|`As<T>(bool preserveContent = false): Where T: string, byte[], JObject, JToken, JArray, XNode, XElement, XDocument` <br /><br /> - The `context.Request.Body.As<T>` and `context.Response.Body.As<T>` methods read a request or response message body in specified type `T`. <br/><br/> - Or - <br/><br/>`AsFormUrlEncodedContent(bool preserveContent = false)` <br/></br>- The `context.Request.Body.AsFormUrlEncodedContent()` and `context.Response.Body.AsFormUrlEncodedContent()` methods read URL-encoded form data in a request or response message body and return an `IDictionary<string, IList<string>>` object. The decoded object supports `IDictionary` operations and the following expressions: `ToQueryString()`, `JsonConvert.SerializeObject()`, `ToFormUrlEncodedContent().` <br/><br/> By default, the `As<T>` and `AsFormUrlEncodedContent()` methods:<br /><ul><li>Use the original message body stream.</li><li>Render it unavailable after it returns.</li></ul> <br />To avoid that and have the method operate on a copy of the body stream, set the `preserveContent` parameter to `true`, as in [this example](api-management-transformation-policies.md#SetBody).|
216+
|<a id="ref-imessagebody"></a>`IMessageBody`|`As<T>(preserveContent: bool = false): Where T: string, byte[],JObject, JToken, JArray, XNode, XElement, XDocument`<br /><br /> The `context.Request.Body.As<T>` and `context.Response.Body.As<T>` methods are used to read either a request and response message body in specified type `T`. By default, the method:<br /><ul><li>Uses the original message body stream.</li><li>Renders it unavailable after it returns.</li></ul> <br />To avoid that and have the method operate on a copy of the body stream, set the `preserveContent` parameter to `true`, as in [this example](api-management-transformation-policies.md#SetBody).|
217217
|<a id="ref-iprivateendpointconnection"></a>`IPrivateEndpointConnection`|`Name`: `string`<br /><br /> `GroupId`: `string`<br /><br /> `MemberName`: `string`<br /><br />For more information, see the [REST API](/rest/api/apimanagement/current-ga/private-endpoint-connection/list-private-link-resources).|
218218
|<a id="ref-iurl"></a>`IUrl`|`Host`: `string`<br /><br /> `Path`: `string`<br /><br /> `Port`: `int`<br /><br /> [`Query`](#ref-iurl-query): `IReadOnlyDictionary<string, string[]>`<br /><br /> `QueryString`: `string`<br /><br /> `Scheme`: `string`|
219219
|<a id="ref-iuseridentity"></a>`IUserIdentity`|`Id`: `string`<br /><br /> `Provider`: `string`|

articles/api-management/api-management-transformation-policies.md

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -399,19 +399,6 @@ Since we are not reserving the original request body, accessing it later in the
399399

400400
```
401401

402-
#### Example accessing the body as URL-encoded form data
403-
The following example uses the `AsFormUrlEncodedContent()` expression to access the request body as URL-encoded form data (content type `application/x-www-form-urlencoded`), and then converts it to JSON. Since we are not reserving the original request body, accessing it later in the pipeline will result in an exception.
404-
405-
```xml
406-
<set-body
407-
@{ 
408-
var inBody = context.Request.Body.AsFormUrlEncodedContent();
409-
return JsonConvert.SerializeObject(inBody); 
410-
411-
</set-body>
412-
413-
```
414-
415402
#### Filter response based on product
416403
This example shows how to perform content filtering by removing data elements from the response received from a backend service when using the `Starter` product. The example backend response includes root-level properties similar to the [OpenWeather One Call API](https://openweathermap.org/api/one-call-api).
417404

articles/applied-ai-services/form-recognizer/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ Use the links in the table to learn more about each model and browse the API ref
117117

118118
| Model| Description | Development options |
119119
|----------|--------------|-------------------------|
120-
|[**Layout analysis**](concept-layout.md?view=form-recog-2.1.0&preserve-view=true) | Extraction and analysis of text, selection marks, tables, and bounding box coordinates, from forms and documents. | <ul><li>[**Form Recognizer labeling tool**](quickstarts/try-sample-label-tool.md#analyze-layout)</li><li>[**REST API**](quickstarts/get-started-v2-1-sdk-rest-api.md#try-it-layout-model)</li><li>[**Client-library SDK**](quickstarts/try-sdk-rest-api.md)</li><li>[**Form Recognizer Docker container**](containers/form-recognizer-container-install-run.md?branch=main&tabs=layout#run-the-container-with-the-docker-compose-up-command)</li></ul>|
120+
|[**Layout analysis**](concept-layout.md?view=form-recog-2.1.0&preserve-view=true) | Extraction and analysis of text, selection marks, tables, and bounding box coordinates, from forms and documents. | <ul><li>[**Form Recognizer labeling tool**](quickstarts/try-sample-label-tool.md#analyze-layout)</li><li>[**REST API**](quickstarts/get-started-v2-1-sdk-rest-api.md#try-it-layout-model)</li><li>[**Client-library SDK**](quickstarts/get-started-sdks-rest-api.md)</li><li>[**Form Recognizer Docker container**](containers/form-recognizer-container-install-run.md?branch=main&tabs=layout#run-the-container-with-the-docker-compose-up-command)</li></ul>|
121121
|[**Custom model**](concept-custom.md?view=form-recog-2.1.0&preserve-view=true) | Extraction and analysis of data from forms and documents specific to distinct business data and use cases.| <ul><li>[**Form Recognizer labeling tool**](quickstarts/try-sample-label-tool.md#train-a-custom-form-model)</li><li>[**REST API**](quickstarts/get-started-sdks-rest-api.md)</li><li>[**Sample Labeling Tool**](concept-custom.md?view=form-recog-2.1.0&preserve-view=true#build-a-custom-model)</li><li>[**Form Recognizer Docker container**](containers/form-recognizer-container-install-run.md?tabs=custom#run-the-container-with-the-docker-compose-up-command)</li></ul>|
122122
|[**Invoice model**](concept-invoice.md?view=form-recog-2.1.0&preserve-view=true) | Automated data processing and extraction of key information from sales invoices. | <ul><li>[**Form Recognizer labeling tool**](quickstarts/try-sample-label-tool.md#analyze-using-a-prebuilt-model)</li><li>[**REST API**](quickstarts/get-started-v2-1-sdk-rest-api.md#try-it-prebuilt-model)</li><li>[**Client-library SDK**](quickstarts/get-started-sdks-rest-api.md#try-it-prebuilt-model)</li><li>[**Form Recognizer Docker container**](containers/form-recognizer-container-install-run.md?tabs=invoice#run-the-container-with-the-docker-compose-up-command)</li></ul>|
123123
|[**Receipt model**](concept-receipt.md?view=form-recog-2.1.0&preserve-view=true) | Automated data processing and extraction of key information from sales receipts.| <ul><li>[**Form Recognizer labeling tool**](quickstarts/try-sample-label-tool.md#analyze-using-a-prebuilt-model)</li><li>[**REST API**](quickstarts/get-started-v2-1-sdk-rest-api.md#try-it-prebuilt-model)</li><li>[**Client-library SDK**](quickstarts/get-started-sdks-rest-api.md)</li><li>[**Form Recognizer Docker container**](containers/form-recognizer-container-install-run.md?tabs=receipt#run-the-container-with-the-docker-compose-up-command)</li></ul>|

articles/automation/automation-solution-vm-management-remove.md

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,81 @@ After you enable the Start/Stop VMs during off-hours feature to manage the runni
2323

2424
To delete the resource group, follow the steps outlined in the [Azure Resource Manager resource group and resource deletion](../azure-resource-manager/management/delete-resource-group.md) article.
2525

26+
## Delete the Automation account
27+
28+
To delete your Automation account dedicated to Start/Stop VMs during off-hours, perform the following steps.
29+
30+
1. Sign in to Azure at [https://portal.azure.com](https://portal.azure.com).
31+
32+
2. Navigate to your Automation account, and select **Linked workspace** under **Related resources**.
33+
34+
3. Select **Go to workspace**.
35+
36+
4. Click **Solutions** under **General**.
37+
38+
5. On the Solutions page, select **Start-Stop-VM[Workspace]**.
39+
40+
6. On the **VMManagementSolution[Workspace]** page, select **Delete** from the menu.
41+
42+
7. While the information is verified and the feature is deleted, you can track the progress under **Notifications**, chosen from the menu. You're returned to the Solutions page after the removal process.
43+
44+
### Unlink workspace from Automation account
45+
46+
There are two options for unlinking the Log Analytics workspace from your Automation account. You can perform this process from the Automation account or from the linked workspace.
47+
48+
To unlink from your Automation account, perform the following steps.
49+
50+
1. In the Azure portal, select **Automation Accounts**.
51+
52+
2. Open your Automation account and select **Linked workspace** under **Related Resources** on the left.
53+
54+
3. On the **Unlink workspace** page, select **Unlink workspace** and respond to prompts.
55+
56+
![Screenshot showing how to unlink a workspace page.](media/automation-solution-vm-management-remove/automation-unlink-workspace-blade.png)
57+
58+
While it attempts to unlink the Log Analytics workspace, you can track the progress under **Notifications** from the menu.
59+
60+
To unlink from the workspace, perform the following steps.
61+
62+
1. In the Azure portal, select **Log Analytics workspaces**.
63+
64+
2. From the workspace, select **Automation Account** under **Related Resources**.
65+
66+
3. On the Automation Account page, select **Unlink account** and respond to prompts.
67+
68+
While it attempts to unlink the Automation account, you can track the progress under **Notifications** from the menu.
69+
70+
### Delete Automation account
71+
72+
1. In the Azure portal, select **Automation Accounts**.
73+
74+
2. Open your Automation account and select **Delete** from the menu.
75+
76+
While the information is verified and the account is deleted, you can track the progress under **Notifications**, chosen from the menu.
77+
78+
## Delete the feature
79+
80+
To delete Start/Stop VMs during off-hours from your Automation account, perform the following steps. The Automation account and Log Analytics workspace aren't deleted as part of this process. If you don't want to keep the Log Analytics workspace, you must manually delete it. For more information about deleting your workspace, see [Delete and recover Azure Log Analytics workspace](../azure-monitor/logs/delete-workspace.md).
81+
82+
1. Navigate to your Automation account, and select **Linked workspace** under **Related resources**.
83+
84+
2. Select **Go to workspace**.
85+
86+
3. Click **Solutions** under **General**.
87+
88+
4. On the Solutions page, select **Start-Stop-VM[Workspace]**.
89+
90+
5. On the **VMManagementSolution[Workspace]** page, select **Delete** from the menu.
91+
92+
![Screenshot showing the delete VM management feature.](media/automation-solution-vm-management/vm-management-solution-delete.png)
93+
94+
6. In the Delete Solution window, confirm that you want to delete the feature.
95+
96+
7. While the information is verified and the feature is deleted, you can track the progress under **Notifications**, chosen from the menu. You're returned to the Solutions page after the removal process.
97+
98+
8. If you don't want to keep the resources created by the feature or by you afterwards (such as, variables, schedules, etc.), you have to manually delete them from the account.
99+
100+
26101

27102
## Next steps
28103

articles/azure-monitor/agents/agents-overview.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,10 @@ Azure Monitor Agent replaces the Azure Monitor legacy monitoring agents:
3131

3232
## Install the agent and configure data collection
3333

34-
Azure Monitor Agent uses [data collection rules](../essentials/data-collection-rule-overview.md), where you define which data you want each agent to collect. Data collection rules let you manage data collection settings at scale and define unique, scoped configurations for subsets of machines. The rules are independent of the workspace and the virtual machine, which means you can define a rule once and reuse it across machines and environments.
34+
Azure Monitor Agent uses [data collection rules](../essentials/data-collection-rule-overview.md), where you define which data you want each agent to collect. Data collection rules let you manage data collection settings at scale and define unique, scoped configurations for subsets of machines. You can define a rule to send data from multiple machines to multiple destinations across regions and tenants.
35+
36+
> [!NOTE]
37+
> To send data across tenants, you must first enable [Azure Lighthouse](/azure/lighthouse/overview).
3538
3639
**To collect data using Azure Monitor Agent:**
3740

articles/azure-monitor/agents/data-collection-iis.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,10 @@ The [data collection rule](../essentials/data-collection-rule-overview.md) defin
3131
- How Azure Monitor transforms events during ingestion.
3232
- The destination Log Analytics workspace and table to which Azure Monitor sends the data.
3333

34-
Create the data collection rule in the *same region* as your Log Analytics workspace. You can still associate the rule to machines in other supported regions.
34+
You can define a data collection rule to send data from multiple machines to multiple Log Analytics workspaces, including workspaces in a different region or tenant. Create the data collection rule in the *same region* as your Log Analytics workspace.
35+
36+
> [!NOTE]
37+
> To send data across tenants, you must first enable [Azure Lighthouse](/azure/lighthouse/overview).
3538
3639
To create the data collection rule in the Azure portal:
3740

articles/azure-monitor/agents/data-collection-rule-azure-monitor-agent.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@ To complete this procedure, you need:
2121

2222
## Create a data collection rule
2323

24-
Create the data collection rule in the *same region* as your Log Analytics workspace. You can still associate the rule to machines in other supported regions.
24+
You can define a data collection rule to send data from multiple machines to multiple Log Analytics workspaces, including workspaces in a different region or tenant. Create the data collection rule in the *same region* as your Log Analytics workspace.
2525

26+
> [!NOTE]
27+
> To send data across tenants, you must first enable [Azure Lighthouse](/azure/lighthouse/overview).
2628
### [Portal](#tab/portal)
2729

2830
1. On the **Monitor** menu, select **Data Collection Rules**.
@@ -70,9 +72,6 @@ Create the data collection rule in the *same region* as your Log Analytics works
7072
1. Select **Add data source** and then select **Review + create** to review the details of the data collection rule and association with the set of virtual machines.
7173
1. Select **Create** to create the data collection rule.
7274

73-
> [!NOTE]
74-
> It might take up to 5 minutes for data to be sent to the destinations after you create the data collection rule and associations.
75-
7675
### [API](#tab/api)
7776

7877
1. Create a DCR file by using the JSON format shown in [Sample DCR](data-collection-rule-sample-agent.md).
@@ -111,6 +110,9 @@ For sample templates, see [Azure Resource Manager template samples for data coll
111110

112111
---
113112

113+
> [!NOTE]
114+
> It can take up to 5 minutes for data to be sent to the destinations after you create the data collection rule.
115+
114116
## Filter events using XPath queries
115117

116118
You're charged for any data you collect in a Log Analytics workspace. Therefore, you should only collect the event data you need. The basic configuration in the Azure portal provides you with a limited ability to filter out events.

articles/azure-monitor/agents/data-collection-text-log.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,11 @@ The data collection rule defines:
6969
- How Azure Monitor transforms events during ingestion.
7070
- The destination Log Analytics workspace and table to which Azure Monitor sends the data.
7171

72-
Create the data collection rule in the *same region* as your Log Analytics workspace. You can still associate the rule to machines in other supported regions.
72+
You can define a data collection rule to send data from multiple machines to multiple Log Analytics workspaces, including workspaces in a different region or tenant. Create the data collection rule in the *same region* as your Log Analytics workspace.
7373

7474
> [!NOTE]
75-
> It can take up to 5 minutes for data to be sent to the destinations after you create the data collection rule.
75+
> To send data across tenants, you must first enable [Azure Lighthouse](/azure/lighthouse/overview).
76+
7677
### [Portal](#tab/portal)
7778

7879
To create the data collection rule in the Azure portal:
@@ -319,6 +320,8 @@ To create the data collection rule in the Azure portal:
319320

320321
---
321322

323+
> [!NOTE]
324+
> It can take up to 5 minutes for data to be sent to the destinations after you create the data collection rule.
322325
## Troubleshoot
323326
Use the following steps to troubleshoot collection of text logs.
324327

articles/cognitive-services/Computer-vision/faq.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ sections:
4444
- question: |
4545
Can I deploy the OCR (Read) capability on-premises?
4646
answer: |
47-
Yes, the Computer Vision 3.2 OCR (Read) cloud API is also available as a Docker container for on-premises deployment. Learn [how to deploy
47+
Yes, the Computer Vision 3.2 OCR (Read) cloud API is also available as a Docker container for on-premises deployment. Learn [how to deploy](https://learn.microsoft.com/en-us/azure/cognitive-services/computer-vision/computer-vision-how-to-install-containers)
4848
4949
- question: |
5050
Can I train Computer Vision API to use custom tags? For example, I would like to feed in pictures of cat breeds to 'train' the AI, then receive the breed value on an AI request.

0 commit comments

Comments
 (0)