Skip to content

Commit ad0a969

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 23f509f + d45fd29 commit ad0a969

File tree

108 files changed

+1271
-792
lines changed

Some content is hidden

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

108 files changed

+1271
-792
lines changed

.openpublishing.redirection.json

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1745,22 +1745,22 @@
17451745
},
17461746
{
17471747
"source_path": "articles/cognitive-services/Bing-Web-Search/web-search-sdk-quickstart.md",
1748-
"redirect_url": "/azure/cognitive-services/bing-web-search/quickstarts/client-libraries",
1748+
"redirect_url": "/azure/cognitive-services/bing-web-search/quickstarts/client-libraries?pivots=programming-language-csharp",
17491749
"redirect_document_id": false
17501750
},
17511751
{
17521752
"source_path": "articles/cognitive-services/Bing-Web-Search/web-sdk-java-quickstart.md",
1753-
"redirect_url": "/azure/cognitive-services/bing-web-search/quickstarts/client-libraries",
1753+
"redirect_url": "/azure/cognitive-services/bing-web-search/quickstarts/client-libraries?pivots=programming-language-java",
17541754
"redirect_document_id": false
17551755
},
17561756
{
17571757
"source_path": "articles/cognitive-services/Bing-Web-Search/web-search-sdk-node-quickstart.md",
1758-
"redirect_url": "/azure/cognitive-services/bing-web-search/quickstarts/client-libraries",
1758+
"redirect_url": "/azure/cognitive-services/bing-web-search/quickstarts/client-libraries?pivots=programming-language-javascript",
17591759
"redirect_document_id": false
17601760
},
17611761
{
17621762
"source_path": "articles/cognitive-services/Bing-Web-Search/web-sdk-python-quickstart.md",
1763-
"redirect_url": "/azure/cognitive-services/bing-web-search/quickstarts/client-libraries",
1763+
"redirect_url": "/azure/cognitive-services/bing-web-search/quickstarts/client-libraries?pivots=programming-language-python",
17641764
"redirect_document_id": false
17651765
},
17661766
{
@@ -32620,17 +32620,17 @@
3262032620
},
3262132621
{
3262232622
"source_path": "articles/cognitive-services/Bing-Custom-Search/sdk-csharp-quick-start.md",
32623-
"redirect_url": "/azure/cognitive-services/bing-custom-search/quickstarts/client-libraries",
32623+
"redirect_url": "/azure/cognitive-services/bing-custom-search/quickstarts/client-libraries?pivots=programming-language-csharp",
3262432624
"redirect_document_id": false
3262532625
},
3262632626
{
3262732627
"source_path": "articles/cognitive-services/Bing-Custom-Search/sdk-java-quickstart.md",
32628-
"redirect_url": "/azure/cognitive-services/bing-custom-search/quickstarts/client-libraries",
32628+
"redirect_url": "/azure/cognitive-services/bing-custom-search/quickstarts/client-libraries?pivots=programming-language-java",
3262932629
"redirect_document_id": false
3263032630
},
3263132631
{
3263232632
"source_path": "articles/cognitive-services/Bing-Custom-Search/sdk-python-quickstart.md",
32633-
"redirect_url": "/azure/cognitive-services/bing-custom-search/quickstarts/client-libraries",
32633+
"redirect_url": "/azure/cognitive-services/bing-custom-search/quickstarts/client-libraries?pivots=programming-language-python",
3263432634
"redirect_document_id": false
3263532635
},
3263632636
{
@@ -49199,5 +49199,10 @@
4919949199
"redirect_url": "/azure/jenkins/service-fabric-cicd-your-linux-applications-with-jenkins",
4920049200
"redirect_document_id": true
4920149201
},
49202+
{
49203+
"source_path": "articles/jenkins/install-jenkins-solution-template.md",
49204+
"redirect_url": "/azure/jenkins/install-solution-template-tutorial",
49205+
"redirect_document_id": true
49206+
}
4920249207
]
4920349208
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Tutorial`:` Use a managed identity to access Azure Storage - Linux - Azure AD
2+
title: Tutorial`:` Use a managed identity to access Azure Storage via access key - Linux - Azure AD
33
description: A tutorial that walks you through the process of using a Linux VM system-assigned managed identity to access Azure Storage.
44
services: active-directory
55
documentationcenter: ''
@@ -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: 03/04/2020
1717
ms.author: markvi
1818
ms.collection: M365-identity-device-management
1919
---

articles/active-directory/reports-monitoring/concept-risky-sign-ins.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.topic: conceptual
1313
ms.tgt_pltfrm: na
1414
ms.workload: identity
1515
ms.subservice: report-monitor
16-
ms.date: 10/28/2019
16+
ms.date: 03/04/2020
1717
ms.author: markvi
1818
ms.reviewer: dhanyahk
1919

@@ -49,15 +49,15 @@ To learn how to assign administrative roles to a user in Azure Active Directory,
4949

5050
All editions of Azure AD provide you with risky sign-ins reports. However, the level of report granularity varies between the editions:
5151

52-
- In the **Azure Active Directory Free and Basic editions**, you get a list of risky sign-ins.
52+
- In the **Azure Active Directory Free edition**, you get a list of risky sign-ins.
5353

5454
- In addition, the **Azure Active Directory Premium 1** edition allows you to examine some of the underlying risk detections that have been detected for each report.
5555

5656
- The **Azure Active Directory Premium 2** edition provides you with the most detailed information about all underlying risk detections and it also enables you to configure security policies that automatically respond to configured risk levels.
5757

58-
## Risky sign-ins report for Azure AD free and basic edition
58+
## Risky sign-ins report for Azure AD free edition
5959

60-
The Azure AD free and basic editions provide you with a list of risky sign-ins that have been detected for your users. Each record contains the following attributes:
60+
The Azure AD free edition provide you with a list of risky sign-ins that have been detected for your users. Each record contains the following attributes:
6161

6262
- **User** - The name of the user that was used during the sign-in operation.
6363
- **IP** - The IP address of the device that was used to connect to Azure Active Directory.

articles/active-directory/reports-monitoring/howto-configure-prerequisites-for-reporting-api.md

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.topic: conceptual
1414
ms.tgt_pltfrm: na
1515
ms.workload: identity
1616
ms.subservice: report-monitor
17-
ms.date: 08/30/2019
17+
ms.date: 03/04/2020
1818
ms.author: markvi
1919
ms.reviewer: dhanyahk
2020

@@ -185,19 +185,16 @@ You need these values when configuring calls to the reporting API.
185185

186186
## Troubleshoot errors in the reporting API
187187

188-
This section lists the common error messages you may run into while accessing activity reports using the MS Graph API and steps for their resolution.
188+
This section lists the common error messages you may run into while accessing activity reports using the Microsoft Graph API and steps for their resolution.
189189

190-
### 500 HTTP internal server error while accessing Microsoft Graph V2 endpoint
191190

192-
We do not currently support the Microsoft Graph v2 endpoint - make sure to access the activity logs using the Microsoft Graph v1 endpoint.
193-
194-
### Error: Failed to get user roles from AD Graph
191+
### Error: Failed to get user roles from Microsoft Graph
195192

196193
Sign into your account using both sign-in buttons in the Graph Explorer UI to avoid getting an error when trying to sign in using Graph Explorer.
197194

198195
![Graph Explorer](./media/troubleshoot-graph-api/graph-explorer.png)
199196

200-
### Error: Failed to do premium license check from AD Graph
197+
### Error: Failed to do premium license check from Microsoft Graph
201198

202199
If you run into this error message while trying to access sign-ins using Graph Explorer, choose **Modify Permissions** underneath your account on the left nav, and select **Tasks.ReadWrite** and **Directory.Read.All**.
203200

@@ -214,7 +211,7 @@ Accessing sign-in reports requires an Azure Active Directory premium 1 (P1) lice
214211

215212
### Error: Application missing AAD 'Read directory data' permission
216213

217-
### Error: Application missing MSGraph API 'Read all audit log data' permission
214+
### Error: Application missing Microsoft API 'Read all audit log data' permission
218215

219216
Follow the steps in the [Prerequisites to access the Azure Active Directory reporting API](howto-configure-prerequisites-for-reporting-api.md) to ensure your application is running with the right set of permissions.
220217

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,11 @@ The following limitations apply:
2323

2424
You need the Azure CLI version 2.0.61 or later installed and configured. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI][install-azure-cli].
2525

26+
Go to [https://shell.azure.com](https://shell.azure.com) to open Cloud Shell in your browser.
27+
2628
For consistency and to help run the commands in this article, create a variable for your desired AKS cluster name. The following example uses the name *myakscluster*:
2729

28-
```azurecli-interactive
30+
```console
2931
aksname="myakscluster"
3032
```
3133

@@ -205,8 +207,10 @@ kubectl get pods --all-namespaces
205207
You receive a sign in prompt to authenticate using Azure AD credentials using a web browser. After you've successfully authenticated, the `kubectl` command displays the pods in the AKS cluster, as shown in the following example output:
206208

207209
```console
208-
$ kubectl get pods --all-namespaces
210+
kubectl get pods --all-namespaces
211+
```
209212

213+
```output
210214
To sign in, use a web browser to open the page https://microsoft.com/devicelogin and enter the code BYMK7UXVD to authenticate.
211215
212216
NAMESPACE NAME READY STATUS RESTARTS AGE
@@ -225,7 +229,7 @@ The authentication token received for `kubectl` is cached. You are only reprompt
225229

226230
If you see an authorization error message after you've successfully signed in using a web browser as in the following example output, check the following possible issues:
227231

228-
```console
232+
```output
229233
error: You must be logged in to the server (Unauthorized)
230234
```
231235

articles/aks/azure-netapp-files.md

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ The following limitations apply when you use Azure NetApp Files:
3939
4040
Register the *Microsoft.NetApp* resource provider:
4141

42-
```azure-cli
42+
```azurecli
4343
az provider register --namespace Microsoft.NetApp --wait
4444
```
4545

@@ -49,14 +49,16 @@ az provider register --namespace Microsoft.NetApp --wait
4949
When you create an Azure NetApp account for use with AKS, you need to create the account in the **node** resource group. First, get the resource group name with the [az aks show][az-aks-show] command and add the `--query nodeResourceGroup` query parameter. The following example gets the node resource group for the AKS cluster named *myAKSCluster* in the resource group name *myResourceGroup*:
5050

5151
```azurecli-interactive
52-
$ az aks show --resource-group myResourceGroup --name myAKSCluster --query nodeResourceGroup -o tsv
52+
az aks show --resource-group myResourceGroup --name myAKSCluster --query nodeResourceGroup -o tsv
53+
```
5354

55+
```output
5456
MC_myResourceGroup_myAKSCluster_eastus
5557
```
5658

5759
Create an Azure NetApp Files account in the **node** resource group and same region as your AKS cluster using [az netappfiles account create][az-netappfiles-account-create]. The following example creates an account named *myaccount1* in the *MC_myResourceGroup_myAKSCluster_eastus* resource group and *eastus* region:
5860

59-
```azure-cli
61+
```azurecli
6062
az netappfiles account create \
6163
--resource-group MC_myResourceGroup_myAKSCluster_eastus \
6264
--location eastus \
@@ -65,7 +67,7 @@ az netappfiles account create \
6567

6668
Create a new capacity pool by using [az netappfiles pool create][az-netappfiles-pool-create]. The following example creates a new capacity pool named *mypool1* with 4 TB in size and *Premium* service level:
6769

68-
```azure-cli
70+
```azurecli
6971
az netappfiles pool create \
7072
--resource-group MC_myResourceGroup_myAKSCluster_eastus \
7173
--location eastus \
@@ -77,7 +79,7 @@ az netappfiles pool create \
7779

7880
Create a subnet to [delegate to Azure NetApp Files][anf-delegate-subnet] using [az network vnet subnet create][az-network-vnet-subnet-create]. *This subnet must be in the same virtual network as your AKS cluster.*
7981

80-
```azure-cli
82+
```azurecli
8183
RESOURCE_GROUP=MC_myResourceGroup_myAKSCluster_eastus
8284
VNET_NAME=$(az network vnet list --resource-group $RESOURCE_GROUP --query [].name -o tsv)
8385
VNET_ID=$(az network vnet show --resource-group $RESOURCE_GROUP --name $VNET_NAME --query "id" -o tsv)
@@ -92,7 +94,7 @@ az network vnet subnet create \
9294

9395
Create a volume by using [az netappfiles volume create][az-netappfiles-volume-create].
9496

95-
```azure-cli
97+
```azurecli
9698
RESOURCE_GROUP=MC_myResourceGroup_myAKSCluster_eastus
9799
LOCATION=eastus
98100
ANF_ACCOUNT_NAME=myaccount1
@@ -122,9 +124,12 @@ az netappfiles volume create \
122124
## Create the PersistentVolume
123125

124126
List the details of your volume using [az netappfiles volume show][az-netappfiles-volume-show]
125-
```azure-cli
126-
$ az netappfiles volume show --resource-group $RESOURCE_GROUP --account-name $ANF_ACCOUNT_NAME --pool-name $POOL_NAME --volume-name "myvol1"
127127

128+
```azurecli
129+
az netappfiles volume show --resource-group $RESOURCE_GROUP --account-name $ANF_ACCOUNT_NAME --pool-name $POOL_NAME --volume-name "myvol1"
130+
```
131+
132+
```output
128133
{
129134
...
130135
"creationToken": "myfilepath2",
@@ -242,7 +247,9 @@ Verify your volume has been mounted in the pod by using [kubectl exec][kubectl-e
242247

243248
```console
244249
$ kubectl exec -it nginx-nfs -- bash
250+
```
245251

252+
```output
246253
root@nginx-nfs:/# df -h
247254
Filesystem Size Used Avail Use% Mounted on
248255
...

0 commit comments

Comments
 (0)