Skip to content

Commit dfaec35

Browse files
committed
Merge branch 'master' of https://github.com/Microsoft/azure-docs-pr into oct0819
2 parents f46c7a5 + 84c6d60 commit dfaec35

19 files changed

+57
-45
lines changed

articles/app-service/app-service-web-tutorial-connect-msi.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,9 @@ conn.AccessToken = (new Microsoft.Azure.Services.AppAuthentication.AzureServiceT
184184
185185
That's every thing you need to connect to SQL Database. When debugging in Visual Studio, your code uses the Azure AD user you configured in [Set up Visual Studio](#set-up-visual-studio). You'll set up the SQL Database server later to allow connection from the managed identity of your App Service app. The `AzureServiceTokenProvider` class caches the token in memory and retrieves it from Azure AD just before expiration. You don't need any custom code to refresh the token.
186186

187+
> [!TIP]
188+
> If the Azure AD user you configured has access to multiple tenants, call `GetAccessTokenAsync("https://database.windows.net/", tenantid)` with the desired tenant ID to retrieve the proper access token.
189+
187190
Type `Ctrl+F5` to run the app again. The same CRUD app in your browser is now connecting to the Azure SQL Database directly, using Azure AD authentication. This setup lets you run database migrations from Visual Studio.
188191

189192
## Use managed identity connectivity

articles/app-service/app-service-web-tutorial-custom-ssl.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,17 +231,26 @@ The following command adds an SNI-based SSL binding, using the thumbprint from t
231231
```azurecli-interactive
232232
az webapp config ssl bind \
233233
--name <app-name> \
234-
--resource-group <resource-group-name>
234+
--resource-group <resource-group-name> \
235235
--certificate-thumbprint $thumbprint \
236236
--ssl-type SNI \
237237
```
238238

239+
The following command forces the app to use https.
240+
241+
```azurecli-interactive
242+
az webapp update \
243+
--name <app-name> \
244+
--resource-group <resource-group-name> \
245+
--https-only true
246+
```
247+
239248
The following command enforces minimum TLS version of 1.2.
240249

241250
```azurecli-interactive
242251
az webapp config set \
243252
--name <app-name> \
244-
--resource-group <resource-group-name>
253+
--resource-group <resource-group-name> \
245254
--min-tls-version 1.2
246255
```
247256

articles/application-gateway/application-gateway-autoscaling-zone-redundant.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: application-gateway
55
author: vhorne
66
ms.service: application-gateway
77
ms.topic: article
8-
ms.date: 6/13/2019
8+
ms.date: 10/09/2019
99
ms.author: victorh
1010
---
1111

@@ -30,7 +30,7 @@ The new v2 SKU includes the following enhancements:
3030

3131
## Supported regions
3232

33-
The Standard_v2 and WAF_v2 SKU is available in the following regions: North Central US, South Central US, West US, West US 2, East US, East US 2, Central US, North Europe, West Europe, Southeast Asia, France Central, UK West, Japan East, Japan West, Australia East, Australia Southeast, Canada Central, Canada East, East Asia, Korea Central, Korea South, South India, UK South, Central India, West India, South India.
33+
The Standard_v2 and WAF_v2 SKU is available in the following regions: North Central US, South Central US, West US, West US 2, East US, East US 2, Central US, North Europe, West Europe, Southeast Asia, France Central, UK West, Japan East, Japan West, Australia East, Australia Southeast, Brazil South, Canada Central, Canada East, East Asia, Korea Central, Korea South, South India, UK South, Central India, West India, South India.
3434

3535
## Pricing
3636

articles/application-gateway/application-gateway-diagnostics.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: application-gateway
55
author: vhorne
66
ms.service: application-gateway
77
ms.topic: article
8-
ms.date: 3/28/2019
8+
ms.date: 10/09/2019
99
ms.author: victorh
1010

1111
---
@@ -342,7 +342,7 @@ The firewall log is generated only if you have enabled it for each application g
342342
You can view and analyze activity log data by using any of the following methods:
343343

344344
* **Azure tools**: Retrieve information from the activity log through Azure PowerShell, the Azure CLI, the Azure REST API, or the Azure portal. Step-by-step instructions for each method are detailed in the [Activity operations with Resource Manager](../azure-resource-manager/resource-group-audit.md) article.
345-
* **Power BI**: If you don't already have a [Power BI](https://powerbi.microsoft.com/pricing) account, you can try it for free. By using the [Azure Activity Logs content pack for Power BI](https://powerbi.microsoft.com/en-us/documentation/powerbi-content-pack-azure-audit-logs/), you can analyze your data with preconfigured dashboards that you can use as is or customize.
345+
* **Power BI**: If you don't already have a [Power BI](https://powerbi.microsoft.com/pricing) account, you can try it for free. By using the [Power BI template apps](https://docs.microsoft.com/power-bi/service-template-apps-overview), you can analyze your data.
346346

347347
### View and analyze the access, performance, and firewall logs
348348

articles/azure-functions/durable/durable-functions-eternal-orchestrations.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public static async Task<HttpResponseMessage> OrchestrationTrigger(
8282
{
8383
string instanceId = "StaticId";
8484
// Null is used as the input, since there is no input in "Periodic_Cleanup_Loop".
85-
await client.StartNewAsync("Periodic_Cleanup_Loop"), instanceId, null);
85+
await client.StartNewAsync("Periodic_Cleanup_Loop", instanceId, null);
8686
return client.CreateCheckStatusResponse(request, instanceId);
8787
}
8888
```
@@ -96,4 +96,4 @@ If an orchestrator function is in an infinite loop and needs to be stopped, use
9696
## Next steps
9797

9898
> [!div class="nextstepaction"]
99-
> [Learn how to implement singleton orchestrations](durable-functions-singletons.md)
99+
> [Learn how to implement singleton orchestrations](durable-functions-singletons.md)

articles/azure-functions/functions-bindings-microsoft-graph.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1083,11 +1083,11 @@ module.exports = function (context) {
10831083

10841084
### Webhook trigger - attributes
10851085

1086-
In [C# class libraries](functions-dotnet-class-library.md), use the [GraphWebHookTrigger](https://github.com/Azure/azure-functions-microsoftgraph-extension/blob/master/src/MicrosoftGraphBinding/Bindings/GraphWebHookTriggerAttribute.cs) attribute.
1086+
In [C# class libraries](functions-dotnet-class-library.md), use the [GraphWebhookTrigger](https://github.com/Azure/azure-functions-microsoftgraph-extension/blob/master/src/MicrosoftGraphBinding/Bindings/GraphWebhookTriggerAttribute.cs) attribute.
10871087

10881088
### Webhook trigger - configuration
10891089

1090-
The following table explains the binding configuration properties that you set in the *function.json* file and the `GraphWebHookTrigger` attribute.
1090+
The following table explains the binding configuration properties that you set in the *function.json* file and the `GraphWebhookTrigger` attribute.
10911091

10921092
|function.json property | Attribute property |Description|
10931093
|---------|---------|----------------------|
@@ -1235,11 +1235,11 @@ module.exports = function (context, req) {
12351235

12361236
### Webhook input - attributes
12371237

1238-
In [C# class libraries](functions-dotnet-class-library.md), use the [GraphWebHookSubscription](https://github.com/Azure/azure-functions-microsoftgraph-extension/blob/master/src/MicrosoftGraphBinding/Bindings/GraphWebHookSubscriptionAttribute.cs) attribute.
1238+
In [C# class libraries](functions-dotnet-class-library.md), use the [GraphWebhookSubscription](https://github.com/Azure/azure-functions-microsoftgraph-extension/blob/master/src/MicrosoftGraphBinding/Bindings/GraphWebhookSubscriptionAttribute.cs) attribute.
12391239

12401240
### Webhook input - configuration
12411241

1242-
The following table explains the binding configuration properties that you set in the *function.json* file and the `GraphWebHookSubscription` attribute.
1242+
The following table explains the binding configuration properties that you set in the *function.json* file and the `GraphWebhookSubscription` attribute.
12431243

12441244
|function.json property | Attribute property |Description|
12451245
|---------|---------|----------------------|
@@ -1376,11 +1376,11 @@ module.exports = function (context, req) {
13761376

13771377
### Webhook output - attributes
13781378

1379-
In [C# class libraries](functions-dotnet-class-library.md), use the [GraphWebHookSubscription](https://github.com/Azure/azure-functions-microsoftgraph-extension/blob/master/src/MicrosoftGraphBinding/Bindings/GraphWebHookSubscriptionAttribute.cs) attribute.
1379+
In [C# class libraries](functions-dotnet-class-library.md), use the [GraphWebhookSubscription](https://github.com/Azure/azure-functions-microsoftgraph-extension/blob/master/src/MicrosoftGraphBinding/Bindings/GraphWebhookSubscriptionAttribute.cs) attribute.
13801380

13811381
### Webhook output - configuration
13821382

1383-
The following table explains the binding configuration properties that you set in the *function.json* file and the `GraphWebHookSubscription` attribute.
1383+
The following table explains the binding configuration properties that you set in the *function.json* file and the `GraphWebhookSubscription` attribute.
13841384

13851385
|function.json property | Attribute property |Description|
13861386
|---------|---------|----------------------|

articles/azure-monitor/app/worker-service.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Application Insights for Worker Service apps (non-HTTP apps) | Microsoft
33
description: Monitoring .NET Core/.NET Framework non-HTTP apps with Application Insights.
44
services: application-insights
55
documentationcenter: .net
6-
author: cithomas
6+
author: cijothomas
77
manager: carmonm
88
ms.assetid: 3b722e47-38bd-4667-9ba4-65b7006c074c
99
ms.service: application-insights
@@ -93,9 +93,9 @@ Full example is shared [here](https://github.com/microsoft/ApplicationInsights-H
9393
{
9494
_logger.LogWarning("A sample warning message. By default, logs with severity Warning or higher is captured by Application Insights");
9595
_logger.LogInformation("Calling bing.com");
96-
var res = await httpClient.GetAsync("https://bing.com");
96+
var res = await _httpClient.GetAsync("https://bing.com");
9797
_logger.LogInformation("Calling bing completed with status:" + res.StatusCode);
98-
telemetryClient.TrackEvent("Bing call event completed");
98+
_telemetryClient.TrackEvent("Bing call event completed");
9999
}
100100

101101
await Task.Delay(1000, stoppingToken);

articles/azure-resource-manager/template-tutorial-add-tags.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ After deploying these resources, you might need to track costs and find resource
3131

3232
## Add tags
3333

34-
You tag resources to add values that help you identify their use. For example, you can add tags that mark the environment and the project. You could add tags that identify a cost center or the team that owns the resource. Add any values that make sense for your organization.
34+
You tag resources to add values that help you identify their use. For example, you can add tags that list the environment and the project. You could add tags that identify a cost center or the team that owns the resource. Add any values that make sense for your organization.
3535

3636
The following example highlights the changes to the template. Copy the whole file and replace your template with its contents.
3737

3838
[!code-json[](~/resourcemanager-templates/get-started-with-templates/add-tags/azuredeploy.json?range=1-118&highlight=46-52,64,78,100)]
3939

40-
## Deploy template
40+
## Deploy the template
4141

42-
It's time to deploy the template and look at the returned value.
42+
It's time to deploy the template and look at the results.
4343

4444
If you haven't created the resource group, see [Create resource group](template-tutorial-create-first-template.md#create-resource-group). The example assumes you've set the **templateFile** variable to the path to the template file, as shown in the [first tutorial](template-tutorial-create-first-template.md#deploy-template).
4545

@@ -94,4 +94,4 @@ If you're stopping now, you might want to clean up the resources you deployed by
9494
In this tutorial, you added tags to the resources. In the next tutorial, you'll learn how to use parameter files to simplify passing in values to the template.
9595

9696
> [!div class="nextstepaction"]
97-
> [Use parameter file](template-tutorial-use-parameter-file.md)
97+
> [Use parameter file](template-tutorial-use-parameter-file.md)

articles/azure-resource-manager/template-tutorial-export-template.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ This template works well for deploying storage accounts, but you might want to a
4242
- **Name**: enter a name for the App service plan.
4343
- **Operating System**: select **Linux**.
4444
- **Region**: select an Azure location. For example, **Central US**.
45-
- **Pricing tier**: to save costs, change the SKU to **Basic**.
45+
- **Pricing tier**: to save costs, change the SKU to **Basic B1** (under Dev/Test).
4646

4747
![Resource Manager template export template portal](./media/template-tutorial-export-template/resource-manager-template-export.png)
4848
1. Select **Review and create**.
4949
1. Select **Create**. It takes a few moments to create the resource.
5050

51-
## Export template
51+
## Export the template
5252

5353
1. Select **Go to resource**.
5454

@@ -58,7 +58,7 @@ This template works well for deploying storage accounts, but you might want to a
5858

5959
![Resource Manager template export template](./media/template-tutorial-export-template/resource-manager-template-export-template.png)
6060

61-
The export template feature takes the current state of a resource and generates a template to deploy it. Exporting a template can be a helpful of quickly getting the JSON you need to deploy a resource.
61+
The export template feature takes the current state of a resource and generates a template to deploy it. Exporting a template can be a helpful way of quickly getting the JSON you need to deploy a resource.
6262

6363
1. Copy the **Microsoft.Web/serverfarms** definition and the parameter definition to your template.
6464

@@ -67,7 +67,7 @@ This template works well for deploying storage accounts, but you might want to a
6767
> [!IMPORTANT]
6868
> Typically, the exported template is more verbose than you might want when creating a template. For example, the SKU object in the exported template has five properties. This template works, but you could just use the **name** property. You can start with the exported template, and then modify it as you like to fit your requirements.
6969
70-
## Revise existing template
70+
## Revise the existing template
7171

7272
The exported template gives you most of the JSON you need, but you need to customize it for your template. Pay particular attention to differences in parameters and variables between your template and the exported template. Obviously, the export process doesn't know the parameters and variables that you've already defined in your template.
7373

@@ -77,7 +77,7 @@ Copy the whole file and replace your template with its contents.
7777

7878
[!code-json[](~/resourcemanager-templates/get-started-with-templates/export-template/azuredeploy.json?range=1-77&highlight=28-31,50-69)]
7979

80-
## Deploy template
80+
## Deploy the template
8181

8282
Use either Azure CLI or Azure PowerShell to deploy a template.
8383

@@ -131,4 +131,4 @@ If you're stopping now, you might want to clean up the resources you deployed by
131131
You learned how to export a template from the Azure portal, and how to use the exported template for your template development. You can also use the Azure Quickstart templates to simplify template development.
132132

133133
> [!div class="nextstepaction"]
134-
> [Use Azure Quickstart templates](template-tutorial-quickstart-template.md)
134+
> [Use Azure Quickstart templates](template-tutorial-quickstart-template.md)

articles/azure-resource-manager/template-tutorial-use-parameter-file.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ This file is your parameter file for the production environment. Notice that it
4747

4848
## Deploy the template
4949

50-
Use either Azure CLI or Azure PowerShell to deploy a template.
50+
Use either Azure CLI or Azure PowerShell to deploy the template.
5151

52-
As final test of your template, let's create two new resource groups. One for the dev environment and on for the production environment.
52+
As a final test of your template, let's create two new resource groups. One for the dev environment and one for the production environment.
5353

5454
First, we'll deploy to the dev environment.
5555

@@ -79,7 +79,7 @@ az group deployment create \
7979
--name devenvironment \
8080
--resource-group myResourceGroupDev \
8181
--template-file $templateFile \
82-
--parameters @azuredeploy.parameters.dev.json
82+
--parameters azuredeploy.parameters.dev.json
8383
```
8484

8585
---
@@ -110,14 +110,14 @@ az group deployment create \
110110
--name prodenvironment \
111111
--resource-group myResourceGroupProd \
112112
--template-file $templateFile \
113-
--parameters @azuredeploy.parameters.prod.json
113+
--parameters azuredeploy.parameters.prod.json
114114
```
115115

116116
---
117117

118-
## Verify deployment
118+
## Verify the deployment
119119

120-
You can verify the deployment by exploring the resource group from the Azure portal.
120+
You can verify the deployment by exploring the resource groups from the Azure portal.
121121

122122
1. Sign in to the [Azure portal](https://portal.azure.com).
123123
1. From the left menu, select **Resource groups**.
@@ -138,4 +138,4 @@ Congratulations, you've finished this introduction to deploying templates to Azu
138138
You're ready to jump into more advanced concepts about templates. The next tutorial goes into more detail about using template reference documentation to help with defining resources to deploy.
139139

140140
> [!div class="nextstepaction"]
141-
> [Utilize template reference](resource-manager-tutorial-create-encrypted-storage-accounts.md)
141+
> [Utilize template reference](resource-manager-tutorial-create-encrypted-storage-accounts.md)

0 commit comments

Comments
 (0)