Skip to content

Commit f0012d5

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into lbnewart
2 parents e3919f2 + 87eff6d commit f0012d5

File tree

230 files changed

+1522
-1298
lines changed

Some content is hidden

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

230 files changed

+1522
-1298
lines changed

.openpublishing.redirection.json

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,11 @@
250250
"redirect_url": "/azure/virtual-machines/",
251251
"redirect_document_id": false
252252
},
253+
{
254+
"source_path": "articles/virtual-machines/dc-series.md",
255+
"redirect_url": "/azure/virtual-machines/sizes-previous-gen",
256+
"redirect_document_id": false
257+
},
253258
{
254259
"source_path": "articles/virtual-machines/windows/maintenance-and-updates.md",
255260
"redirect_url": "/azure/virtual-machines/maintenance-and-updates?toc=/azure/virtual-machines/windows/toc.json&bc=/azure/virtual-machines/windows/breadcrumb/toc.json",
@@ -26985,6 +26990,16 @@
2698526990
"redirect_url": "/azure/storage/files/storage-files-faq",
2698626991
"redirect_document_id": true
2698726992
},
26993+
{
26994+
"source_path": "articles/storage/files/storage-files-active-directory-enable.md",
26995+
"redirect_url": "/azure/storage/files/storage-files-identity-auth-active-directory-domain-service-enable",
26996+
"redirect_document_id": true
26997+
},
26998+
{
26999+
"source_path": "articles/storage/files/storage-files-active-directory-domain-services-enable.md",
27000+
"redirect_url": "/azure/storage/files/storage-files-identity-auth-active-directory-enable",
27001+
"redirect_document_id": true
27002+
},
2698827003
{
2698927004
"source_path": "articles/storage/storage-files-introduction.md",
2699027005
"redirect_url": "/azure/storage/files/storage-files-introduction",
@@ -48875,6 +48890,11 @@
4887548890
"source_path": "articles/virtual-machines/windows/chef-automation.md",
4887648891
"redirect_url": "/azure/chef/chef-automation",
4887748892
"redirect_document_id": true
48878-
}
48893+
},
48894+
{
48895+
"source_path": "articles/azure-monitor/app/hockeyapp-bridge-app.md",
48896+
"redirect_url": "/azure/azure-monitor/overview",
48897+
"redirect_document_id": false
48898+
}
4887948899
]
4888048900
}

articles/active-directory/develop/howto-create-service-principal-portal.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ Let's jump straight into creating the identity. If you run into a problem, check
3636

3737
You've created your Azure AD application and service principal.
3838

39-
## Assign the application to a role
39+
## Assign a role to the application
4040

41-
To access resources in your subscription, you must assign the application to a role. Decide which role offers the right permissions for the application. To learn about the available roles, see [RBAC: Built in Roles](../../role-based-access-control/built-in-roles.md).
41+
To access resources in your subscription, you must assign a role to the application. Decide which role offers the right permissions for the application. To learn about the available roles, see [RBAC: Built in Roles](../../role-based-access-control/built-in-roles.md).
4242

4343
You can set the scope at the level of the subscription, resource group, or resource. Permissions are inherited to lower levels of scope. For example, adding an application to the Reader role for a resource group means it can read the resource group and any resources it contains.
4444

@@ -58,7 +58,7 @@ You can set the scope at the level of the subscription, resource group, or resou
5858

5959
![Select the role to assign to the application](./media/howto-create-service-principal-portal/select-role.png)
6060

61-
1. Select **Save** to finish assigning the role. You see your application in the list of users assigned to a role for that scope.
61+
1. Select **Save** to finish assigning the role. You see your application in the list of users with a role for that scope.
6262

6363
Your service principal is set up. You can start using it to run your scripts or apps. The next section shows how to get values that are needed when signing in programmatically.
6464

@@ -108,7 +108,7 @@ If you choose not to use a certificate, you can create a new application secret.
108108
1. Select **Client secrets -> New client secret**.
109109
1. Provide a description of the secret, and a duration. When done, select **Add**.
110110

111-
After saving the client secret, the value of the client secret is displayed. Copy this value because you aren't able to retrieve the key later. You provide the key value with the application ID to sign in as the application. Store the key value where your application can retrieve it.
111+
After saving the client secret, the value of the client secret is displayed. Copy this value because you won't be able to retrieve the key later. You will provide the key value with the application ID to sign in as the application. Store the key value where your application can retrieve it.
112112

113113
![Copy the secret value because you can't retrieve this later](./media/howto-create-service-principal-portal/copy-secret.png)
114114

@@ -122,7 +122,7 @@ Keep in mind, you might need to configure addition permissions on resources that
122122

123123
## Required permissions
124124

125-
You must have sufficient permissions to register an application with your Azure AD tenant, and assign the application to a role in your Azure subscription.
125+
You must have sufficient permissions to register an application with your Azure AD tenant, and assign to the application a role in your Azure subscription.
126126

127127
### Check Azure AD permissions
128128

@@ -134,11 +134,11 @@ You must have sufficient permissions to register an application with your Azure
134134
1. In the left pane, select **User settings**.
135135
1. Check the **App registrations** setting. This value can only be set by an administrator. If set to **Yes**, any user in the Azure AD tenant can register an app.
136136

137-
If the app registrations setting is set to **No**, only users with an administrator role may register these types of applications. See [available roles](../users-groups-roles/directory-assign-admin-roles.md#available-roles) and [role permissions](../users-groups-roles/directory-assign-admin-roles.md#role-permissions) to learn about available administrator roles and the specific permissions in Azure AD that are given to each role. If your account is assigned to the User role, but the app registration setting is limited to admin users, ask your administrator to either assign you to one of the administrator roles that can create and manage all aspects of app registrations, or to enable users to register apps.
137+
If the app registrations setting is set to **No**, only users with an administrator role may register these types of applications. See [available roles](../users-groups-roles/directory-assign-admin-roles.md#available-roles) and [role permissions](../users-groups-roles/directory-assign-admin-roles.md#role-permissions) to learn about available administrator roles and the specific permissions in Azure AD that are given to each role. If your account is assigned the User role, but the app registration setting is limited to admin users, ask your administrator to either assign you one of the administrator roles that can create and manage all aspects of app registrations, or to enable users to register apps.
138138

139139
### Check Azure subscription permissions
140140

141-
In your Azure subscription, your account must have `Microsoft.Authorization/*/Write` access to assign an AD app to a role. This action is granted through the [Owner](../../role-based-access-control/built-in-roles.md#owner) role or [User Access Administrator](../../role-based-access-control/built-in-roles.md#user-access-administrator) role. If your account is assigned to the **Contributor** role, you don't have adequate permission. You receive an error when attempting to assign the service principal to a role.
141+
In your Azure subscription, your account must have `Microsoft.Authorization/*/Write` access to assign a role to an AD app. This action is granted through the [Owner](../../role-based-access-control/built-in-roles.md#owner) role or [User Access Administrator](../../role-based-access-control/built-in-roles.md#user-access-administrator) role. If your account is assigned the **Contributor** role, you don't have adequate permission. You will receive an error when attempting to assign the service principal a role.
142142

143143
To check your subscription permissions:
144144

@@ -150,9 +150,9 @@ To check your subscription permissions:
150150

151151
![Select the subscription you want to create the service principal in](./media/howto-create-service-principal-portal/view-details.png)
152152

153-
1. Select **Role assignments** to view your assigned roles, and determine if you have adequate permissions to assign an AD app to a role. If not, ask your subscription administrator to add you to User Access Administrator role. In the following image, the user is assigned to the Owner role, which means that user has adequate permissions.
153+
1. Select **Role assignments** to view your assigned roles, and determine if you have adequate permissions to assign a role to an AD app. If not, ask your subscription administrator to add you to User Access Administrator role. In the following image, the user is assigned the Owner role, which means that user has adequate permissions.
154154

155-
![This example shows the user is assigned to the Owner role](./media/howto-create-service-principal-portal/view-user-role.png)
155+
![This example shows the user is assigned the Owner role](./media/howto-create-service-principal-portal/view-user-role.png)
156156

157157
## Next steps
158158

articles/active-directory/users-groups-roles/roles-delegate-by-task.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ Task | Least privileged role | Additional roles
4242
Create Azure AD B2C directories | All non-guest users ([see documentation](https://docs.microsoft.com/azure/active-directory/fundamentals/users-default-permissions)) |
4343
Create B2C applications | Global Administrator |
4444
Create enterprise applications | Cloud Application Administrator | Application Administrator
45-
Create, read, update, and delete B2C policies | Global Administrator |
46-
Create, read, update, and delete identity providers | Global Administrator |
47-
Create, read, update, and delete password reset user flows | Global Administrator |
48-
Create, read, update, and delete profile editing user flows | Global Administrator |
49-
Create, read, update, and delete sign-in user flows | Global Administrator |
50-
Create, read, update, and delete sign-up user flow |Global Administrator |
51-
Create, read, update, and delete user attributes | Global Administrator |
52-
Create, read, update, and delete users | Global Administrator ([see documentation](https://docs.microsoft.com/azure/active-directory-b2c/active-directory-b2c-faqs))
45+
Create, read, update, and delete B2C policies | B2C IEF Policy Administrator |
46+
Create, read, update, and delete identity providers | External Identity Provider Administrator |
47+
Create, read, update, and delete password reset user flows | B2C User Flow Administrator |
48+
Create, read, update, and delete profile editing user flows | B2C User Flow Administrator |
49+
Create, read, update, and delete sign-in user flows | B2C User Flow Administrator |
50+
Create, read, update, and delete sign-up user flow |B2C User Flow Administrator |
51+
Create, read, update, and delete user attributes | B2C User Flow Attribute Administrator |
52+
Create, read, update, and delete users | User Administrator
5353
Read all configuration | Global reader |
5454
Read B2C audit logs | Global reader ([see documentation](https://docs.microsoft.com/azure/active-directory-b2c/active-directory-b2c-faqs)) |
5555

@@ -124,7 +124,7 @@ Task | Least privileged role | Additional roles
124124
---- | --------------------- | ----------------
125125
Consent to any delegated permissions | Cloud application administrator | Application administrator
126126
Consent to application permissions not including Microsoft Graph | Cloud application administrator | Application administrator
127-
Consent to application permissions to Microsoft Graph | Global Administrator |
127+
Consent to application permissions to Microsoft Graph | Privileged Role Administrator |
128128
Consent to applications accessing own data | Default user role ([see documentation](https://docs.microsoft.com/azure/active-directory/fundamentals/users-default-permissions)) |
129129
Create enterprise application | Cloud application administrator | Application administrator
130130
Manage Application Proxy | Application administrator |
@@ -153,7 +153,7 @@ Assign license | User administrator |
153153
Create group | User administrator |
154154
Create, update, or delete access review of a group or of an app | User administrator |
155155
Manage group expiration | User administrator |
156-
Manage group settings | Global Administrator |
156+
Manage group settings | Groups Administrator | User Administrator |
157157
Read all configuration (except hidden membership) | Directory readers | Default user role ([see documentation](https://docs.microsoft.com/azure/active-directory/fundamentals/users-default-permissions))
158158
Read hidden membership | Group member | Group owner, Password administrator, Exchange administrator, SharePoint administrator, Teams administrator, User administrator
159159
Read membership of groups with hidden membership | Helpdesk Administrator | User administrator, Teams administrator
@@ -231,7 +231,7 @@ Read server status | Global reader |
231231

232232
Task | Least privileged role | Additional roles
233233
---- | --------------------- | ----------------
234-
Manage identity providers | Global Administrator |
234+
Manage identity providers | External Identity Provider Administrator |
235235
Manage settings | Global Administrator |
236236
Manage terms of use | Global Administrator |
237237
Read all configuration | Global reader |
@@ -327,11 +327,11 @@ Create user | User administrator |
327327
Delete users | User administrator |
328328
Invalidate refresh tokens of limited admins (see documentation) | User administrator |
329329
Invalidate refresh tokens of non-admins (see documentation) | Password administrator | User administrator
330-
Invalidate refresh tokens of privileged admins (see documentation) | Global Administrator |
330+
Invalidate refresh tokens of privileged admins (see documentation) | Privileged Authentication Administrator |
331331
Read basic configuration | Default User role ([see documentation](https://docs.microsoft.com/azure/active-directory/fundamentals/users-default-permissions) |
332332
Reset password for limited admins (see documentation) | User administrator |
333333
Reset password of non-admins (see documentation) | Password administrator | User administrator
334-
Reset password of privileged admins | Global Administrator |
334+
Reset password of privileged admins | Privileged Authentication Administrator |
335335
Revoke license | License administrator | User administrator
336336
Update all properties except User Principal Name | User administrator |
337337
Update User Principal Name for limited admins (see documentation) | User administrator |

articles/aks/acs-aks-migration.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@
22
title: Migrate to Azure Kubernetes Service (AKS)
33
description: Migrate to Azure Kubernetes Service (AKS).
44
services: container-service
5-
author: mlearned
6-
7-
ms.service: container-service
85
ms.topic: article
96
ms.date: 11/07/2018
10-
ms.author: mlearned
117
ms.custom: mvc
128
---
139

articles/aks/api-server-authorized-ip-ranges.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,9 @@
22
title: API server authorized IP ranges in Azure Kubernetes Service (AKS)
33
description: Learn how to secure your cluster using an IP address range for access to the API server in Azure Kubernetes Service (AKS)
44
services: container-service
5-
author: mlearned
6-
7-
ms.service: container-service
85
ms.topic: article
96
ms.date: 11/05/2019
10-
ms.author: mlearned
7+
118

129
#Customer intent: As a cluster operator, I want to increase the security of my cluster by limiting access to the API server to only the IP addresses that I specify.
1310
---

articles/aks/availability-zones.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,10 @@
22
title: Use availability zones in Azure Kubernetes Service (AKS)
33
description: Learn how to create a cluster that distributes nodes across availability zones in Azure Kubernetes Service (AKS)
44
services: container-service
5-
author: mlearned
6-
75
ms.custom: fasttrack-edit
8-
ms.service: container-service
96
ms.topic: article
107
ms.date: 06/24/2019
11-
ms.author: mlearned
8+
129
---
1310

1411
# Create an Azure Kubernetes Service (AKS) cluster that uses availability zones

articles/aks/azure-ad-integration-cli.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,9 @@
22
title: Integrate Azure Active Directory with Azure Kubernetes Service
33
description: Learn how to use the Azure CLI to create and Azure Active Directory-enabled Azure Kubernetes Service (AKS) cluster
44
services: container-service
5-
author: mlearned
6-
7-
ms.service: container-service
85
ms.topic: article
96
ms.date: 04/16/2019
10-
ms.author: mlearned
7+
118
---
129

1310
# Integrate Azure Active Directory with Azure Kubernetes Service using the Azure CLI

articles/aks/azure-ad-integration.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,9 @@
22
title: Integrate Azure Active Directory with Azure Kubernetes Service
33
description: How to create Azure Active Directory-enabled Azure Kubernetes Service (AKS) clusters
44
services: container-service
5-
author: mlearned
6-
7-
ms.service: container-service
85
ms.topic: article
96
ms.date: 02/02/2019
10-
ms.author: mlearned
7+
118
---
129

1310
# Integrate Azure Active Directory with Azure Kubernetes Service

articles/aks/azure-ad-rbac.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
title: Control cluster resources with RBAC and Azure AD in Azure Kubernetes Service
33
description: Learn how to use Azure Active Directory group membership to restrict access to cluster resources using role-based access control (RBAC) in Azure Kubernetes Service (AKS)
44
services: container-service
5-
author: mlearned
65

7-
ms.service: container-service
6+
7+
88
ms.topic: article
99
ms.date: 04/16/2019
10-
ms.author: mlearned
10+
1111
---
1212

1313
# Control access to cluster resources using role-based access control and Azure Active Directory identities in Azure Kubernetes Service

articles/aks/azure-disk-customer-managed-keys.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,9 @@
22
title: Use a customer-managed key to encrypt Azure disks in Azure Kubernetes Service (AKS)
33
description: Bring your own keys (BYOK) to encrypt AKS OS and Data disks.
44
services: container-service
5-
author: mlearned
6-
7-
ms.service: container-service
85
ms.topic: article
96
ms.date: 01/12/2020
10-
ms.author: mlearned
7+
118
---
129

1310
# Bring your own keys (BYOK) with Azure disks in Azure Kubernetes Service (AKS)

0 commit comments

Comments
 (0)