Skip to content

Commit 5345244

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 94a5e42 + 94067e1 commit 5345244

File tree

66 files changed

+839
-337
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+839
-337
lines changed

.openpublishing.publish.config.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,12 @@
429429
"branch": "cli-preview",
430430
"branch_mapping": {}
431431
},
432+
{
433+
"path_to_root": "terraform",
434+
"url": "https://github.com/Azure/terraform",
435+
"branch": "master",
436+
"branch_mapping": {}
437+
},
432438
{
433439
"path_to_root": "samples-qnamaker-nodejs",
434440
"url": "https://github.com/Azure-Samples/cognitive-services-qnamaker-nodejs",

articles/active-directory-b2c/add-ropc-policy.md

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,18 @@ When using the ROPC flow, consider the following:
5050

5151
## Create a resource owner user flow
5252

53-
1. Sign in to the Azure portal as the global administrator of your Azure AD B2C tenant.
54-
2. To switch to your Azure AD B2C tenant, select the B2C directory in the upper-right corner of the portal.
55-
3. Select **User flows**, and select **New user flow**.
56-
4. Select **Sign in using resource owner password credentials (ROPC)**.
57-
5. Under **Version**, make sure **Preview** is selected, and then select **Create**.
58-
7. Provide a name for the user flow, such as *ROPC_Auth*.
59-
8. Under **Application claims**, click **Show more**.
60-
9. Select the application claims that you need for your application, such as Display Name, Email Address, and Identity Provider.
61-
10. Select **OK**, and then select **Create**.
53+
1. Sign in to the [Azure portal](https://portal.azure.com) as the **global administrator** of your Azure AD B2C tenant.
54+
2. Make sure you're using the directory that contains your Azure AD B2C tenant:
55+
1. Select the **Directories + subscriptions** icon in the portal toolbar.
56+
1. On the **Portal settings | Directories + subscriptions** page, find your Azure AD B2C directory in the **Directory name** list, and then select **Switch**.
57+
1. In the Azure portal, search for and select **Azure AD B2C**.
58+
1. Select **User flows**, and select **New user flow**.
59+
1. Select **Sign in using resource owner password credentials (ROPC)**.
60+
1. Under **Version**, make sure **Preview** is selected, and then select **Create**.
61+
1. Provide a name for the user flow, such as *ROPC_Auth*.
62+
1. Under **Application claims**, click **Show more**.
63+
1. Select the application claims that you need for your application, such as Display Name, Email Address, and Identity Provider.
64+
1. Select **OK**, and then select **Create**.
6265

6366
::: zone-end
6467

articles/active-directory/cloud-sync/what-is-cloud-sync.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ manager: daveba
77
ms.service: active-directory
88
ms.workload: identity
99
ms.topic: overview
10-
ms.date: 09/30/2021
10+
ms.date: 10/07/2021
1111
ms.subservice: hybrid
1212
ms.author: billmath
1313
ms.collection: M365-identity-device-management
@@ -29,7 +29,7 @@ With Azure AD Connect cloud sync, provisioning from AD to Azure AD is orchestrat
2929
## Azure AD Connect cloud sync video
3030
The following short video provides an excellent overview of Azure AD Connect cloud sync:
3131

32-
> [!VIDEO https://youtube.com/embed/mOT3ID02_YQ]
32+
> [!VIDEO https://www.microsoft.com/en-us/videoplayer/embed/RWJ8l5]
3333
3434

3535
## Comparison between Azure AD Connect and cloud sync

articles/app-service/configure-custom-container.md

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,37 @@ SSH enables secure communication between a container and a client. In order for
319319
> - `Ciphers` must include at least one item in this list: `aes128-cbc,3des-cbc,aes256-cbc`.
320320
> - `MACs` must include at least one item in this list: `hmac-sha1,hmac-sha1-96`.
321321
322+
- Add an ssh_setup script file to create the SSH keys [using ssh-keygen](https://man.openbsd.org/ssh-keygen.1) to your repository.
323+
324+
```
325+
#!/bin/sh
326+
327+
if [ ! -f "/etc/ssh/ssh_host_rsa_key" ]; then
328+
# generate fresh rsa key
329+
ssh-keygen -f /etc/ssh/ssh_host_rsa_key -N '' -t rsa
330+
fi
331+
332+
if [ ! -f "/etc/ssh/ssh_host_dsa_key" ]; then
333+
# generate fresh dsa key
334+
ssh-keygen -f /etc/ssh/ssh_host_dsa_key -N '' -t dsa
335+
fi
336+
337+
if [ ! -f "/etc/ssh/ssh_host_ecdsa_key" ]; then
338+
# generate fresh ecdsa key
339+
ssh-keygen -f /etc/ssh/ssh_host_ecdsa_key -N '' -t dsa
340+
fi
341+
342+
if [ ! -f "/etc/ssh/ssh_host_ed25519_key" ]; then
343+
# generate fresh ecdsa key
344+
ssh-keygen -f /etc/ssh/ssh_host_ed25519_key -N '' -t dsa
345+
fi
346+
347+
#prepare run dir
348+
if [ ! -d "/var/run/sshd" ]; then
349+
mkdir -p /var/run/sshd
350+
fi
351+
```
352+
322353
- In your Dockerfile, add the following commands:
323354
324355
```Dockerfile
@@ -329,6 +360,12 @@ SSH enables secure communication between a container and a client. In order for
329360
# Copy the sshd_config file to the /etc/ssh/ directory
330361
COPY sshd_config /etc/ssh/
331362
363+
# Copy and configure the ssh_setup file
364+
RUN mkdir -p /tmp
365+
COPY ssh_setup.sh /tmp
366+
RUN chmod +x /tmp/ssh_setup.sh \
367+
&& (sleep 1;/tmp/ssh_setup.sh 2>&1 > /dev/null)
368+
332369
# Open port 2222 for SSH access
333370
EXPOSE 80 2222
334371
```

articles/applied-ai-services/form-recognizer/concept-general-document.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ The General document preview model combines powerful Optical Character Recogniti
2525

2626
* Extract tables, values, and entities from forms and documents with our Form Recognizer Studio General Documents feature:
2727

28+
##### Sample document processed in the [Form Recognizer Studio](https://formrecognizer.appliedai.azure.com/studio/prebuilt?formType=document):
29+
30+
:::image type="content" source="media/general-document-analyze.png" alt-text="Screenshot: general document analysis in the Form Recognizer Studio.":::
31+
2832
> [!div class="nextstepaction"]
2933
> [Try Form Recognizer Studio](https://formrecognizer.appliedai.azure.com/studio/prebuilt?formType=document)
3034

articles/applied-ai-services/form-recognizer/quickstarts/try-v3-form-recognizer-studio.md

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,19 @@ A **standard performance** [**Azure Blob Storage account**](https://ms.portal.az
3737

3838
1. Go to the [Azure portal](https://ms.portal.azure.com/#home) and navigate as follows: **Your storage account****Data storage****Containers**
3939

40-
:::image type="content" source="../media/sas-tokens/data-storage-menu.png" alt-text="Screenshot: Data storage menu in the Azure portal.":::
40+
:::image border="true" type="content" source="../media/sas-tokens/data-storage-menu.png" alt-text="Screenshot: Data storage menu in the Azure portal.":::
4141

4242
1. Select a **container** from the list.
4343

4444
1. Select **Upload** from the menu at the top of the page.
4545

46-
:::image type="content" source="../media/sas-tokens/container-upload-button.png" alt-text="Screenshot: container upload button in the Azure portal.":::
46+
:::image border="true" type="content" source="../media/sas-tokens/container-upload-button.png" alt-text="Screenshot: container upload button in the Azure portal.":::
4747

4848
1. The **Upload blob** window will appear.
4949

5050
1. Select your file(s) to upload.
5151

52-
:::image type="content" source="../media/sas-tokens/upload-blob-window.png" alt-text="Screenshot: upload blob window in the Azure portal.":::
52+
:::image border="true" type="content" source="../media/sas-tokens/upload-blob-window.png" alt-text="Screenshot: upload blob window in the Azure portal.":::
5353

5454
> [!NOTE]
5555
> By default, the Studio will use form documents that are located at the root of your container. However, you can use data organized in folders if specified in the Custom form project creation steps. *See* [**Organize your data in subfolders**](/azure/applied-ai-services/form-recognizer/build-training-data-set#organize-your-data-in-subfolders-optional)
@@ -64,7 +64,7 @@ After you have completed the prerequisites, navigate to the [Form Recognizer Stu
6464

6565
1. Review and confirm your selections.
6666

67-
![Form Recognizer Studio Getting Started example](../media/quickstarts/form-recognizer-studio-get-started.gif)
67+
:::image border="true" type="content" source="../media/quickstarts/form-recognizer-studio-get-started.gif" alt-text="Form Recognizer Studio Getting Started example":::
6868

6969
## Layout
7070

@@ -80,7 +80,7 @@ In the Layout view:
8080

8181
1. In the output section's Result tab, browse the JSON output to understand the service response format. Copy and download to jumpstart integration.
8282

83-
![Form Recognizer Layout example](../media/quickstarts/layout-get-started-fixed.gif)
83+
:::image border="true" type="content" source="../media/quickstarts/layout-get-started-fixed.gif" alt-text="Form Recognizer Layout example":::
8484

8585
## Prebuilt models
8686

@@ -96,10 +96,12 @@ In the Prebuilt view:
9696

9797
1. In the output section's Result tab, browse the JSON output to understand the service response format. Copy and download to jumpstart integration.
9898

99-
![Form Recognizer Prebuilt example](../media/quickstarts/prebuilt-get-started-fixed.gif)
99+
:::image border="true" type="content" source="../media/quickstarts/prebuilt-get-started-fixed.gif" alt-text="Form Recognizer Prebuilt example":::
100100

101101
## Custom models
102102

103+
### Getting started
104+
103105
To create custom models, you start with configuring your project:
104106

105107
1. From the Studio home, select the Custom form project to open the Custom form home page.
@@ -110,8 +112,9 @@ To create custom models, you start with configuring your project:
110112

111113
1. Review and submit your settings to create the project.
112114

115+
:::image border="true" type="content" source="../media/quickstarts/1-custom-model-get-started.gif" alt-text="Form Recognizer Custom project Getting Started example":::
113116

114-
![Form Recognizer Custom project Getting Started example](../media/quickstarts/1-custom-model-get-started.gif)
117+
### Basic flow
115118

116119
After the project creation step, in the custom model phase:
117120

@@ -127,7 +130,9 @@ After the project creation step, in the custom model phase:
127130

128131
1. Iterate on the steps to improve your model.
129132

130-
![Form Recognizer Custom project basic workflow](../media/quickstarts/2-custom-model-basic-steps.gif)
133+
:::image border="true" type="content" source="../media/quickstarts/2-custom-model-basic-steps.gif" alt-text="Form Recognizer Custom project basic workflow":::
134+
135+
### Other features
131136

132137
In addition, view all your models using the Models tab on the left. From the list view, select model(s) to perform the following actions:
133138

articles/applied-ai-services/form-recognizer/whats-new.md

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,22 @@ Get stared with the new [REST API](https://westus2.dev.cognitive.microsoft.com/d
5050

5151
## September 2021
5252

53-
[Azure metrics explorer advanced features](/azure/azure-monitor/essentials/metrics-charts) are available on your Form Recognizer resource overview page in the Azure portal.
53+
* [Azure metrics explorer advanced features](/azure/azure-monitor/essentials/metrics-charts) are available on your Form Recognizer resource overview page in the Azure portal.
5454

55-
### Monitoring menu
55+
### Monitoring menu
5656

57-
:::image type="content" source="media/portal-metrics.png" alt-text="Screenshot showing the monitoring menu in the Azure portal":::
57+
:::image type="content" source="media/portal-metrics.png" alt-text="Screenshot showing the monitoring menu in the Azure portal":::
5858

59-
### Charts
59+
### Charts
6060

61-
:::image type="content" source="media/portal-metrics-charts.png" alt-text="Screenshot showing an example metrics chart in the Azure portal.":::
61+
:::image type="content" source="media/portal-metrics-charts.png" alt-text="Screenshot showing an example metrics chart in the Azure portal.":::
62+
63+
* **ID document** model update: given names including a suffix, with or without a period (full stop), process successfully:
64+
65+
|Input Text | Result with update |
66+
|------------|-------------------------------------------|
67+
| William Isaac Kirby Jr. |**FirstName**: William Isaac</br></br>**LastName**: Kirby Jr. |
68+
| Henry Caleb Ross Sr | **FirstName**: Henry Caleb </br></br> **LastName**: Ross Sr |
6269

6370
## July 2021
6471

articles/azure-monitor/whats-new.md

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,84 @@ ms.date: 09/07/2021
99

1010
This article lists significant changes to Azure Monitor documentation.
1111

12+
## September, 2021
13+
### General
14+
15+
**Updated articles**
16+
17+
- [Deploy Azure Monitor at scale by using Azure Policy](deploy-scale.md)
18+
- [Azure Monitor partner integrations](partners.md)
19+
- [Resource Manager template samples for Azure Monitor](resource-manager-samples.md)
20+
- [Roles, permissions, and security in Azure Monitor](roles-permissions-security.md)
21+
- [Monitor usage and estimated costs in Azure Monitor](usage-estimated-costs.md)
22+
- [Visualize data from Azure Monitor](visualizations.md)
23+
### Agents
24+
25+
**Updated articles**
26+
27+
- [Azure Monitor agent overview](agents/azure-monitor-agent-overview.md)
28+
29+
### Application Insights
30+
31+
**New articles**
32+
33+
- [Application Monitoring for Azure App Service and ASP.NET](app/azure-web-apps-net.md)
34+
- [Application Monitoring for Azure App Service and Java](app/azure-web-apps-java.md)
35+
- [Application Monitoring for Azure App Service and ASP.NET Core](app/azure-web-apps-net-core.md)
36+
- [Application Monitoring for Azure App Service and Node.js](app/azure-web-apps-nodejs.md)
37+
38+
**Updated articles**
39+
40+
- [Application Monitoring for Azure App Service and ASP.NET](app/azure-web-apps-net.md)
41+
- [Filter and preprocess telemetry in the Application Insights SDK](app/api-filtering-sampling.md)
42+
- [Release notes for Microsoft.ApplicationInsights.SnapshotCollector](app/snapshot-collector-release-notes.md)
43+
- [What is auto-instrumentation for Azure Monitor application insights?](app/codeless-overview.md)
44+
- [Application Monitoring for Azure App Service Overview](app/azure-web-apps.md)
45+
46+
### Containers
47+
48+
**Updated articles**
49+
50+
- [Enable Container insights](containers/container-insights-onboard.md)
51+
52+
### Essentials
53+
54+
**Updated articles**
55+
56+
- [Supported metrics with Azure Monitor](essentials/metrics-supported.md)
57+
- [Supported categories for Azure Resource Logs](essentials/resource-logs-categories.md)
58+
- [Azure Activity log](essentials/activity-log.md)
59+
- [Azure Monitoring REST API walkthrough](essentials/rest-api-walkthrough.md)
60+
61+
62+
### Insights
63+
64+
**New articles**
65+
66+
- [Manage Application Insights components by using Azure CLI](insights/azure-cli-application-insights-component.md)
67+
68+
**Updated articles**
69+
70+
- [Azure Data Explorer Insights](insights/data-explorer.md)
71+
- [Agent Health solution in Azure Monitor](insights/solution-agenthealth.md)
72+
- [Monitoring solutions in Azure Monitor](insights/solutions.md)
73+
- [Monitor your SQL deployments with SQL insights (preview)](insights/sql-insights-overview.md)
74+
- [Troubleshoot SQL insights (preview)](insights/sql-insights-troubleshoot.md)
75+
76+
### Logs
77+
78+
**New articles**
79+
80+
- [Resource Manager template samples for Log Analytics clusters in Azure Monitor](logs/resource-manager-cluster.md)
81+
82+
**Updated articles**
83+
84+
- [Configure your Private Link](logs/private-link-configure.md)
85+
- [Azure Monitor customer-managed key](logs/customer-managed-keys.md)
86+
- [Azure Monitor Logs Dedicated Clusters](logs/logs-dedicated-clusters.md)
87+
- [Log Analytics workspace data export in Azure Monitor (preview)](logs/logs-data-export.md)
88+
- [Move a Log Analytics workspace to another region by using the Azure portal](logs/move-workspace-region.md)
89+
1290
## August, 2021
1391

1492
### Agents

articles/bastion/bastion-faq.md

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,24 @@ No, access to Windows Server VMs by Azure Bastion does not require an [RDS CAL](
7474

7575
### <a name="keyboard"></a>Which keyboard layouts are supported during the Bastion remote session?
7676

77-
Azure Bastion currently supports en-us-qwerty keyboard layout inside the VM. Support for other locales for keyboard layout is work in progress.
77+
Azure Bastion currently supports the following keyboard layouts inside the VM:
78+
* en-us-qwerty
79+
* en-gb-qwerty
80+
* de-ch-qwertz
81+
* de-de-qwertz
82+
* fr-be-azerty
83+
* fr-fr-azerty
84+
* fr-ch-qwertz
85+
* hu-hu-qwertz
86+
* it-it-qwerty
87+
* ja-jp-qwerty
88+
* pt-br-qwerty
89+
* es-es-qwerty
90+
* es-latam-qwerty
91+
* sv-se-qwerty
92+
* tr-tr-qwerty
93+
94+
The default keyboard layout in the target VM will match your local language, which can be changed in your local computer settings.
7895

7996
### <a name="timezone"></a>Does Azure Bastion support timezone configuration or timezone redirection for target VMs?
8097

articles/cognitive-services/Computer-vision/whats-new.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Computer Vision's [OCR (Read) API](overview-ocr.md) expands [supported languages
2525
* Enhancements for processing digital PDFs and Machine Readable Zone (MRZ) text in identity documents.
2626
* General performance and AI quality improvements
2727

28-
See the [OCR how-to guide](Vision-API-How-to-Topics/call-read-api.md) to learn how to use the new preview features.
28+
See the [OCR how-to guide](Vision-API-How-to-Topics/call-read-api.md#determine-how-to-process-the-data-optional) to learn how to use the new preview features.
2929

3030
> [!div class="nextstepaction"]
3131
> [Get Started with the Read API](./quickstarts-sdk/client-library.md)

0 commit comments

Comments
 (0)