Skip to content

Commit c7f36d9

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-landing-openshift
2 parents bdd5db8 + c3908e9 commit c7f36d9

File tree

10 files changed

+298
-118
lines changed

10 files changed

+298
-118
lines changed

articles/active-directory/develop/reference-app-manifest.md

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

articles/active-directory/fundamentals/active-directory-compare-azure-ad-to-ad.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Most IT administrators are familiar with Active Directory Domain Services concep
2727
|Provisioning: users | Organizations create internal users manually or use an in-house or automated provisioning system, such as the Microsoft Identity Manager, to integrate with an HR system.|Existing AD organizations use [Azure AD Connect](https://docs.microsoft.com/azure/active-directory/hybrid/how-to-connect-sync-whatis) to sync identities to the cloud.</br> Azure AD adds support to automatically create users from [cloud HR systems](https://docs.microsoft.com/azure/active-directory/saas-apps/workday-tutorial). </br>Azure AD can provision identities in [SCIM enabled](https://docs.microsoft.com/azure/active-directory/manage-apps/use-scim-to-provision-users-and-groups) SaaS apps to automatically provide apps with the necessary details to allow access for users. |
2828
|Provisioning: external identities| Organizations create external users manually as regular users in a dedicated external AD forest, resulting in administration overhead to manage the lifecycle of external identities (guest users)| Azure AD provides a special class of identity to support external identities. [Azure AD B2B](https://docs.microsoft.com/azure/active-directory/b2b/) will manage the link to the external user identity to make sure they are valid. |
2929
| Entitlement management and groups| Administrators make users members of groups. App and resource owners then give groups access to apps or resources.| [Groups](https://docs.microsoft.com/azure/active-directory/fundamentals/active-directory-groups-create-azure-portal) are also available in Azure AD and administrators can also use groups to grant permissions to resources. In Azure AD, administrators can assign membership to groups manually or use a query to dynamically include users to a group. </br> Administrators can use [Entitlement management](https://docs.microsoft.com/azure/active-directory/governance/entitlement-management-overview) in Azure AD to give users access to a collection of apps and resources using workflows and, if necessary, time-based criteria. |
30-
| Admin management|Organizations will use a combination of domains, organizational units, and groups in AD to delegate administrative rights to manage the directory and resources it controls.| Azure AD provides [built-in roles](https://docs.microsoft.com/azure/active-directory/fundamentals/active-directory-users-assign-role-azure-portal) with its role-based access control (RBAC) system, as well as, the ability to [create custom roles](https://docs.microsoft.com/azure/active-directory/users-groups-roles/roles-custom-overview) to delegate privileged access to the identity system and the apps and resources it controls. </br>Managing roles can be enhanced with [Privileged Identity Management (PIM)](https://docs.microsoft.com/azure/active-directory/privileged-identity-management/pim-configure) to provide just-in-time, time-restricted, or workflow-based access to privileged roles. |
30+
| Admin management|Organizations will use a combination of domains, organizational units, and groups in AD to delegate administrative rights to manage the directory and resources it controls.| Azure AD provides [built-in roles](https://docs.microsoft.com/azure/active-directory/fundamentals/active-directory-users-assign-role-azure-portal) with its role-based access control (RBAC) system, with limited support for [creating custom roles](https://docs.microsoft.com/azure/active-directory/users-groups-roles/roles-custom-overview) to delegate privileged access to the identity system, the apps, and resources it controls.</br>Managing roles can be enhanced with [Privileged Identity Management (PIM)](https://docs.microsoft.com/azure/active-directory/privileged-identity-management/pim-configure) to provide just-in-time, time-restricted, or workflow-based access to privileged roles. |
3131
| Credential management| Credentials in Active Directory is based on passwords, certificate authentication, and smartcard authentication. Passwords are managed using password policies that are based on password length, expiry, and complexity.|Azure AD uses intelligent [password protection](https://docs.microsoft.com/azure/active-directory/authentication/concept-password-ban-bad) for cloud and on-premises. Protection includes smart lockout plus blocking common and custom password phrases and substitutions. </br>Azure AD significantly boosts security [through Multi-factor authentication](https://docs.microsoft.com/azure/active-directory/authentication/concept-mfa-howitworks) and [passwordless](https://docs.microsoft.com/azure/active-directory/authentication/concept-authentication-passwordless) technologies, like FIDO2. </br>Azure AD reduces support costs by providing users a [self-service password reset](https://docs.microsoft.com/azure/active-directory/authentication/concept-sspr-howitworks) system. |
3232
| **Apps**|||
3333
| Infrastructure apps|Active Directory forms the basis for many infrastructure on-premises components, for example, DNS, DHCP, IPSec, WiFi, NPS, and VPN access|In a new cloud world, Azure AD, is the new control plane for accessing apps versus relying on networking controls. When users authenticate[, Conditional access (CA)](https://docs.microsoft.com/azure/active-directory/conditional-access/overview), will control which users, will have access to which apps under required conditions.|

articles/active-directory/saas-apps/awardspring-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
104104
| First Name | user.givenname |
105105
| Last Name | user.surname |
106106
| Email | user.mail |
107-
| Username | user.userprinicipalname |
107+
| Username | user.userprincipalname |
108108
| StudentID | < Student ID > |
109109

110110
> [!NOTE]

articles/active-directory/saas-apps/kronos-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
102102

103103
b. From the **Transformation** list, select **ExtractMailPrefix()**.
104104

105-
c. From the **Parameter 1** list, select **user.userprinicipalname**.
105+
c. From the **Parameter 1** list, select **user.userprincipalname**.
106106

107107
d. Click **Save**.
108108

articles/active-directory/saas-apps/sap-fiori-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
170170

171171
1. In the **Transformation** list, select **ExtractMailPrefix()**.
172172

173-
1. In the **Parameter 1** list, select **user.userprinicipalname**.
173+
1. In the **Parameter 1** list, select **user.userprincipalname**.
174174

175175
1. Select **Save**.
176176

articles/active-directory/saas-apps/sap-netweaver-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
175175

176176
b. From the **Transformation** list, select **ExtractMailPrefix()**.
177177

178-
c. From the **Parameter 1** list, select **user.userprinicipalname**.
178+
c. From the **Parameter 1** list, select **user.userprincipalname**.
179179

180180
d. Click **Save**.
181181

articles/hdinsight/connect-on-premises-network.md

Lines changed: 58 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ author: hrasheed-msft
55
ms.author: hrasheed
66
ms.reviewer: jasonh
77
ms.service: hdinsight
8-
ms.custom: hdinsightactive
98
ms.topic: conceptual
10-
ms.date: 10/16/2019
9+
ms.custom: hdinsightactive
10+
ms.date: 03/04/2020
1111
---
1212

1313
# Connect HDInsight to your on-premises network
@@ -23,12 +23,12 @@ Learn how to connect HDInsight to your on-premises network by using Azure Virtua
2323

2424
To allow HDInsight and resources in the joined network to communicate by name, you must perform the following actions:
2525

26-
* Create Azure Virtual Network.
27-
* Create a custom DNS server in the Azure Virtual Network.
28-
* Configure the virtual network to use the custom DNS server instead of the default Azure Recursive Resolver.
29-
* Configure forwarding between the custom DNS server and your on-premises DNS server.
26+
1. Create Azure Virtual Network.
27+
1. Create a custom DNS server in the Azure Virtual Network.
28+
1. Configure the virtual network to use the custom DNS server instead of the default Azure Recursive Resolver.
29+
1. Configure forwarding between the custom DNS server and your on-premises DNS server.
3030

31-
This configuration enables the following behavior:
31+
These configurations enable the following behavior:
3232

3333
* Requests for fully qualified domain names that have the DNS suffix __for the virtual network__ are forwarded to the custom DNS server. The custom DNS server then forwards these requests to the Azure Recursive Resolver, which returns the IP address.
3434
* All other requests are forwarded to the on-premises DNS server. Even requests for public internet resources such as microsoft.com are forwarded to the on-premises DNS server for name resolution.
@@ -60,11 +60,13 @@ These steps use the [Azure portal](https://portal.azure.com) to create an Azure
6060

6161
1. Sign in to the [Azure portal](https://portal.azure.com).
6262

63-
2. From the left menu, navigate to **+ Create a resource** > **Compute** > **Ubuntu Server 18.04 LTS**.
63+
1. From the top menu, select **+ Create a resource**.
6464

65-
![Create an Ubuntu virtual machine](./media/connect-on-premises-network/create-ubuntu-virtual-machine.png)
65+
![Create an Ubuntu virtual machine](./media/connect-on-premises-network/azure-portal-create-resource.png)
6666

67-
3. From the __Basics__ tab, enter the following information:
67+
1. Select **Compute** > **Virtual machine** to go to the **Create a virtual machine** page.
68+
69+
1. From the __Basics__ tab, enter the following information:
6870

6971
| Field | Value |
7072
| --- | --- |
@@ -118,35 +120,35 @@ Once the virtual machine has been created, you'll receive a **Deployment succeed
118120
2. To install Bind, use the following commands from the SSH session:
119121

120122
```bash
121-
sudo apt-get update -y
122-
sudo apt-get install bind9 -y
123+
sudo apt-get update -y
124+
sudo apt-get install bind9 -y
123125
```
124126

125127
3. To configure Bind to forward name resolution requests to your on premises DNS server, use the following text as the contents of the `/etc/bind/named.conf.options` file:
126128

127-
acl goodclients {
128-
10.0.0.0/16; # Replace with the IP address range of the virtual network
129-
10.1.0.0/16; # Replace with the IP address range of the on-premises network
130-
localhost;
131-
localnets;
132-
};
129+
acl goodclients {
130+
10.0.0.0/16; # Replace with the IP address range of the virtual network
131+
10.1.0.0/16; # Replace with the IP address range of the on-premises network
132+
localhost;
133+
localnets;
134+
};
133135

134-
options {
135-
directory "/var/cache/bind";
136+
options {
137+
directory "/var/cache/bind";
136138

137-
recursion yes;
139+
recursion yes;
138140

139-
allow-query { goodclients; };
141+
allow-query { goodclients; };
140142

141-
forwarders {
142-
192.168.0.1; # Replace with the IP address of the on-premises DNS server
143-
};
143+
forwarders {
144+
192.168.0.1; # Replace with the IP address of the on-premises DNS server
145+
};
144146

145-
dnssec-validation auto;
147+
dnssec-validation auto;
146148

147-
auth-nxdomain no; # conform to RFC1035
148-
listen-on { any; };
149-
};
149+
auth-nxdomain no; # conform to RFC1035
150+
listen-on { any; };
151+
};
150152

151153
> [!IMPORTANT]
152154
> Replace the values in the `goodclients` section with the IP address range of the virtual network and on-premises network. This section defines the addresses that this DNS server accepts requests from.
@@ -173,15 +175,15 @@ Once the virtual machine has been created, you'll receive a **Deployment succeed
173175
dnsproxy.icb0d0thtw0ebifqt0g1jycdxd.ex.internal.cloudapp.net
174176
```
175177

176-
The `icb0d0thtw0ebifqt0g1jycdxd.ex.internal.cloudapp.net` text is the __DNS suffix__ for this virtual network. Save this value, as it is used later.
178+
The `icb0d0thtw0ebifqt0g1jycdxd.ex.internal.cloudapp.net` text is the __DNS suffix__ for this virtual network. Save this value, as it's used later.
177179
178180
5. To configure Bind to resolve DNS names for resources within the virtual network, use the following text as the contents of the `/etc/bind/named.conf.local` file:
179181
180182
// Replace the following with the DNS suffix for your virtual network
181-
zone "icb0d0thtw0ebifqt0g1jycdxd.ex.internal.cloudapp.net" {
182-
type forward;
183-
forwarders {168.63.129.16;}; # The Azure recursive resolver
184-
};
183+
zone "icb0d0thtw0ebifqt0g1jycdxd.ex.internal.cloudapp.net" {
184+
type forward;
185+
forwarders {168.63.129.16;}; # The Azure recursive resolver
186+
};
185187
186188
> [!IMPORTANT]
187189
> You must replace the `icb0d0thtw0ebifqt0g1jycdxd.ex.internal.cloudapp.net` with the DNS suffix you retrieved earlier.
@@ -250,9 +252,9 @@ A conditional forward only forwards requests for a specific DNS suffix. In this
250252
The following text is an example of a conditional forwarder configuration for the **Bind** DNS software:
251253
252254
zone "icb0d0thtw0ebifqt0g1jycdxd.ex.internal.cloudapp.net" {
253-
type forward;
254-
forwarders {10.0.0.4;}; # The custom DNS server's internal IP address
255-
};
255+
type forward;
256+
forwarders {10.0.0.4;}; # The custom DNS server's internal IP address
257+
};
256258

257259
For information on using DNS on **Windows Server 2016**, see the [Add-DnsServerConditionalForwarderZone](https://technet.microsoft.com/itpro/powershell/windows/dnsserver/add-dnsserverconditionalforwarderzone) documentation...
258260

@@ -301,25 +303,25 @@ To directly connect to HDInsight through the virtual network, use the following
301303
302304
1. To discover the internal fully qualified domain names of the HDInsight cluster nodes, use one of the following methods:
303305
304-
```powershell
305-
$resourceGroupName = "The resource group that contains the virtual network used with HDInsight"
306-
307-
$clusterNICs = Get-AzNetworkInterface -ResourceGroupName $resourceGroupName | where-object {$_.Name -like "*node*"}
308-
309-
$nodes = @()
310-
foreach($nic in $clusterNICs) {
311-
$node = new-object System.Object
312-
$node | add-member -MemberType NoteProperty -name "Type" -value $nic.Name.Split('-')[1]
313-
$node | add-member -MemberType NoteProperty -name "InternalIP" -value $nic.IpConfigurations.PrivateIpAddress
314-
$node | add-member -MemberType NoteProperty -name "InternalFQDN" -value $nic.DnsSettings.InternalFqdn
315-
$nodes += $node
316-
}
317-
$nodes | sort-object Type
318-
```
319-
320-
```azurecli
321-
az network nic list --resource-group <resourcegroupname> --output table --query "[?contains(name,'node')].{NICname:name,InternalIP:ipConfigurations[0].privateIpAddress,InternalFQDN:dnsSettings.internalFqdn}"
322-
```
306+
```powershell
307+
$resourceGroupName = "The resource group that contains the virtual network used with HDInsight"
308+
309+
$clusterNICs = Get-AzNetworkInterface -ResourceGroupName $resourceGroupName | where-object {$_.Name -like "*node*"}
310+
311+
$nodes = @()
312+
foreach($nic in $clusterNICs) {
313+
$node = new-object System.Object
314+
$node | add-member -MemberType NoteProperty -name "Type" -value $nic.Name.Split('-')[1]
315+
$node | add-member -MemberType NoteProperty -name "InternalIP" -value $nic.IpConfigurations.PrivateIpAddress
316+
$node | add-member -MemberType NoteProperty -name "InternalFQDN" -value $nic.DnsSettings.InternalFqdn
317+
$nodes += $node
318+
}
319+
$nodes | sort-object Type
320+
```
321+
322+
```azurecli
323+
az network nic list --resource-group <resourcegroupname> --output table --query "[?contains(name,'node')].{NICname:name,InternalIP:ipConfigurations[0].privateIpAddress,InternalFQDN:dnsSettings.internalFqdn}"
324+
```
323325
324326
2. To determine the port that a service is available on, see the [Ports used by Apache Hadoop services on HDInsight](./hdinsight-hadoop-port-settings-for-services.md) document.
325327

articles/hdinsight/hdinsight-capacity-planning.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ cluster.
5454
* When you want to isolate different parts of the storage for reasons of security, or to simplify
5555
administration.
5656

57-
For a 48-node cluster, we recommend 4 to 8 storage accounts. Although there may already be sufficient total storage, each storage account provides additional networking bandwidth for the compute nodes. When you have multiple storage accounts, use a random name for each storage account, without a prefix. The purpose of random naming is reducing the chance of storage bottlenecks (throttling) or common-mode failures across all accounts. For better performance, use only one container per storage account.
57+
For better performance, use only one container per storage account.
5858

5959
## Choose a cluster type
6060

71 KB
Loading

0 commit comments

Comments
 (0)