Skip to content

Commit 5cf298a

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 74c57b3 + d322d0a commit 5cf298a

Some content is hidden

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

43 files changed

+523
-114
lines changed

articles/active-directory-b2c/custom-policy-password-complexity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,4 +149,4 @@ To configure the password complexity, override the `newPassword` and `reenterPas
149149
## Next steps
150150

151151
- Learn how to [Configure password change using custom policies in Azure Active Directory B2C](custom-policy-password-change.md).
152-
- - Learn more about the [Predicates](predicates.md) and [PredicateValidations](predicates.md#predicatevalidations) elements in the IEF reference.
152+
- Learn more about the [Predicates](predicates.md) and [PredicateValidations](predicates.md#predicatevalidations) elements in the IEF reference.

articles/active-directory/app-provisioning/define-conditional-rules-for-provisioning-user-accounts.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,8 @@ Scoping filters are configured as part of the attribute mappings for each Azure
9898

9999

100100
>[!IMPORTANT]
101-
> The IsMemberOf filter is not supported currently.
101+
> - The IsMemberOf filter is not supported currently.
102+
> - EQUALS and NOT EQUALS are not supported for multi-valued attributes
102103
103104
9. Optionally, repeat steps 7-8 to add more scoping clauses.
104105

articles/active-directory/user-help/user-help-auth-app-faq.md

Lines changed: 15 additions & 15 deletions
Large diffs are not rendered by default.

articles/active-directory/user-help/user-help-auth-app-sign-in.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ On an iOS device:
108108

109109
## Sign in using two-factor verification for your account
110110

111-
The standard two-factor verification method requires you to enter your username and password into the device you're logging in to, and then choose whether the Microsoft Authenticator app receives Microsoft Authenticator app. On an Android device, these verification codes can be found on the Accounts screen. On an iOS device, these verification codes can be found in the **Accounts** screen or the full screen view of an account, depending on the type of account. You turn on two-factor verification for your account as part of the process to add the account to the Microsoft Authenticator app.
111+
The standard two-factor verification method requires you to enter your username and password into the device you're logging in to. Then, you open your Microsoft Authenticator app and type the randomly generated code for your account into the **Enter code** box. On an Android device, these verification codes can be found on the **Accounts** screen. On an iOS device, these verification codes can be found on the **Accounts** screen or the full screen view of an account, depending on the type of account. You turn on two-factor verification for your account as part of the process to add the account to the Microsoft Authenticator app.
112112

113113
>[!Note]
114114
>If you don't see your work or school account or your personal account on the **Accounts** screen of the Microsoft Authenticator app, it means that you haven't added the account to the Microsoft Authenticator app. To add your account, see [Add your work or school account](user-help-auth-app-add-work-school-account.md) or [Add your personal accounts](user-help-auth-app-add-personal-ms-account.md).

articles/app-service/containers/quickstart-multi-container.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,9 @@ When the App Service plan has been created, the Azure CLI shows information simi
9393

9494
## Create a Docker Compose app
9595

96+
> [!NOTE]
97+
> Docker Compose on Azure App Services currently has a limit of 4,000 characters at this time.
98+
9699
In your Cloud Shell terminal, create a multi-container [web app](app-service-linux-intro.md) in the `myAppServicePlan` App Service plan with the [az webapp create](/cli/azure/webapp?view=azure-cli-latest#az-webapp-create) command. Don't forget to replace _\<app_name>_ with a unique app name (valid characters are `a-z`, `0-9`, and `-`).
97100

98101
```azurecli
9.85 KB
Loading
Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
---
2+
title: Install Connected Machine agent using Windows PowerShell DSC
3+
description: In this article, you learn how to connect machines to Azure using Azure Arc for servers (preview) using Windows PowerShell DSC.
4+
services: azure-arc
5+
ms.service: azure-arc
6+
ms.subservice: azure-arc-servers
7+
author: mgoedtel
8+
ms.author: magoedte
9+
ms.date: 03/12/2020
10+
ms.topic: conceptual
11+
---
12+
13+
# How to install the Connected Machine agent using Windows PowerShell DSC
14+
15+
Using [Windows PowerShell Desired State Configuration](https://docs.microsoft.com/powershell/scripting/dsc/getting-started/winGettingStarted?view=powershell-7) (DSC), you can automate software installation and configuration for a Windows computer. This article describes how to use DSC to install the Azure Arc for servers Connected Machine agent on hybrid Windows machines.
16+
17+
## Requirements
18+
19+
- Windows PowerShell version 4.0 or higher
20+
21+
- The [AzureConnectedMachineDsc](https://www.powershellgallery.com/packages/AzureConnectedMachineDsc/1.0.1.0) DSC module
22+
23+
- A service principal to connect the machines to Azure Arc for servers non-interactively. Follow the steps under the section [Create a Service Principal for onboarding at scale](onboard-service-principal.md#create-a-service-principal-for-onboarding-at-scale) if you have not created a service principal for Arc for servers already.
24+
25+
## Install the ConnectedMachine DSC module
26+
27+
1. To manually install the module, download the source code and unzip the contents of the project directory to the
28+
`$env:ProgramFiles\WindowsPowerShell\Modules folder`. Or, run the following command to install from the PowerShell gallery using PowerShellGet (in PowerShell 5.0):
29+
30+
```powershell
31+
Find-Module -Name AzureConnectedMachineDsc -Repository PSGallery | Install-Module
32+
```
33+
34+
2. To confirm installation, run the following command and ensure you see the Azure Connected Machine DSC resources available.
35+
36+
```powershell
37+
Get-DscResource -Module AzureConnectedMachineDsc
38+
```
39+
40+
In the output, you should see something similar to the following:
41+
42+
![Confirmation of Connected Machine DSC module installation example](./media/onboard-dsc/confirm-module-installation.png)
43+
44+
## Install the agent and connect to Azure
45+
46+
The resources in this module are designed to manage the Azure Connected Machine Agent configuration. Also included is a PowerShell script `AzureConnectedMachineAgent.ps1`, found in the `AzureConnectedMachineDsc\examples` folder. It uses community resources to automate the download and installation, and establish a connection with Azure Arc. This script performs similar steps described in the [Connect hybrid machines to Azure from the Azure portal](onboard-portal.md) article.
47+
48+
If the machine needs to communicate through a proxy server to the service, after you install the agent you need to run a command that's described [here](onboard-portal.md#configure-the-agent-proxy-setting). This sets the proxy server system environment variable `https_proxy`. Instead of running the command manually, you can perform this step with DSC by using the [ComputeManagementDsc](https://www.powershellgallery.com/packages/ComputerManagementDsc/6.0.0.0) module.
49+
50+
>[!NOTE]
51+
>To allow DSC to run, Windows needs to be configured to receive PowerShell remote commands even when you're running a localhost configuration. To easily configure your environment correctly, just run `Set-WsManQuickConfig -Force` in an elevated PowerShell Terminal.
52+
>
53+
54+
Configuration documents (MOF files) can be applied to the machine using the `Start-DscConfiguration` cmdlet.
55+
56+
The following are the parameters you pass to the PowerShell script to use.
57+
58+
- `TenantId`: The unique identifier (GUID) that represents your dedicated instance of Azure AD.
59+
60+
- `SubscriptionId`: The subscription ID (GUID) of your Azure subscription that you want the machines in.
61+
62+
- `ResourceGroup`: The resource group name where you want your connected machines to belong to.
63+
64+
- `Location`: See [supported Azure regions](overview.md#supported-regions). This location can be the same or different, as the resource group's location.
65+
66+
- `Tags`: String array of tags that should be applied to the connected machine resource.
67+
68+
- `Credential`: A PowerShell credential object with the **ApplicationId** and **password** used to register machines at scale using a [service principal](onboard-service-principal.md).
69+
70+
1. In a PowerShell console, navigate to the folder where you saved the `.ps1` file.
71+
72+
2. Run the following PowerShell commands to compile the MOF document (for information about compiling DSC configurations, see [DSC Configurations](https://docs.microsoft.com/powershell/scripting/dsc/configurations/configurations?view=powershell-7):
73+
74+
```powershell
75+
.\`AzureConnectedMachineAgent.ps1 -TenantId <TenantId GUID> -SubscriptionId <SubscriptionId GUID> -ResourceGroup '<ResourceGroupName>' -Location '<LocationName>' -Tags '<Tag>' -Credential <psCredential>
76+
```
77+
78+
3. This will create a `localhost.mof file` in a new folder named `C:\dsc`.
79+
80+
After you install the agent and configure it to connect to Azure Arc for servers (preview), go to the Azure portal to verify that the server has been successfully connected. View your machines in the [Azure portal](https://aka.ms/hybridmachineportal).
81+
82+
## Adding to existing configurations
83+
84+
This resource can be added to existing DSC configurations to represent an end-to-end configuration for a machine. For example, you might wish to add this resource to a configuration that sets secure operating system settings.
85+
86+
The [CompsiteResource](https://www.powershellgallery.com/packages/compositeresource/0.4.0) module from the PowerShell Gallery can be used to create a [composite resource](https://docs.microsoft.com/powershell/scripting/dsc/resources/authoringResourceComposite?view=powershell-7) of the example configuration, to further simplify combining configurations.
87+
88+
## Next steps
89+
90+
- Learn how to manage your machine using [Azure Policy](../../governance/policy/overview.md), for such things as VM [guest configuration](../../governance/policy/concepts/guest-configuration.md), verifying the machine is reporting to the expected Log Analytics workspace, enable monitoring with [Azure Monitor with VMs](../../azure-monitor/insights/vminsights-enable-at-scale-policy.md), and much more.
91+
92+
- Learn more about the [Log Analytics agent](../../azure-monitor/platform/log-analytics-agent.md). The Log Analytics agent for Windows and Linux is required when you want to proactively monitor the OS and workloads running on the machine, manage it using Automation runbooks or solutions like Update Management, or use other Azure services like [Azure Security Center](../../security-center/security-center-intro.md).

articles/azure-arc/servers/onboard-portal.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ The script to automate the download and installation, and to establish the conne
5151
## Install and validate the agent on Windows
5252

5353
### Install manually
54+
5455
You can install the Connected Machine agent manually by running the Windows Installer package *AzureConnectedMachineAgent.msi*.
5556

5657
> [!NOTE]

articles/azure-arc/toc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
href: ./servers/onboard-portal.md
1313
- name: Connect machines at scale using a service principal
1414
href: ./servers/onboard-service-principal.md
15+
- name: Connect machines to Azure Arc with PowerShell DSC
16+
href: ./servers/onboard-dsc.md
1517
- name: Reference
1618
items:
1719
- name: Azure Connected Machine Agent CLI interface

articles/azure-databricks/TOC.yml

Lines changed: 47 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -31,44 +31,9 @@
3131
items:
3232
- name: Getting started
3333
items:
34-
- name: Data overview
35-
href: /azure/databricks/getting-started/data
36-
maintainContext: true
3734
- name: Azure Databricks concepts
3835
href: /azure/databricks/getting-started/concepts
3936
maintainContext: true
40-
- name: Azure Databricks datasets
41-
href: /azure/databricks/getting-started/databricks-datasets
42-
maintainContext: true
43-
- name: Apache Spark
44-
items:
45-
- name: Apache Spark overview
46-
href: /azure/databricks/getting-started/spark/index
47-
maintainContext: true
48-
- name: Get started with Apache Spark
49-
href: /azure/databricks/getting-started/spark/quick-start
50-
maintainContext: true
51-
- name: DataFrames
52-
href: /azure/databricks/getting-started/spark/dataframes
53-
maintainContext: true
54-
- name: Datasets
55-
href: /azure/databricks/getting-started/spark/datasets
56-
maintainContext: true
57-
- name: Machine learning
58-
href: /azure/databricks/getting-started/spark/machine-learning
59-
maintainContext: true
60-
- name: Structured streaming
61-
href: /azure/databricks/getting-started/spark/streaming
62-
maintainContext: true
63-
- name: What's next
64-
href: /azure/databricks/getting-started/spark/next
65-
maintainContext: true
66-
- name: Training and FAQ
67-
href: /azure/databricks/getting-started/training-faq
68-
maintainContext: true
69-
- name: Supported browsers
70-
href: /azure/databricks/getting-started/supported-browsers
71-
maintainContext: true
7237
- name: Databricks runtimes
7338
items:
7439
- name: Runtime overview
@@ -220,6 +185,9 @@
220185
maintainContext: true
221186
- name: Data
222187
items:
188+
- name: Data overview
189+
href: /azure/databricks/getting-started/data
190+
maintainContext: true
223191
- name: Databases and tables
224192
href: /azure/databricks/data/tables
225193
maintainContext: true
@@ -311,6 +279,9 @@
311279
- name: Databricks File System (DBFS)
312280
href: /azure/databricks/data/databricks-file-system
313281
maintainContext: true
282+
- name: Azure Databricks Datasets
283+
href: /azure/databricks/getting-started/databricks-datasets
284+
maintainContext: true
314285
- name: FileStore
315286
href: /azure/databricks/data/filestore
316287
maintainContext: true
@@ -732,6 +703,9 @@
732703
- name: RStudio on Azure Databricks
733704
href: /azure/databricks/spark/latest/sparkr/rstudio
734705
maintainContext: true
706+
- name: Shiny on Azure Databricks
707+
href: /azure/databricks/spark/latest/sparkr/shiny
708+
maintainContext: true
735709
- name: Machine learning
736710
items:
737711
- name: Machine learning overview
@@ -1385,6 +1359,9 @@
13851359
- name: Ensure idempotency
13861360
href: /azure/databricks/kb/jobs/jobs-idempotency
13871361
maintainContext: true
1362+
- name: Long jobs fail with credential passthrough
1363+
href: /azure/databricks/kb/jobs/azure-long-job-failed-auth
1364+
maintainContext: true
13881365
- name: Libraries
13891366
items:
13901367
- name: Can't uninstall library from UI
@@ -1495,6 +1472,12 @@
14951472
- name: Run SQL queries
14961473
href: /azure/databricks/kb/python/sql-in-python
14971474
maintainContext: true
1475+
- name: Use the HDFS API to read files in Python
1476+
href: /azure/databricks/kb/python/hdfs-to-read-files
1477+
maintainContext: true
1478+
- name: Python 2 sunset status
1479+
href: /azure/databricks/kb/python/python-2-eol
1480+
maintainContext: true
14981481
- name: R with Spark
14991482
items:
15001483
- name: Change version of R
@@ -1650,6 +1633,35 @@
16501633
href: /azure/templates/microsoft.databricks/workspaces
16511634
- name: Resources
16521635
items:
1636+
- name: Apache Spark
1637+
items:
1638+
- name: Apache Spark overview
1639+
href: /azure/databricks/getting-started/spark/index
1640+
maintainContext: true
1641+
- name: Get started with Apache Spark
1642+
href: /azure/databricks/getting-started/spark/quick-start
1643+
maintainContext: true
1644+
- name: DataFrames
1645+
href: /azure/databricks/getting-started/spark/dataframes
1646+
maintainContext: true
1647+
- name: Datasets
1648+
href: /azure/databricks/getting-started/spark/datasets
1649+
maintainContext: true
1650+
- name: Machine learning
1651+
href: /azure/databricks/getting-started/spark/machine-learning
1652+
maintainContext: true
1653+
- name: Structured streaming
1654+
href: /azure/databricks/getting-started/spark/streaming
1655+
maintainContext: true
1656+
- name: What's next
1657+
href: /azure/databricks/getting-started/spark/next
1658+
maintainContext: true
1659+
- name: Training and FAQ
1660+
href: /azure/databricks/getting-started/training-faq
1661+
maintainContext: true
1662+
- name: Supported browsers
1663+
href: /azure/databricks/getting-started/supported-browsers
1664+
maintainContext: true
16531665
- name: Release notes
16541666
items:
16551667
- name: Platform

0 commit comments

Comments
 (0)