Skip to content

Commit 31883e5

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into cosmo-db
2 parents 9018d02 + c316591 commit 31883e5

File tree

158 files changed

+4166
-273
lines changed

Some content is hidden

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

158 files changed

+4166
-273
lines changed

articles/active-directory/develop/includes/web-app/quickstart-aspnet-core.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ ms.custom: "devx-track-csharp, aaddev, identityplatformtop40, scenarios:getting-
1818

1919
In this quickstart, you download and run a code sample that demonstrates how an ASP.NET Core web app can sign in users from any Azure Active Directory (Azure AD) organization.
2020

21-
The following diagram shows how the sample app works:
22-
23-
![Diagram of the interaction between the web browser, the web app, and the Microsoft identity platform in the sample app.](../../media/quickstart-v2-aspnet-core-webapp/aspnetcorewebapp-intro.svg)
21+
See [How the sample works](#how-the-sample-works) for an illustration.
2422

2523
## Prerequisites
2624

@@ -48,7 +46,6 @@ The following diagram shows how the sample app works:
4846

4947
#### Step 2: Download the ASP.NET Core project
5048

51-
5249
[Download the ASP.NET Core solution](https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2/archive/aspnetcore3-1.zip)
5350

5451
[!INCLUDE [active-directory-develop-path-length-tip](../../../../../includes/active-directory-develop-path-length-tip.md)]
@@ -91,6 +88,10 @@ After consenting to the requested permissions, the app displays that you've succ
9188

9289
This section gives an overview of the code required to sign in users and call the Microsoft Graph API on their behalf. This overview can be useful to understand how the code works, main arguments, and also if you want to add sign-in to an existing ASP.NET Core application and call Microsoft Graph. It uses [Microsoft.Identity.Web](../../microsoft-identity-web.md), which is a wrapper around [MSAL.NET](../../msal-overview.md).
9390

91+
### How the sample works
92+
93+
![Diagram of the interaction between the web browser, the web app, and the Microsoft identity platform in the sample app.](../../media/quickstart-v2-aspnet-core-webapp/aspnetcorewebapp-intro.svg)
94+
9495
### Startup class
9596

9697
The *Microsoft.AspNetCore.Authentication* middleware uses a `Startup` class that's executed when the hosting process starts:

articles/active-directory/develop/includes/web-app/quickstart-aspnet.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@ ms.custom: "devx-track-csharp, aaddev, identityplatformtop40, scenarios:getting-
1616
# Customer intent: As an application developer, I want to see a sample ASP.NET web app that can sign in Azure AD users.
1717
---
1818

19-
In this quickstart, you download and run a code sample that demonstrates an ASP.NET web application that can sign in users with Azure Active Directory (Azure AD) accounts.
19+
In this quickstart, you download and run a code sample that demonstrates an ASP.NET web application that can sign in users with Azure Active Directory (Azure AD) accounts.
2020

21-
The following diagram shows how the sample app works:
22-
23-
![Diagram of the interaction between the web browser, the web app, and the Microsoft identity platform in the sample app.](../../media/quickstart-v2-aspnet-webapp/aspnetwebapp-intro.svg)
21+
See [How the sample works](#how-the-sample-works) for an illustration.
2422

2523
## Prerequisites
2624

@@ -55,13 +53,12 @@ If you want to manually configure your application and code sample, use the foll
5553

5654
#### Step 2: Download the project
5755

58-
59-
[Download the Visual Studio 2019 solution](https://github.com/AzureADQuickStarts/AppModelv2-WebApp-OpenIDConnect-DotNet/archive/master.zip)
56+
[Download the ASP.NET code sample](https://github.com/AzureADQuickStarts/AppModelv2-WebApp-OpenIDConnect-DotNet/archive/master.zip)
6057

6158
[!INCLUDE [active-directory-develop-path-length-tip](../../../../../includes/active-directory-develop-path-length-tip.md)]
6259

6360

64-
#### Step 3: Run your Visual Studio project
61+
#### Step 3: Run the project
6562

6663
1. Extract the .zip file to a local folder that's close to the root folder. For example, extract to *C:\Azure-Samples*.
6764

articles/active-directory/develop/includes/web-app/quickstart-nodejs.md

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,21 @@ Next, clone the sample repo and install the NPM modules.
5454

5555
From your shell or command line:
5656

57-
`$ git clone [email protected]:AzureADQuickStarts/AppModelv2-WebApp-OpenIDConnect-nodejs.git`
58-
57+
```
58+
$ git clone [email protected]:AzureADQuickStarts/AppModelv2-WebApp-OpenIDConnect-nodejs.git
59+
```
5960
or
6061

61-
`$ git clone https://github.com/AzureADQuickStarts/AppModelv2-WebApp-OpenIDConnect-nodejs.git`
62+
```
63+
$ git clone https://github.com/AzureADQuickStarts/AppModelv2-WebApp-OpenIDConnect-nodejs.git
64+
```
6265

6366
From the project root directory, run the command:
6467

65-
`$ npm install`
68+
```
69+
$ npm install
70+
71+
```
6672

6773
## Configure the application
6874

@@ -78,15 +84,15 @@ Provide the parameters in `exports.creds` in config.js as instructed.
7884
* Update `exports.destroySessionUrl` in config.js, if you want to use a different `post_logout_redirect_uri`.
7985

8086
* Set `exports.useMongoDBSessionStore` in config.js to true, if you want to use [mongoDB](https://www.mongodb.com) or other [compatible session stores](https://github.com/expressjs/session#compatible-session-stores).
81-
The default session store in this sample is `express-session`. The default session store is not suitable for production.
87+
The default session store in this sample is `express-session`. The default session store isn't suitable for production.
8288

8389
* Update `exports.databaseUri`, if you want to use mongoDB session store and a different database URI.
8490

8591
* Update `exports.mongoDBSessionMaxAge`. Here you can specify how long you want to keep a session in mongoDB. The unit is second(s).
8692

8793
## Build and run the application
8894

89-
Start mongoDB service. If you are using mongoDB session store in this app, you have to [install mongoDB](http://www.mongodb.org/) and start the service first. If you are using the default session store, you can skip this step.
95+
Start mongoDB service. If you're using mongoDB session store in this app, you have to [install mongoDB](http://www.mongodb.org/) and start the service first. If you're using the default session store, you can skip this step.
9096

9197
Run the app using the following command from your command line.
9298

@@ -104,7 +110,7 @@ $ node app.js | bunyan
104110

105111
### You're done!
106112

107-
You will have a server successfully running on `http://localhost:3000`.
113+
You'll have a server successfully running on `http://localhost:3000`.
108114

109115
[!INCLUDE [Help and support](../../../../../includes/active-directory-develop-help-support-include.md)]
110116

articles/azure-resource-manager/management/manage-resource-groups-cli.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.author: jgao
88
ms.custom: devx-track-azurecli
99
---
1010

11-
# Manage Azure Resource Manager resource groups by using Azure CLI
11+
# Manage Azure Resource Groups by using Azure CLI
1212

1313
Learn how to use Azure CLI with [Azure Resource Manager](overview.md) to manage your Azure resource groups. For managing Azure resources, see [Manage Azure resources by using Azure CLI](manage-resources-cli.md).
1414

@@ -114,4 +114,4 @@ To manage access to a resource group, use [Azure role-based access control (Azur
114114
## Next steps
115115

116116
- To learn Azure Resource Manager, see [Azure Resource Manager overview](overview.md).
117-
- To learn the Resource Manager template syntax, see [Understand the structure and syntax of Azure Resource Manager templates](../templates/syntax.md).
117+
- To learn the Resource Manager template syntax, see [Understand the structure and syntax of Azure Resource Manager templates](../templates/syntax.md).

articles/azure-resource-manager/management/manage-resource-groups-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.author: jgao
88
ms.custom: devx-track-azurepowershell
99

1010
---
11-
# Manage Azure Resource Manager resource groups by using Azure PowerShell
11+
# Manage Azure Resource Groups by using Azure PowerShell
1212

1313
Learn how to use Azure PowerShell with [Azure Resource Manager](overview.md) to manage your Azure resource groups. For managing Azure resources, see [Manage Azure resources by using Azure PowerShell](manage-resources-powershell.md).
1414

articles/azure-web-pubsub/quickstart-serverless.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,14 +383,14 @@ Use the following commands to create these items.
383383
```bash
384384
az functionapp create --resource-group WebPubSubFunction --consumption-plan-location <REGION> --runtime node --runtime-version 14 --functions-version 3 --name <FUNCIONAPP_NAME> --storage-account <STORAGE_NAME>
385385
```
386+
> [!NOTE]
387+
> If you're running the function version other than v3.0, please check [Azure Functions runtime versions documentation](../azure-functions/functions-versions.md#languages) to set `--runtime-version` parameter to supported value.
386388
387389
# [C#](#tab/csharp)
388390
389391
```bash
390392
az functionapp create --resource-group WebPubSubFunction --consumption-plan-location <REGION> --runtime dotnet --functions-version 3 --name <FUNCIONAPP_NAME> --storage-account <STORAGE_NAME>
391393
```
392-
> [!NOTE]
393-
> If you're running the function version other than v3.0, please check [Azure Functions runtime versions documentation](../azure-functions/functions-versions.md#languages) to set `--runtime` parameter to supported value.
394394
395395
1. Deploy the function project to Azure:
396396

articles/azure-web-pubsub/tutorial-serverless-notification.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -370,14 +370,14 @@ Use the following commands to create these item.
370370
```bash
371371
az functionapp create --resource-group WebPubSubFunction --consumption-plan-location <REGION> --runtime node --runtime-version 14 --functions-version 3 --name <FUNCIONAPP_NAME> --storage-account <STORAGE_NAME>
372372
```
373+
> [!NOTE]
374+
> If you're running the function version other than v3.0, please check [Azure Functions runtime versions documentation](../azure-functions/functions-versions.md#languages) to set `--runtime-version` parameter to supported value.
373375
374376
# [C#](#tab/csharp)
375377
376378
```bash
377379
az functionapp create --resource-group WebPubSubFunction --consumption-plan-location <REGION> --runtime dotnet --functions-version 3 --name <FUNCIONAPP_NAME> --storage-account <STORAGE_NAME>
378380
```
379-
> [!NOTE]
380-
> If you're running the function version other than v3.0, please check [Azure Functions runtime versions documentation](../azure-functions/functions-versions.md#languages) to set `--runtime` parameter to supported value.
381381
382382
1. Deploy the function project to Azure:
383383

articles/data-factory/connector-rest.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.service: data-factory
77
ms.subservice: data-movement
88
ms.custom: synapse
99
ms.topic: conceptual
10-
ms.date: 02/21/2022
10+
ms.date: 02/28/2022
1111
ms.author: makromer
1212
---
1313

@@ -547,11 +547,11 @@ baseUrl/api/now/table/incident?sysparm_limit=1000&sysparm_offset=10000
547547

548548
*Step 1*: Input `sysparm_offset={offset}` either in **Base URL** or **Relative URL** as shown in the following screenshots:
549549

550-
:::image type="content" source="media/connector-rest/pagination-rule-example-1-rest-linked-service-base-url.png" alt-text="Screenshot showing one configuration to send multiple requests whose variables are in QueryParameters.":::
550+
:::image type="content" source="media/connector-rest/pagination-rule-example-1-rest-linked-service-base-url.png" alt-text="Screenshot showing one configuration to send multiple requests whose variables are in Query Parameters.":::
551551

552552
or
553553

554-
:::image type="content" source="media/connector-rest/pagination-rule-example-1-rest-linked-service-relative-url.png" alt-text="Screenshot showing another configuration to send multiple requests whose variables are in QueryParameters.":::
554+
:::image type="content" source="media/connector-rest/pagination-rule-example-1-rest-linked-service-relative-url.png" alt-text="Screenshot showing another configuration to send multiple requests whose variables are in Query Parameters.":::
555555

556556
*Step 2*: Set **Pagination rules** as either option 1 or option 2:
557557

@@ -574,11 +574,11 @@ BaseUrl/api/now/table/t100
574574

575575
*Step 1*: Input `{id}` either in **Base URL** in the linked service configuration page or **Relative URL** in the dataset connection pane.
576576

577-
:::image type="content" source="media/connector-rest/pagination-rule-example-2-rest-linked-service-base-url.png" alt-text="Screenshot showing one configuration to send multiple requests whose variables are in AbsoluteUrl.":::
577+
:::image type="content" source="media/connector-rest/pagination-rule-example-2-rest-linked-service-base-url.png" alt-text="Screenshot showing one configuration to send multiple requests whose variables are in Absolute Url.":::
578578

579579
or
580580

581-
:::image type="content" source="media/connector-rest/pagination-rule-example-2-rest-linked-service-relative-url.png" alt-text="Screenshot showing another configuration to send multiple requests whose variables are in AbsoluteUrl.":::
581+
:::image type="content" source="media/connector-rest/pagination-rule-example-2-rest-linked-service-relative-url.png" alt-text="Screenshot showing another configuration to send multiple requests whose variables are in Absolute Url.":::
582582

583583
*Step 2*: Set **Pagination rules** as **"AbsoluteUrl.{id}" :"RANGE:1:100:1"**.
584584

@@ -655,7 +655,7 @@ Response 2:
655655
```
656656
Set the end condition rule as **"EndCondition:$.data": "Empty"** to end the pagination when the value of the specific node in response is empty.
657657

658-
:::image type="content" source="media/connector-rest/pagination-rule-example-4-1.png" alt-text="Screenshot showing the EndCondition setting for Example 4.1.":::
658+
:::image type="content" source="media/connector-rest/pagination-rule-example-4-1.png" alt-text="Screenshot showing the End Condition setting for Example 4.1.":::
659659

660660
- **Example 4.2: The pagination ends when the value of the specific node in response dose not exist**
661661

@@ -666,7 +666,7 @@ Response 2:
666666
```
667667
Set the end condition rule as **"EndCondition:$.data": "NonExist"** to end the pagination when the value of the specific node in response dose not exist.
668668

669-
:::image type="content" source="media/connector-rest/pagination-rule-example-4-2.png" alt-text="Screenshot showing the EndCondition setting for Example 4.2.":::
669+
:::image type="content" source="media/connector-rest/pagination-rule-example-4-2.png" alt-text="Screenshot showing the End Condition setting for Example 4.2.":::
670670

671671
- **Example 4.3: The pagination ends when the value of the specific node in response exists**
672672

@@ -685,7 +685,7 @@ Response 2:
685685
```
686686
Set the end condition rule as **"EndCondition:$.Complete": "Exist"** to end the pagination when the value of the specific node in response exists.
687687

688-
:::image type="content" source="media/connector-rest/pagination-rule-example-4-3.png" alt-text="Screenshot showing the EndCondition setting for Example 4.3.":::
688+
:::image type="content" source="media/connector-rest/pagination-rule-example-4-3.png" alt-text="Screenshot showing the End Condition setting for Example 4.3.":::
689689

690690
- **Example 4.4: The pagination ends when the value of the specific node in response is a user-defined const value**
691691

@@ -718,7 +718,7 @@ Response 2:
718718
```
719719
Set the end condition rule as **"EndCondition:$.Complete": "Const:true"** to end the pagination when the value of the specific node in response is a user-defined const value.
720720

721-
:::image type="content" source="media/connector-rest/pagination-rule-example-4-4.png" alt-text="Screenshot showing the EndCondition setting for Example 4.4.":::
721+
:::image type="content" source="media/connector-rest/pagination-rule-example-4-4.png" alt-text="Screenshot showing the End Condition setting for Example 4.4.":::
722722

723723
- **Example 4.5: The pagination ends when the value of the header key in response equals to user-defined const value**
724724

@@ -730,7 +730,7 @@ Response 2:
730730

731731
Set the end condition rule as **"EndCondition:headers.Complete": "Const:1"** to end the pagination when the value of the header key in response is equal to user-defined const value.
732732

733-
:::image type="content" source="media/connector-rest/pagination-rule-example-4-5.png" alt-text="Screenshot showing the EndCondition setting for Example 4.5.":::
733+
:::image type="content" source="media/connector-rest/pagination-rule-example-4-5.png" alt-text="Screenshot showing the End Condition setting for Example 4.5.":::
734734

735735
- **Example 4.6: The pagination ends when the key exists in the response header**
736736

@@ -742,7 +742,7 @@ Response 2:
742742

743743
Set the end condition rule as **"EndCondition:headers.CompleteTime": "Exist"** to end the pagination when the key exists in the response header.
744744

745-
:::image type="content" source="media/connector-rest/pagination-rule-example-4-6.png" alt-text="Screenshot showing the EndCondition setting for Example 4.6.":::
745+
:::image type="content" source="media/connector-rest/pagination-rule-example-4-6.png" alt-text="Screenshot showing the End Condition setting for Example 4.6.":::
746746

747747
#### Example 5:Set end condition to avoid endless requests when range rule is not defined
748748

@@ -802,18 +802,18 @@ The last response is:
802802

803803
Set **MaxRequestNumber** to avoid endless request as shown in the following screenshot:
804804

805-
:::image type="content" source="media/connector-rest/pagination-rule-example-6.png" alt-text="Screenshot showing the MaxRequestNumber setting for Example 6.":::
805+
:::image type="content" source="media/connector-rest/pagination-rule-example-6.png" alt-text="Screenshot showing the Max Request Number setting for Example 6.":::
806806

807807
#### Example 7:The RFC 5988 pagination rule is supported by default
808808

809809
The backend will automatically get the next URL based on the RFC 5988 style links in the header.
810810

811-
:::image type="content" source="media/connector-rest/pagination-rule-example-7-http-header.png" alt-text="Screenshot showing samples of the http header that complies with RFC 5988.":::
811+
:::image type="content" source="media/connector-rest/pagination-rule-example-7-http-header.png" alt-text="Screenshot showing samples of the http header that complies with R F C 5988.":::
812812

813813
> [!TIP]
814814
> If you don't want to enable this default pagination rule, you can set `supportRFC5988` to `false` or just delete it in the script.
815815
>
816-
> :::image type="content" source="media/connector-rest/pagination-rule-example-7-disable-rfc5988.png" alt-text="Screenshot showing how to disable RFC 5988 setting for Example 7.":::
816+
> :::image type="content" source="media/connector-rest/pagination-rule-example-7-disable-rfc5988.png" alt-text="Screenshot showing how to disable R F C 5988 setting for Example 7.":::
817817
818818
#### Example 8: The next request URL is from the response body when use pagination in mapping data flows
819819

@@ -844,7 +844,7 @@ But if the value of **@odata.nextLink** in the last response body is equal to th
844844
This example states how to set the pagination rule in mapping data flows when the response format is XML and the next request URL is from the response body. As shown in the following screenshot, the first URL is *https://\<user\>.dfs.core.windows.net/bugfix/test/movie_1.xml*
845845

846846

847-
:::image type="content" source="media/connector-rest/pagination-rule-example-9-situation.png" alt-text="Screenshot showing the response format is XML and the next request URL is from the response body.":::
847+
:::image type="content" source="media/connector-rest/pagination-rule-example-9-situation.png" alt-text="Screenshot showing the response format is X M L and the next request U R L is from the response body.":::
848848

849849

850850
The response schema is shown below:

articles/expressroute/expressroute-monitoring-metrics-alerts.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,10 @@ You can view near to real-time availability of BGP (Layer-3 connectivity) across
112112

113113
:::image type="content" source="./media/expressroute-monitoring-metrics-alerts/erBgpAvailabilityMetrics.jpg" alt-text="BGP availability per peer":::
114114

115+
>[!NOTE]
116+
>During maintenance between the Microsoft edge and core network, BGP availability will appear down even if the BGP session between the customer edge and Microsoft edge remains up. For information about maintenance between the Microsoft edge and core network, make sure to have your [maintenance alerts turned on and configured](./maintenance-alerts.md).
117+
>
118+
115119
### <a name = "arp"></a>ARP Availability - Split by Peering
116120

117121
Aggregation type: *Avg*

articles/expressroute/expressroute-network-insights.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ The *Availability* tab tracks ARP and BGP availability, plotting the data for bo
5252

5353
:::image type="content" source="./media/expressroute-network-insights/arp-bgp-availability.png" alt-text="Screenshot of availability metric graphs." lightbox="./media/expressroute-network-insights/arp-bgp-availability-expanded.png":::
5454

55+
>[!NOTE]
56+
>During maintenance between the Microsoft edge and core network, BGP availability will appear down even if the BGP session between the customer edge and Microsoft edge remains up. For information about maintenance between the Microsoft edge and core network, make sure to have your [maintenance alerts turned on and configured](./maintenance-alerts.md).
57+
>
58+
5559
### Throughput
5660

5761
Similarly, the *Throughput* tab plots the total throughput of ingress and egress traffic for the circuit in bits/second. You can also view throughput for individual connections and each type of configured peering.

0 commit comments

Comments
 (0)