Skip to content

Commit 7150536

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into natvnetuiupd
commit
2 parents 720d760 + 82908a6 commit 7150536

File tree

9 files changed

+113
-18
lines changed

9 files changed

+113
-18
lines changed

articles/active-directory-b2c/restful-technical-profile.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: celestedg
99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: reference
12-
ms.date: 02/24/2020
12+
ms.date: 03/02/2020
1313
ms.author: mimart
1414
ms.subservice: B2C
1515
---
@@ -122,6 +122,7 @@ The technical profile also returns claims, that aren't returned by the identity
122122
| --------- | -------- | ----------- |
123123
| ServiceUrl | Yes | The URL of the REST API endpoint. |
124124
| AuthenticationType | Yes | The type of authentication being performed by the RESTful claims provider. Possible values: `None`, `Basic`, `Bearer`, or `ClientCertificate`. The `None` value indicates that the REST API is not anonymous. The `Basic` value indicates that the REST API is secured with HTTP basic authentication. Only verified users, including Azure AD B2C, can access your API. The `ClientCertificate` (recommended) value indicates that the REST API restricts access by using client certificate authentication. Only services that have the appropriate certificates, for example Azure AD B2C, can access your API. The `Bearer` value indicates that the REST API restricts access using client OAuth2 Bearer token. |
125+
| AllowInsecureAuthInProduction| No| Indicates whether the `AuthenticationType` can be set to `none` in production environment (`DeploymentMode` of the [TrustFrameworkPolicy](trustframeworkpolicy.md) is set to `Production`, or not specified). Possible values: true, or false (default). |
125126
| SendClaimsIn | No | Specifies how the input claims are sent to the RESTful claims provider. Possible values: `Body` (default), `Form`, `Header`, or `QueryString`. The `Body` value is the input claim that is sent in the request body in JSON format. The `Form` value is the input claim that is sent in the request body in an ampersand '&' separated key value format. The `Header` value is the input claim that is sent in the request header. The `QueryString` value is the input claim that is sent in the request query string. The HTTP verbs invoked by each are as follows:<br /><ul><li>`Body`: POST</li><li>`Form`: POST</li><li>`Header`: GET</li><li>`QueryString`: GET</li></ul> |
126127
| ClaimsFormat | No | Specifies the format for the output claims. Possible values: `Body` (default), `Form`, `Header`, or `QueryString`. The `Body` value is the output claim that is sent in the request body in JSON format. The `Form` value is the output claim that is sent in the request body in an ampersand '&' separated key value format. The `Header` value is the output claim that is sent in the request header. The `QueryString` value is the output claim that is sent in the request query string. |
127128
| ClaimUsedForRequestPayload| No | Name of a string claim that contains the payload to be sent to the REST API. |

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/fxt-edge-filer/fxt-specs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Microsoft Azure FXT Edge Filer specifications | Microsoft Docs
33
description: Physical and environmental specifications for Azure FXT Edge Filer hardware
44
author: ekpgh
55
ms.service: fxt-edge-filer
6-
ms.topic: overview
6+
ms.topic: conceptual
77
ms.date: 06/20/2019
88
ms.author: rohogue
99
---
Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
---
2+
title: Python
3+
titleSuffix: Azure Machine Learning
4+
description: Learn how to use Python in Azure Machine Learning designer to transform data.
5+
services: machine-learning
6+
ms.service: machine-learning
7+
ms.subservice: core
8+
ms.topic: how-to
9+
10+
author: peterclu
11+
ms.author: peterlu
12+
ms.date: 02/28/2020
13+
---
14+
15+
# Execute Python code in Azure Machine Learning designer
16+
17+
In this article, you learn how to use the [Execute Python Script](algorithm-module-reference/execute-python-script.md) module to add custom logic to Azure Machine Learning designer. In the following how-to, you use the Pandas library to do simple feature engineering.
18+
19+
You can use the in-built code editor to quickly add simple Python logic. If you want to add more complex code or upload additional Python libraries, you should use the zip file method.
20+
21+
The default execution environment uses the Anacondas distribution of Python. For a complete list of pre-installed packages, see the [Execute Python Script module reference](algorithm-module-reference/execute-python-script.md) page.
22+
23+
![Execute Python input map](media/how-to-designer-python/execute-python-map.png)
24+
25+
## Execute Python written in the designer
26+
27+
### Add the Execute Python Script module
28+
29+
1. Find the **Execute Python Script** module in the designer palette. It can be found in the **Python Language** section.
30+
31+
1. Drag and drop the module onto the pipeline canvas.
32+
33+
### Connect input datasets
34+
35+
This article uses the sample dataset, **Automobile price data (Raw)**.
36+
37+
1. Drag and drop your dataset to the pipeline canvas.
38+
39+
1. Connect the output port of the dataset to the top-left input port of the **Execute Python Script** module. The designer exposes the input as a parameter to the entry point script.
40+
41+
The right input port is reserved for zipped python libraries.
42+
43+
![Connect datasets](media/how-to-designer-python/connect-dataset.png)
44+
45+
46+
1. Take note of which input port you use. The designer assigns the left input port to the variable `dataset1` and the middle input port to `dataset2`.
47+
48+
Input modules are optional since you can generate or import data directly in the **Execute Python Script** module.
49+
50+
### Write your Python code
51+
52+
The designer provides an initial entry point script for you to edit and enter your own Python code.
53+
54+
In this example, you use Pandas to combine two columns found in the automobile dataset, **Price** and **Horsepower**, to create a new column, **Dollars per horsepower**. This column represents how much you pay for each horsepower, which could be a useful feature to decide if a car is a good deal for the money.
55+
56+
1. Select the **Execute Python Script** module.
57+
58+
1. In the pane that appears to the right of the canvas, select the **Python script** text box.
59+
60+
1. Copy and paste the following code into the text box.
61+
62+
```python
63+
import pandas as pd
64+
65+
def azureml_main(dataframe1 = None, dataframe2 = None):
66+
dataframe1['Dollar/HP'] = dataframe1.price / dataframe1.horsepower
67+
return dataframe1
68+
```
69+
Your pipeline should look the following image:
70+
71+
![Execute Python pipeline](media/how-to-designer-python/execute-python-pipeline.png)
72+
73+
The entry point script must contain the function `azureml_main`. There are two function parameters that map to the two input ports for the **Execute Python Script** module.
74+
75+
The return value must be a Pandas Dataframe. You can return up to two dataframes as module outputs.
76+
77+
1. Run the pipeline.
78+
79+
Now, you have a dataset with the new feature **Dollars/HP**, which could be useful in training a car recommender. This is an example of feature extraction and dimensionality reduction.
80+
81+
## Next steps
82+
83+
Learn how to [import your own data](how-to-designer-import-data.md) in Azure Machine Learning designer.
15.4 KB
Loading
22.3 KB
Loading
68.9 KB
Loading

articles/machine-learning/toc.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -367,18 +367,21 @@
367367
- name: 'Azure Pipelines for CI/CD'
368368
displayName: continuous, integration, delivery
369369
href: /azure/devops/pipelines/targets/azure-machine-learning?context=azure/machine-learning/service/context/ml-context
370-
- name: 'Designer: Retrain using published pipelines'
370+
- name: 'Designer retrain using published pipelines'
371371
displayName: retrain, designer, published pipeline
372372
href: how-to-retrain-designer.md
373+
- name: Designer batch predictions
374+
displayName: score scoring asynchronous consume pipeline parallelrunstep inference designer
375+
href: how-to-run-batch-predictions-designer.md
376+
- name: Designer execute Python code
377+
displayName: feature extraction, feature engineering
378+
href: how-to-designer-python.md
373379
- name: Use parallel run step
374380
displayName: score scoring batch consume pipeline parallelrunstep inference
375381
href: how-to-use-parallel-run-step.md
376382
- name: Debug & troubleshoot parallel run step
377383
displayName: debug_batch consume pipeline parallelrunstep inference
378384
href: how-to-debug-parallel-run-step.md
379-
- name: Designer batch predictions
380-
displayName: score scoring asynchronous consume pipeline parallelrunstep inference designer
381-
href: how-to-run-batch-predictions-designer.md
382385
- name: Manage resource quotas
383386
displayName: limits
384387
href: how-to-manage-quotas.md

0 commit comments

Comments
 (0)