Skip to content

Commit 0c7fc72

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into upOwner
2 parents d4fd120 + b66a352 commit 0c7fc72

File tree

5 files changed

+28
-22
lines changed

5 files changed

+28
-22
lines changed

articles/app-service/overview-managed-identity.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,10 @@ The **MSI_ENDPOINT** is a local URL from which your app can request tokens. To g
306306
> |resource|Query|The AAD resource URI of the resource for which a token should be obtained. This could be one of the [Azure services that support Azure AD authentication](../active-directory/managed-identities-azure-resources/services-support-managed-identities.md#azure-services-that-support-azure-ad-authentication) or any other resource URI.|
307307
> |api-version|Query|The version of the token API to be used. "2017-09-01" is currently the only version supported.|
308308
> |secret|Header|The value of the MSI_SECRET environment variable. This header is used to help mitigate server-side request forgery (SSRF) attacks.|
309-
> |clientid|Query|(Optional) The ID of the user-assigned identity to be used. If omitted, the system-assigned identity is used.|
309+
> |clientid|Query|(Optional unless for user-assigned) The ID of the user-assigned identity to be used. If omitted, the system-assigned identity is used.|
310+
311+
> [!IMPORTANT]
312+
> If you are attempting to obtain tokens for user-assigned identities, you must include the `clientid` property. Otherwise the token service will attempt to obtain a token for a system-assigned identity, which may or may not exist.
310313
311314
A successful 200 OK response includes a JSON body with the following properties:
312315

articles/cosmos-db/create-graph-gremlin-console.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ You also need to install the [Gremlin Console](https://tinkerpop.apache.org/). U
5454
username|*Your username*|The resource of the form `/dbs/<db>/colls/<coll>` where `<db>` is your database name and `<coll>` is your collection name.
5555
password|*Your primary key*| See second screenshot below. This is your primary key, which you can retrieve from the Keys page of the Azure portal, in the Primary Key box. Use the copy button on the left side of the box to copy the value.
5656
connectionPool|{enableSsl: true}|Your connection pool setting for SSL.
57-
serializer|{ className: org.apache.tinkerpop.gremlin.<br>driver.ser.GraphSONMessageSerializerV1d0,<br> config: { serializeResultToString: true }}|Set to this value and delete any `\n` line breaks when pasting in the value.
57+
serializer|{ className: org.apache.tinkerpop.gremlin.<br>driver.ser.GraphSONMessageSerializerV2d0,<br> config: { serializeResultToString: true }}|Set to this value and delete any `\n` line breaks when pasting in the value.
5858

5959
For the hosts value, copy the **Gremlin URI** value from the **Overview** page:
6060
![View and copy the Gremlin URI value on the Overview page in the Azure portal](./media/create-graph-gremlin-console/gremlin-uri.png)

articles/cosmos-db/gremlin-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ The following table lists the TinkerPop features that are implemented by Azure C
4343

4444
## Gremlin wire format: GraphSON
4545

46-
Azure Cosmos DB uses the [GraphSON format](https://tinkerpop.apache.org/docs/3.3.2/reference/#graphson-reader-writer) when returning results from Gremlin operations. GraphSON is the Gremlin standard format for representing vertices, edges, and properties (single and multi-valued properties) using JSON.
46+
Azure Cosmos DB uses the [GraphSON format](http://tinkerpop.apache.org/docs/current/reference/#graphson) when returning results from Gremlin operations. Azure Cosmos DB currently supports "GraphSONv2" version. GraphSON is the Gremlin standard format for representing vertices, edges, and properties (single and multi-valued properties) using JSON.
4747

4848
For example, the following snippet shows a GraphSON representation of a vertex *returned to the client* from Azure Cosmos DB.
4949

articles/machine-learning/service/how-to-deploy-custom-docker-image.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ The information in this section assumes that you are using an Azure Container Re
5353
When using images stored in the __container registry for the workspace__, you do not need to authenticate to the registry. Authentication is handled by the workspace.
5454

5555
> [!WARNING]
56-
> The Azure Container Rzegistry for your workspace is __created the first time you train or deploy a model__ using the workspace. If you've created a new workspace, but not trained or created a model, no Azure Container Registry will exist for the workspace.
56+
> The Azure Container Registry for your workspace is __created the first time you train or deploy a model__ using the workspace. If you've created a new workspace, but not trained or created a model, no Azure Container Registry will exist for the workspace.
5757
5858
For information on retrieving the name of the Azure Container Registry for your workspace, see the [Get container registry name](#getname) section of this article.
5959

articles/machine-learning/service/tutorial-first-experiment-automated-ml.md

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.topic: tutorial
99
ms.author: tzvikei
1010
author: tsikiksr
1111
ms.reviewer: nibaccam
12-
ms.date: 09/09/2019
12+
ms.date: 09/26/2019
1313

1414
# Customer intent: As a non-coding data scientist, I want to use automated machine learning techniques so that I can build a classification model.
1515
---
@@ -55,10 +55,11 @@ You complete the following experiment set-up and run steps in the workspace land
5555

5656
1. Select **Get started**.
5757

58-
1. Select **Automated ML** under the **Authoring** section, on the left side pane.
59-
You'll see the **Getting started** screen, since this is your first experiment with Automated Machine Learning.
58+
1. In the left pane, select **Automated ML** under the **Authoring** section.
6059

61-
![Azure Machine Learning studio](media/tutorial-1st-experiment-automated-ml/get-started.png)
60+
Since this is your first automated ML experiment, you'll see the Getting started screen.
61+
62+
![Azure Machine Learning studio](media/tutorial-1st-experiment-automated-ml/get-started.png)
6263

6364
1. Select **Create experiment**.
6465

@@ -76,6 +77,7 @@ You'll see the **Getting started** screen, since this is your first experiment w
7677
>For this tutorial, you'll use the default storage account and container created with your new compute. They automatically populate in the form.
7778
7879
1. Select **Create** to get the compute target.
80+
7981
**This takes a couple minutes to complete.**
8082

8183
1. After creation, select your new compute target from the drop-down list and select **Next**.
@@ -89,18 +91,18 @@ You'll see the **Getting started** screen, since this is your first experiment w
8991
1. Give your dataset a unique name and provide an optional description.
9092

9193
1. Select **Next** on the bottom left, to upload it to the default container that was automatically set up during your workspace creation. Public preview supports only local file uploads.
92-
93-
1. When the upload is complete, the **Settings and preview** form is intelligently populated based on the file type. Ensure the form is populated as follows.
94+
95+
When the upload is complete, the Settings and preview form is pre-populated based on the file type.
96+
97+
1. Verify that the **Settings and preview** form is populated as follows and select **Next**.
9498

95-
Field|Value
99+
Field|Value for tutorial
96100
---|---
97101
File format| Delimited
98102
Delimiter| Comma
99103
Encoding| UTF-8
100104
Column headers| All files have same headers
101105
Skip rows | None
102-
103-
Select **Next**.
104106

105107
1. The **Schema** form allows for further configuration of your data for this experiment. For this example, select the toggle switch for the **day_of_week** feature, so as to not include it for this experiment. Select **Done**, to complete the file upload and creation of the dataset for your experiment.
106108

@@ -113,16 +115,17 @@ You'll see the **Getting started** screen, since this is your first experiment w
113115
1. Expand **Advanced Settings** and populate the fields as follows.
114116

115117
>[!NOTE]
116-
> For this experiment, you don't set a metric score or max cores per iterations threshold. You also don't block algorithms from being tested.
118+
> In this tutorial, you won't set a metric score or max cores per iterations threshold. Nor will you block algorithms from being tested.
119+
120+
Advanced&nbsp;settings|Description|Value&nbsp;for&nbsp;tutorial
121+
------|---------|---
122+
Primary metric| Evaluation metric that the machine learning algorithm will be measured by.|AUC_weighted
123+
Exit criteria| If a criteria is met, the training job is stopped. |Training&nbsp;job&nbsp;time: 5 <br> <br> Max&nbsp;#&nbsp;of&nbsp;iterations&#58;10
124+
Preprocessing| Enables preprocessing done by automated machine learning. This includes automatic data cleansing, preparing, and transformation to generate synthetic features.| Enable
125+
Validation type | Choose a cross-validation type.|K-fold cross-validation
126+
Number of validations | Number of tests. | 2 cross-validations
127+
Concurrency| The number of max concurrent iterations.|5
117128

118-
Advanced&nbsp;settings|Description|Value&nbsp;for&nbsp;tutorial
119-
------|---------|---
120-
Primary metric| Evaluation metric that the machine learning algorithm will be measured by.|**AUC_weighted**
121-
Exit criteria| When any of these criteria are met, the training job ends even if it didn't fully complete. |Training&nbsp;job&nbsp;time&nbsp;(minutes): **5** <br> <br> Max&nbsp;#&nbsp;of&nbsp;iterations&#58;**10**
122-
Preprocessing| Enables preprocessing done by automated machine learning. This includes automatic data cleansing, preparing, and transformation to generate synthetic features.| Enable
123-
Validation| Validation type and number of tests. | **K-fold** cross-validation<br><br> cross-validations: **2**
124-
Concurrency| The number of max concurrent iterations.|**5**
125-
126129
1. Select **Start** to run the experiment. A screen appears with a status message as the experiment preparation begins.
127130

128131
>[!IMPORTANT]

0 commit comments

Comments
 (0)