Skip to content

Commit 7142ca5

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into work01
2 parents ffcc6c0 + 80898b2 commit 7142ca5

File tree

513 files changed

+8596
-2795
lines changed

Some content is hidden

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

513 files changed

+8596
-2795
lines changed

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24605,6 +24605,16 @@
2460524605
"redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-java",
2460624606
"redirect_document_id": false
2460724607
},
24608+
{
24609+
"source_path": "articles/storage/blobs/storage-quickstart-blobs-nodejs-v10.md",
24610+
"redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-nodejs-legacy",
24611+
"redirect_document_id": false
24612+
},
24613+
{
24614+
"source_path": "articles/storage/blobs/storage-quickstart-blobs-javascript-client-libraries-v10.md",
24615+
"redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-javascript-client-libraries-legacy",
24616+
"redirect_document_id": false
24617+
},
2460824618
{
2460924619
"source_path": "articles/storage/blobs/storage-nodejs-how-to-use-blob-storage.md",
2461024620
"redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-nodejs",

CODEOWNERS

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,17 @@
11
# Testing the new code owners feature in GitHub. Please contact Cory Fowler if you have questions.
2-
# articles/storage/ @tamram @robinsh
3-
# articles/virtual-machines/ @iainfoulds @cynthn
4-
# articles/virtual-machines/linux/ @iainfoulds @cynthn
5-
# articles/virtual-machines/windows/ @iainfoulds @cynthn
6-
# articles/application-insights/ @SergeyKanzhelev
7-
# articles/cosmos-db/ @mimig1
8-
9-
# All Articles
10-
articles/ @apex-docs-pr-reviewers
11-
122
# Cognitive Services
133
articles/cognitive-services/ @diberry @erhopf, @nitinme
144

155
# DevOps
16-
176
articles/ansible/ @TomArcherMsft
187
articles/chef/ @TomArcherMsft
198
articles/jenkins/ @TomArcherMsft
209
articles/terraform/ @TomArcherMsft
2110

2211
# Governance
23-
2412
articles/governance/ @DCtheGeek
13+
14+
# Configuration
15+
*.json @SyntaxC4 @snoviking @arob98
16+
.acrolinx-config.edn @MonicaRush @arob98
17+
articles/zone-pivot-groups.yml @SyntaxC4 @snoviking @arob98

articles/active-directory/b2b/direct-federation.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ First, your partner organization needs to configure their identity provider with
8080
Azure AD B2B can be configured to federate with identity providers that use the SAML protocol with specific requirements listed below. For more information about setting up a trust between your SAML identity provider and Azure AD, see [Use a SAML 2.0 Identity Provider (IdP) for Single Sign-On](https://docs.microsoft.com/azure/active-directory/hybrid/how-to-connect-fed-saml-idp).
8181

8282
> [!NOTE]
83-
> NOTE
84-
The target domain for direct federation must not be DNS-verified on Azure AD. The authentication URL domain must match the target domain or it must be the domain of an allowed identity provider. See the [Limitations](#limitations) section for details.
83+
> The target domain for direct federation must not be DNS-verified on Azure AD. The authentication URL domain must match the target domain or it must be the domain of an allowed identity provider. See the [Limitations](#limitations) section for details.
8584
8685
#### Required SAML 2.0 attributes and claims
8786
The following tables show requirements for specific attributes and claims that must be configured at the third-party identity provider. To set up direct federation, the following attributes must be received in the SAML 2.0 response from the identity provider. These attributes can be configured by linking to the online security token service XML file or by entering them manually.

articles/active-directory/develop/howto-add-app-roles-in-azure-ad-apps.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ These application roles are defined in the [Azure portal](https://portal.azure.c
3333
### Declare app roles using Azure portal
3434

3535
1. Sign in to the [Azure portal](https://portal.azure.com).
36-
1. On the top bar, select your account, and then **Switch Directory**.
37-
1. Once the **Directory + subscription** pane opens, choose the Active Directory tenant where you wish to register your application, from the **Favorites** or **All Directories** list.
38-
1. Select **All services** in the left-hand nav, and choose **Azure Active Directory**.
36+
1. Select the **Directory + Subscription** icon in the portal toolbar.
37+
1. In the **Favorites** or **All Directories** list, choose the Active Directory tenant where you wish to register your application.
38+
1. In the Azure portal, search for and select **Azure Active Directory**.
3939
1. In the **Azure Active Directory** pane, select **App registrations** to view a list of all your applications.
4040
1. Select the application you want to define app roles in. Then select **Manifest**.
4141
1. Edit the app manifest by locating the `appRoles` setting and adding all your Application Roles.

articles/active-directory/managed-identities-azure-resources/tutorial-linux-vm-access-datalake.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.devlang: na
1313
ms.topic: tutorial
1414
ms.tgt_pltfrm: na
1515
ms.workload: identity
16-
ms.date: 11/20/2017
16+
ms.date: 01/10/2020
1717
ms.author: markvi
1818
ms.collection: M365-identity-device-management
1919
---
@@ -34,9 +34,9 @@ In this tutorial, you learn how to:
3434

3535
[!INCLUDE [msi-tut-prereqs](../../../includes/active-directory-msi-tut-prereqs.md)]
3636

37-
## Grant your VM access to Azure Data Lake Store
37+
## Grant access
3838

39-
Now you can grant your VM access to files and folders in Azure Data Lake Store. For this step, you can use an existing Data Lake Store instance or create a new one. To create a Data Lake Store instance by using the Azure portal, follow the [Azure Data Lake Store quickstart](https://docs.microsoft.com/azure/data-lake-store/data-lake-store-get-started-portal). There are also quickstarts that use Azure CLI and Azure PowerShell in the [Azure Data Lake Store documentation](https://docs.microsoft.com/azure/data-lake-store/data-lake-store-overview).
39+
This section shows how to grant your VM access to files and folders in Azure Data Lake Store. For this step, you can use an existing Data Lake Store instance or create a new one. To create a Data Lake Store instance by using the Azure portal, follow the [Azure Data Lake Store quickstart](https://docs.microsoft.com/azure/data-lake-store/data-lake-store-get-started-portal). There are also quickstarts that use Azure CLI and Azure PowerShell in the [Azure Data Lake Store documentation](https://docs.microsoft.com/azure/data-lake-store/data-lake-store-overview).
4040

4141
In Data Lake Store, create a new folder and grant our Linux VM system-assigned managed identity permission to read, write, and execute files in that folder:
4242

@@ -54,9 +54,9 @@ In Data Lake Store, create a new folder and grant our Linux VM system-assigned m
5454

5555
Managed identities for Azure resources can now perform all operations on files in the folder that you created. For more information on managing access to Data Lake Store, see [Access Control in Data Lake Store](https://docs.microsoft.com/azure/data-lake-store/data-lake-store-access-control).
5656

57-
## Get an access token and call the Data Lake Store file system
57+
## Get an access token
5858

59-
Azure Data Lake Store natively supports Azure AD authentication, so it can directly accept access tokens obtained via using managed identities for Azure resources. To authenticate to the Data Lake Store file system, you send an access token issued by Azure AD to your Data Lake Store file system endpoint. The access token is in an authorization header in the format "Bearer \<ACCESS_TOKEN_VALUE\>". To learn more about Data Lake Store support for Azure AD authentication, see [Authentication with Data Lake Store using Azure Active Directory](https://docs.microsoft.com/azure/data-lake-store/data-lakes-store-authentication-using-azure-active-directory).
59+
This section shows how to obtain an access token and call the Data Lake Store file system. Azure Data Lake Store natively supports Azure AD authentication, so it can directly accept access tokens obtained via using managed identities for Azure resources. To authenticate to the Data Lake Store file system, you send an access token issued by Azure AD to your Data Lake Store file system endpoint. The access token is in an authorization header in the format "Bearer \<ACCESS_TOKEN_VALUE\>". To learn more about Data Lake Store support for Azure AD authentication, see [Authentication with Data Lake Store using Azure Active Directory](https://docs.microsoft.com/azure/data-lake-store/data-lakes-store-authentication-using-azure-active-directory).
6060

6161
In this tutorial, you authenticate to the REST API for the Data Lake Store file system by using cURL to make REST requests.
6262

articles/active-directory/managed-identities-azure-resources/tutorial-vm-windows-access-storage.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.devlang: na
1313
ms.topic: tutorial
1414
ms.tgt_pltfrm: na
1515
ms.workload: identity
16-
ms.date: 04/12/2018
16+
ms.date: 01/10/2020
1717
ms.author: markvi
1818
ms.collection: M365-identity-device-management
1919
---
@@ -36,7 +36,7 @@ This tutorial shows you how to use a system-assigned managed identity for a Wind
3636

3737
[!INCLUDE [msi-tut-prereqs](../../../includes/active-directory-msi-tut-prereqs.md)]
3838

39-
## Create a storage account
39+
## Create account
4040

4141
In this section, you create a storage account.
4242

@@ -65,9 +65,9 @@ Files require blob storage so you need to create a blob container in which to st
6565
7. In the **Upload blob** pane, under **Files**, click the folder icon and browse to the file **hello_world.txt** on your local machine, select the file, then click **Upload**.
6666
![Upload text file](./media/msi-tutorial-linux-vm-access-storage/upload-text-file.png)
6767

68-
## Grant your VM access to an Azure Storage container
68+
## Grant access
6969

70-
You can use the VM's system-assigned managed identity to retrieve the data in the Azure storage blob.
70+
This section shows how to grant your VM access to an Azure Storage container. You can use the VM's system-assigned managed identity to retrieve the data in the Azure storage blob.
7171

7272
1. Navigate back to your newly created storage account.
7373
2. Click the **Access control (IAM)** link in the left panel.
@@ -79,7 +79,7 @@ You can use the VM's system-assigned managed identity to retrieve the data in th
7979

8080
![Assign permissions](./media/tutorial-linux-vm-access-storage/access-storage-perms.png)
8181

82-
## Get an access token and use it to call Azure Storage 
82+
## Get an access token 
8383

8484
Azure Storage natively supports Azure AD authentication, so it can directly accept access tokens obtained using a managed identity. This is part of Azure Storage's integration with Azure AD, and is different from supplying credentials on the connection string.
8585

articles/active-directory/managed-identities-azure-resources/tutorial-windows-vm-access-cosmos-db.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.devlang: na
1212
ms.topic: tutorial
1313
ms.tgt_pltfrm: na
1414
ms.workload: identity
15-
ms.date: 04/10/2018
15+
ms.date: 01/10/2020
1616
ms.author: markvi
1717
ms.collection: M365-identity-device-management
1818
---
@@ -46,27 +46,27 @@ If you don't already have one, create a Cosmos DB account. You can skip this ste
4646
5. Ensure the **Subscription** and **Resource Group** match the ones you specified when you created your VM in the previous step. Select a **Location** where Cosmos DB is available.
4747
6. Click **Create**.
4848

49-
## Create a collection in the Cosmos DB account
49+
## Create a collection
5050

5151
Next, add a data collection in the Cosmos DB account that you can query in later steps.
5252

5353
1. Navigate to your newly created Cosmos DB account.
5454
2. On the **Overview** tab click the **+/Add Collection** button, and an "Add Collection" panel slides out.
5555
3. Give the collection a database ID, collection ID, select a storage capacity, enter a partition key, enter a throughput value, then click **OK**. For this tutorial, it is sufficient to use "Test" as the database ID and collection ID, select a fixed storage capacity and lowest throughput (400 RU/s).
5656

57-
## Grant Windows VM system-assigned managed identity access to the Cosmos DB account access keys
57+
## Grant access
5858

59-
Cosmos DB does not natively support Azure AD authentication. However, you can use a system-assigned managed identity to retrieve a Cosmos DB access key from the Resource Manager, and use the key to access Cosmos DB. In this step, you grant your Windows VM system-assigned managed identity access to the keys to the Cosmos DB account.
59+
This section shows how to grant Windows VM system-assigned managed identity access to the Cosmos DB account access keys. Cosmos DB does not natively support Azure AD authentication. However, you can use a system-assigned managed identity to retrieve a Cosmos DB access key from the Resource Manager, and use the key to access Cosmos DB. In this step, you grant your Windows VM system-assigned managed identity access to the keys to the Cosmos DB account.
6060

6161
To grant the Windows VM system-assigned managed identity access to the Cosmos DB account in Azure Resource Manager using PowerShell, update the values for `<SUBSCRIPTION ID>`, `<RESOURCE GROUP>`, and `<COSMOS DB ACCOUNT NAME>` for your environment. Cosmos DB supports two levels of granularity when using access keys: read/write access to the account, and read-only access to the account. Assign the `DocumentDB Account Contributor` role if you want to get read/write keys for the account, or assign the `Cosmos DB Account Reader Role` role if you want to get read-only keys for the account. For this tutorial, assign the `Cosmos DB Account Reader Role`:
6262

6363
```azurepowershell
6464
$spID = (Get-AzVM -ResourceGroupName myRG -Name myVM).identity.principalid
6565
New-AzRoleAssignment -ObjectId $spID -RoleDefinitionName "Cosmos DB Account Reader Role" -Scope "/subscriptions/<mySubscriptionID>/resourceGroups/<myResourceGroup>/providers/Microsoft.DocumentDb/databaseAccounts/<COSMOS DB ACCOUNT NAME>"
6666
```
67-
## Get an access token using the Windows VM system-assigned managed identity to call Azure Resource Manager
67+
## Get an access token
6868

69-
For the remainder of the tutorial, we will work from the VM we created earlier.
69+
This section shows how to get an access token using the Windows VM system-assigned managed identity to call Azure Resource Manager. For the remainder of the tutorial, we will work from the VM we created earlier.
7070

7171
You will need to install the latest version of [Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli) on your Windows VM.
7272

@@ -93,9 +93,9 @@ You will need to install the latest version of [Azure CLI](https://docs.microsof
9393
$ArmToken = $content.access_token
9494
```
9595

96-
## Get access keys from Azure Resource Manager to make Cosmos DB calls
96+
## Get access keys
9797

98-
Now use PowerShell to call Resource Manager using the access token retrieved in the previous section to retrieve the Cosmos DB account access key. Once we have the access key, we can query Cosmos DB. Be sure to replace the `<SUBSCRIPTION ID>`, `<RESOURCE GROUP>`, and `<COSMOS DB ACCOUNT NAME>` parameter values with your own values. Replace the `<ACCESS TOKEN>` value with the access token you retrieved earlier. If you want to retrieve read/write keys, use key operation type `listKeys`. If you want to retrieve read-only keys, use the key operation type `readonlykeys`:
98+
This section shows how to get access keys from Azure Resource Manager to make Cosmos DB calls. Now use PowerShell to call Resource Manager using the access token retrieved in the previous section to retrieve the Cosmos DB account access key. Once we have the access key, we can query Cosmos DB. Be sure to replace the `<SUBSCRIPTION ID>`, `<RESOURCE GROUP>`, and `<COSMOS DB ACCOUNT NAME>` parameter values with your own values. Replace the `<ACCESS TOKEN>` value with the access token you retrieved earlier. If you want to retrieve read/write keys, use key operation type `listKeys`. If you want to retrieve read-only keys, use the key operation type `readonlykeys`:
9999

100100
```powershell
101101
Invoke-WebRequest -Uri 'https://management.azure.com/subscriptions/<SUBSCRIPTION-ID>/resourceGroups/<RESOURCE-GROUP>/providers/Microsoft.DocumentDb/databaseAccounts/<COSMOS DB ACCOUNT NAME>/listKeys/?api-version=2016-03-31' -Method POST -Headers @{Authorization="Bearer $ARMToken"}

articles/active-directory/managed-identities-azure-resources/tutorial-windows-vm-access-nonaad.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.devlang: na
1313
ms.topic: tutorial
1414
ms.tgt_pltfrm: na
1515
ms.workload: identity
16-
ms.date: 11/20/2017
16+
ms.date: 01/10/2020
1717
ms.author: markvi
1818
ms.collection: M365-identity-device-management
1919
---
@@ -35,9 +35,9 @@ You learn how to:
3535

3636
[!INCLUDE [msi-tut-prereqs](../../../includes/active-directory-msi-tut-prereqs.md)]
3737

38-
## Grant your VM access to a Secret stored in a Key Vault 
38+
## Grant access  
3939

40-
Using managed identities for Azure resources, your code can get access tokens to authenticate to resources that support Azure AD authentication.  However, not all Azure services support Azure AD authentication. To use managed identities for Azure resources with those services, store the service credentials in Azure Key Vault, and use the VM's managed identity to access Key Vault to retrieve the credentials. 
40+
This section shows how to grant your VM access to a Secret stored in a Key Vault. Using managed identities for Azure resources, your code can get access tokens to authenticate to resources that support Azure AD authentication.  However, not all Azure services support Azure AD authentication. To use managed identities for Azure resources with those services, store the service credentials in Azure Key Vault, and use the VM's managed identity to access Key Vault to retrieve the credentials. 
4141

4242
First, we need to create a Key Vault and grant our VM’s system-assigned managed identity access to the Key Vault.   
4343

@@ -62,9 +62,9 @@ Next, add a secret to the Key Vault, so that later you can retrieve the secret u
6262
5. Leave the activation date and expiration date clear, and leave **Enabled** as **Yes**
6363
6. Click **Create** to create the secret. 
6464

65-
## Get an access token using the VM identity and use it to retrieve the secret from the Key Vault  
65+
## Get an access token  
6666

67-
If you don’t have PowerShell 4.3.1 or greater installed, you'll need to [download and install the latest version](https://docs.microsoft.com/powershell/azure/overview).
67+
This section shows how to get an access token using the VM identity and use it to retrieve the secret from the Key Vault. If you don’t have PowerShell 4.3.1 or greater installed, you'll need to [download and install the latest version](https://docs.microsoft.com/powershell/azure/overview).
6868

6969
First, we use the VM’s system-assigned managed identity to get an access token to authenticate to Key Vault:
7070

0 commit comments

Comments
 (0)