Skip to content

Commit a74f725

Browse files
author
Owen Duncan
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into aas-autoscale
2 parents aea1951 + 5f22202 commit a74f725

31 files changed

+757
-138
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3258,6 +3258,11 @@
32583258
"redirect_url": "/azure/iot-edge/how-to-register-device",
32593259
"redirect_document_id": false
32603260
},
3261+
{
3262+
"source_path": "articles/iot-edge/how-to-install-production-certificates.md",
3263+
"redirect_url": "/azure/iot-edge/how-to-manage-device-certificates",
3264+
"redirect_document_id": true
3265+
},
32613266
{
32623267
"source_path": "articles/cognitive-services/cognitive-services-recommendations-quick-start.md",
32633268
"redirect_url": "/azure/cognitive-services/recommendations/overview",

articles/active-directory/fundamentals/concept-fundamentals-security-defaults.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ One common method to improve protection for all users is to require a stronger f
6666

6767
To give your users easy access to your cloud apps, Azure AD supports a variety of authentication protocols, including legacy authentication. *Legacy authentication* is a term that refers to an authentication request made by:
6868

69-
- Older Office clients that don't use modern authentication (for example, an Office 2010 client).
69+
- Clients that don't use modern authentication (for example, an Office 2010 client).
7070
- Any client that uses older mail protocols such as IMAP, SMTP, or POP3.
7171

7272
Today, the majority of compromising sign-in attempts come from legacy authentication. Legacy authentication does not support Multi-Factor Authentication. Even if you have a Multi-Factor Authentication policy enabled on your directory, an attacker can authenticate by using an older protocol and bypass Multi-Factor Authentication.

articles/app-service/containers/deploy-container-github-action.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ az ad sp create-for-rbac --name "myApp" --role contributor \
3636
--scopes /subscriptions/{subscription-id}/resourceGroups/{resource-group} \
3737
--sdk-auth
3838
39-
# Replace {subscription-id}, {resource-group} with the subscription, resource group details of the WebApp
39+
# Replace {subscription-id}, {resource-group} with the subscription, resource group details of the WebApp
4040
```
4141

4242
The output is a JSON object with the role assignment credentials that provide access to your App Service app similar to below. Copy this JSON object to authenticate from GitHub.
4343

44-
```azurecli
44+
```output
4545
{
4646
"clientId": "<GUID>",
4747
"clientSecret": "<GUID>",

articles/automation/automation-linux-hrw-install.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Azure Automation Linux Hybrid Runbook Worker
33
description: This article provides information on installing an Azure Automation Hybrid Runbook Worker so you can run runbooks on Linux-based computers in your local datacenter or cloud environment.
44
services: automation
55
ms.subservice: process-automation
6-
ms.date: 06/28/2018
6+
ms.date: 03/02/2020
77
ms.topic: conceptual
88
---
99
# Deploy a Linux Hybrid Runbook Worker
@@ -21,7 +21,7 @@ The Hybrid Runbook Worker feature supports the following distributions:
2121
* Oracle Linux 5, 6, and 7 (x86/x64)
2222
* Red Hat Enterprise Linux Server 5, 6, and 7 (x86/x64)
2323
* Debian GNU/Linux 6, 7, and 8 (x86/x64)
24-
* Ubuntu 12.04 LTS, 14.04 LTS, and 16.04 LTS (x86/x64)
24+
* Ubuntu 12.04 LTS, 14.04 LTS, 16.04 LTS, and 18.04 (x86/x64)
2525
* SUSE Linux Enterprise Server 11 and 12 (x86/x64)
2626

2727
## Installing a Linux Hybrid Runbook Worker

articles/azure-resource-manager/templates/cross-resource-group-deployment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ az group deployment create \
350350

351351
The output from the preceding example is:
352352

353-
```azurecli
353+
```output
354354
"outputs": {
355355
"defaultScopeRG": {
356356
"type": "String",

articles/azure-resource-manager/templates/deploy-cli.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ az group deployment create \
5757

5858
The deployment can take a few minutes to complete. When it finishes, you see a message that includes the result:
5959

60-
```azurecli
60+
```output
6161
"provisioningState": "Succeeded",
6262
```
6363

@@ -177,7 +177,7 @@ az group deployment validate \
177177

178178
If no errors are detected, the command returns information about the test deployment. In particular, notice that the **error** value is null.
179179

180-
```azurecli
180+
```output
181181
{
182182
"error": null,
183183
"properties": {
@@ -186,7 +186,7 @@ If no errors are detected, the command returns information about the test deploy
186186

187187
If an error is detected, the command returns an error message. For example, passing an incorrect value for the storage account SKU, returns the following error:
188188

189-
```azurecli
189+
```output
190190
{
191191
"error": {
192192
"code": "InvalidTemplate",
@@ -202,7 +202,7 @@ If an error is detected, the command returns an error message. For example, pass
202202

203203
If your template has a syntax error, the command returns an error indicating it couldn't parse the template. The message indicates the line number and position of the parsing error.
204204

205-
```azurecli
205+
```output
206206
{
207207
"error": {
208208
"code": "InvalidTemplate",

articles/azure-resource-manager/templates/deploy-to-management-group.md

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@
22
title: Deploy resources to management group
33
description: Describes how to deploy resources at the management group scope in an Azure Resource Manager template.
44
ms.topic: conceptual
5-
ms.date: 02/10/2020
5+
ms.date: 03/02/2020
66
---
77

88
# Create resources at the management group level
99

1010
Typically, you deploy Azure resources to a resource group in your Azure subscription. However, you can also create resources at the management group level. You use management group level deployments to take actions that make sense at that level, such as assigning [role-based access control](../../role-based-access-control/overview.md) or applying [policies](../../governance/policy/overview.md).
1111

12-
Currently, to deploy templates at the management group level, you must use the REST API.
13-
1412
## Supported resources
1513

1614
You can deploy the following resource types at the management group level:
@@ -40,7 +38,16 @@ https://schema.management.azure.com/schemas/2019-08-01/managementGroupDeployment
4038

4139
## Deployment commands
4240

43-
The command for management group deployments is different than the command for resource group deployments.
41+
The commands for management group deployments are different than the commands for resource group deployments.
42+
43+
For Azure PowerShell, use [New-AzManagementGroupDeployment](/powershell/module/az.resources/new-azmanagementgroupdeployment).
44+
45+
```azurepowershell-interactive
46+
New-AzManagementGroupDeployment `
47+
-ManagementGroupId "myMG" `
48+
-Location "West US" `
49+
-TemplateUri https://raw.githubusercontent.com/Azure/azure-docs-json-samples/master/management-level-deployment/azuredeploy.json
50+
```
4451

4552
For REST API, use [Deployments - Create At Management Group Scope](/rest/api/resources/deployments/createorupdateatmanagementgroupscope).
4653

@@ -145,7 +152,7 @@ The following example assigns an existing policy definition to the management gr
145152

146153
## Template sample
147154

148-
* Create a resource group, a policy and a policy assignment. See [here](https://github.com/Azure/azure-docs-json-samples/blob/master/management-level-deployment/azuredeploy.json).
155+
* [Create a resource group, a policy and a policy assignment](https://github.com/Azure/azure-docs-json-samples/blob/master/management-level-deployment/azuredeploy.json).
149156

150157
## Next steps
151158

articles/azure-resource-manager/templates/deploy-to-subscription.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Deploy resources to subscription
33
description: Describes how to create a resource group in an Azure Resource Manager template. It also shows how to deploy resources at the Azure subscription scope.
44
ms.topic: conceptual
5-
ms.date: 02/10/2020
5+
ms.date: 03/02/2020
66
---
77

88
# Create resource groups and resources at the subscription level
@@ -15,6 +15,7 @@ To deploy templates at the subscription level, use Azure CLI, PowerShell, or RES
1515

1616
You can deploy the following resource types at the subscription level:
1717

18+
* [budgets](/azure/templates/microsoft.consumption/budgets)
1819
* [deployments](/azure/templates/microsoft.resources/deployments)
1920
* [peerAsns](/azure/templates/microsoft.peering/peerasns)
2021
* [policyAssignments](/azure/templates/microsoft.authorization/policyassignments)
@@ -55,10 +56,10 @@ az deployment create \
5556
```
5657

5758

58-
For the PowerShell deployment command, use [New-AzDeployment](/powershell/module/az.resources/new-azdeployment). The following example deploys a template to create a resource group:
59+
For the PowerShell deployment command, use [New-AzDeployment](/powershell/module/az.resources/new-azdeployment) or **New-AzSubscriptionDeployment**. The following example deploys a template to create a resource group:
5960

6061
```azurepowershell-interactive
61-
New-AzDeployment `
62+
New-AzSubscriptionDeployment `
6263
-Name demoDeployment `
6364
-Location centralus `
6465
-TemplateUri https://raw.githubusercontent.com/Azure/azure-docs-json-samples/master/azure-resource-manager/emptyRG.json `
@@ -295,7 +296,7 @@ $definition = Get-AzPolicyDefinition | Where-Object { $_.Properties.DisplayName
295296
$locations = @("westus", "westus2")
296297
$policyParams =@{listOfAllowedLocations = @{ value = $locations}}
297298
298-
New-AzDeployment `
299+
New-AzSubscriptionDeployment `
299300
-Name policyassign `
300301
-Location centralus `
301302
-TemplateUri https://raw.githubusercontent.com/Azure/azure-docs-json-samples/master/azure-resource-manager/policyassign.json `
@@ -361,16 +362,16 @@ az deployment create \
361362
To deploy this template with PowerShell, use:
362363

363364
```azurepowershell
364-
New-AzDeployment `
365+
New-AzSubscriptionDeployment `
365366
-Name definePolicy `
366367
-Location centralus `
367368
-TemplateUri https://raw.githubusercontent.com/Azure/azure-docs-json-samples/master/azure-resource-manager/policydefineandassign.json
368369
```
369370

370371
## Template samples
371372

372-
* Create a resource group, lock it and give permissions to it. See [here](https://github.com/Azure/azure-quickstart-templates/tree/master/subscription-level-deployments/create-rg-lock-role-assignment).
373-
* Create a resource group, a policy and a policy assignment. See [here](https://github.com/Azure/azure-docs-json-samples/blob/master/subscription-level-deployment/azuredeploy.json).
373+
* [Create a resource group, lock it and give permissions to it](https://github.com/Azure/azure-quickstart-templates/tree/master/subscription-level-deployments/create-rg-lock-role-assignment).
374+
* [Create a resource group, a policy, and a policy assignment](https://github.com/Azure/azure-docs-json-samples/blob/master/subscription-level-deployment/azuredeploy.json).
374375

375376
## Next steps
376377

articles/cosmos-db/cosmosdb-monitor-resource-logs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ For detailed information about how to create a diagnostic setting by using the A
9494
| summarize count = count() by OperationName, requestResourceType_s, bin(TimeGenerated, 1h)
9595
```
9696

97-
1. What is the maximum throughput that a partition provides?
97+
1. What is the maximum throughput that a partition has consumed?
9898

9999
```Kusto
100100
AzureDiagnostics

articles/cosmos-db/sql-query-keywords.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ In SQL API, unlike ANSI SQL, you can express range queries against properties of
3737

3838
The DISTINCT keyword eliminates duplicates in the query's projection.
3939

40+
In this example, the query projects values for each last name:
41+
4042
```sql
4143
SELECT DISTINCT VALUE f.lastName
4244
FROM Families f
4345
```
4446

45-
In this example, the query projects values for each last name.
46-
4747
The results are:
4848

4949
```json
@@ -96,6 +96,13 @@ The results are:
9696
}
9797
]
9898
```
99+
100+
Queries with an aggregate system function and a subquery with DISTINCT are not supported. For example, the following query is not supported:
101+
102+
```sql
103+
SELECT COUNT(1) FROM (SELECT DISTINCT f.lastName FROM f)
104+
```
105+
99106
## <a name="in"></a> IN
100107

101108
Use the IN keyword to check whether a specified value matches any value in a list. For example, the following query returns all family items where the `id` is `WakefieldFamily` or `AndersenFamily`.

0 commit comments

Comments
 (0)