Skip to content

Commit e9bac10

Browse files
authored
Merge pull request #111026 from MicrosoftDocs/master
4/10 PM Publish
2 parents fb23286 + f839380 commit e9bac10

File tree

195 files changed

+1941
-899
lines changed

Some content is hidden

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

195 files changed

+1941
-899
lines changed

.openpublishing.redirection.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@
533533
},
534534
{
535535
"source_path": "articles/site-recovery/vmware-physical-mobility-service-install-manual.md",
536-
"redirect_url": "/azure/site-recovery/vmware-physical-mobility-service-overview#install-mobility-agent-through-ui",
536+
"redirect_url": "/azure/site-recovery/vmware-physical-mobility-service-overview#install-the-mobility-service-using-ui",
537537
"redirect_document_id": false
538538
},
539539
{

articles/active-directory/manage-apps/common-scenarios.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Identity can only be your control plane if it can connect everything across clou
8585

8686
- [Application management](https://docs.microsoft.com/azure/active-directory/manage-apps/index)
8787
- [Application provisioning](https://docs.microsoft.com/azure/active-directory/app-provisioning/user-provisioning)
88-
- [Hybrid secure access]()
88+
- [Hybrid secure access](https://docs.microsoft.com/azure/active-directory/manage-apps/secure-hybrid-access)
8989
- [Identity governance](https://docs.microsoft.com/azure/active-directory/governance/identity-governance-overview)
9090
- [Microsoft identity platform](https://docs.microsoft.com/azure/active-directory/develop/v2-overview)
9191
- [Identity security](https://docs.microsoft.com/azure/active-directory/conditional-access/index)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ In this tutorial, you'll learn how to integrate ICIMS with Azure Active Director
2727
* Enable your users to be automatically signed-in to ICIMS with their Azure AD accounts.
2828
* Manage your accounts in one central location - the Azure portal.
2929

30-
To learn more about SaaS app integration with Azure AD, see [What is application access and single sign-on with Azure Active Directory](https://docs.microsoft.com/azure/active-directory/what-is-single-sign-on).
30+
To learn more about SaaS app integration with Azure AD, see [What is application access and single sign-on with Azure Active Directory](https://docs.microsoft.com/azure/active-directory/manage-apps/what-is-single-sign-on).
3131

3232
## Prerequisites
3333

@@ -147,7 +147,7 @@ When you click the ICIMS tile in the Access Panel, you should be automatically s
147147

148148
- [ List of Tutorials on How to Integrate SaaS Apps with Azure Active Directory ](https://docs.microsoft.com/azure/active-directory/active-directory-saas-tutorial-list)
149149

150-
- [What is application access and single sign-on with Azure Active Directory? ](https://docs.microsoft.com/azure/active-directory/what-is-single-sign-on)
150+
- [What is application access and single sign-on with Azure Active Directory? ](https://docs.microsoft.com/azure/active-directory/manage-apps/what-is-single-sign-on)
151151

152152
- [What is conditional access in Azure Active Directory?](https://docs.microsoft.com/azure/active-directory/conditional-access/overview)
153153

articles/active-directory/saas-apps/mongodb-cloud-tutorial.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ms.collection: M365-identity-device-management
2323

2424
In this tutorial, you'll learn how to integrate MongoDB Cloud with Azure Active Directory (Azure AD). When you integrate MongoDB Cloud with Azure AD, you can:
2525

26-
* Control in Azure AD who has access to MongoDB Cloud.
26+
* Control in Azure AD who has access to MongoDB Cloud, MongoDB Atlas, the MongoDB Community, University, and Support.
2727
* Enable your users to be automatically signed-in to MongoDB Cloud with their Azure AD accounts.
2828
* Manage your accounts in one central location - the Azure portal.
2929

@@ -146,11 +146,11 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
146146

147147
## Configure MongoDB Cloud SSO
148148

149-
To configure single sign-on on **MongoDB Cloud** side, you need to send the downloaded **Federation Metadata XML** and appropriate copied URLs from Azure portal to [MongoDB Cloud support team](https://support.mongodb.com/). They set this setting to have the SAML SSO connection set properly on both sides.
149+
To configure single sign-on on **MongoDB Cloud** side, you will need the appropriate URLs copied from the Azure portal, and you need to configure the Federation Application for your MongoDB Cloud Organization. Follow the instructions in the [MongoDB Cloud Docs](https://docs.atlas.mongodb.com/security/federated-authentication/index.html). If you encounter any issues, you can contact the [MongoDB Cloud support team](https://support.mongodb.com/) for assistance.
150150

151151
### Create MongoDB Cloud test user
152152

153-
In this section, a user called Britta Simon is created in MongoDB Cloud. MongoDB Cloud supports just-in-time user provisioning, which is enabled by default. There is no action item for you in this section. If a user doesn't already exist in MongoDB Cloud, a new one is created after authentication.
153+
In this section, a user called B.Simon is created in MongoDB Cloud. MongoDB Cloud supports just-in-time user provisioning, which is enabled by default. There is no action item for you in this section. If a user doesn't already exist in MongoDB Cloud, a new one is created after authentication.
154154

155155
## Test SSO
156156

@@ -166,6 +166,8 @@ When you click the MongoDB Cloud tile in the Access Panel, you should be automat
166166

167167
- [What is conditional access in Azure Active Directory?](https://docs.microsoft.com/azure/active-directory/conditional-access/overview)
168168

169+
- [Signup for MongoDB Atlas on Azure](https://azuremarketplace.microsoft.com/en-us/marketplace/apps/mongodb.mongodb_atlas_azure_08082019?tab=Overview)
170+
169171
- [Try MongoDB Cloud with Azure AD](https://aad.portal.azure.com/)
170172

171173
- [What is session control in Microsoft Cloud App Security?](https://docs.microsoft.com/cloud-app-security/proxy-intro-aad)

articles/active-directory/saas-apps/nitro-productivity-suite-tutorial.md

Lines changed: 30 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ To learn more about SaaS app integration with Azure AD, see [What is application
3434
To get started, you need the following items:
3535

3636
* An Azure AD subscription. If you don't have a subscription, you can get a [free account](https://azure.microsoft.com/free/).
37-
* Nitro Productivity Suite single sign-on (SSO) enabled subscription.
37+
* A Nitro Productivity Suite [Enterprise subscription](https://www.gonitro.com/pricing).
3838

3939
## Scenario description
4040

@@ -75,43 +75,59 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
7575

7676
1. In the [Azure portal](https://portal.azure.com/), on the **Nitro Productivity Suite** application integration page, find the **Manage** section and select **single sign-on**.
7777
1. On the **Select a single sign-on method** page, select **SAML**.
78-
1. On the **Set up single sign-on with SAML** page, click the edit/pen icon for **Basic SAML Configuration** to edit the settings.
78+
1. On the **SAML Signing Certificate** section:
79+
80+
a. Find **Certificate (Base64)** and select **Download** to download the certificate and save it on your computer.
81+
82+
![The Certificate download link](common/certificatebase64.png)
83+
84+
1. On the **Set up Nitro Productivity Suite** section:
85+
86+
a. Click the copy icon beside **Login URL**
87+
88+
![Copy configuration URLs](common/copy-configuration-urls.png)
89+
90+
1. In the [Nitro Admin portal](https://admin.gonitro.com/), on the **Enterprise Settings** page find the **Single Sign-On** section and click the **Setup SAML SSO** button.
91+
92+
a. Paste the **Login URL** from the step above into the **Sign In URL** field.
93+
94+
a. Upload the **Certificate (Base64)** from the earlier step above in the **X509 Signing Certificate** field.
95+
96+
a. Click **Submit**
97+
98+
a. Click **Enable Single Sign-On**
99+
100+
101+
1. Return to the [Azure portal](https://portal.azure.com/), on the **Set up single sign-on with SAML** page, click the edit/pen icon for **Basic SAML Configuration** to edit the settings.
79102

80103
![Edit Basic SAML Configuration](common/edit-urls.png)
81104

82105
1. On the **Basic SAML Configuration** section, if you wish to configure the application in **IDP** initiated mode, enter the values for the following fields:
83106

84-
a. In the **Identifier** text box, type a URL using the following pattern:
107+
a. In the **Identifier** text box, copy and paste the **SAML Entity ID** field from the [Nitro Admin portal](https://admin.gonitro.com/). It should have the following pattern:
85108
`urn:auth0:gonitro-prod:<ENVIRONMENT>`
86109

87-
b. In the **Reply URL** text box, type a URL using the following pattern:
110+
b. In the **Reply URL** text box, copy and paste the **ACS URL** field from the [Nitro Admin portal](https://admin.gonitro.com/). It should have the following pattern:
88111
`https://gonitro-prod.eu.auth0.com/login/callback?connection=<ENVIRONMENT>`
89112

90113
1. Click **Set additional URLs** and perform the following step if you wish to configure the application in **SP** initiated mode:
91114

92115
In the **Sign-on URL** text box, type the URL:
93116
`https://sso.gonitro.com/login`
94117

95-
> [!NOTE]
96-
> These values are not real. Update these values with the actual Identifier and Reply URL. Contact [Nitro Productivity Suite Client support team](https://www.gonitro.com/support) to get these values. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
118+
1. Click Save.
97119

98120
1. Nitro Productivity Suite application expects the SAML assertions in a specific format, which requires you to add custom attribute mappings to your SAML token attributes configuration. The following screenshot shows the list of default attributes.
99121

100122
![image](common/default-attributes.png)
101123

102-
1. In addition to above, Nitro Productivity Suite application expects few more attributes to be passed back in SAML response which are shown below. These attributes are also pre populated but you can review them as per your requirements.
124+
1. In addition, the Nitro Productivity Suite application expects a few more attributes to be passed back in the SAML response, as shown in the following table. These attributes are prepopulated, but you can review them per your requirements.
103125

104126
| Name | Source Attribute|
105-
| ---------------| --------------- | --------- |
127+
| ---------------| --------------- |
106128
| employeeNumber | user.objectid |
107129

108-
1. On the **Set up single sign-on with SAML** page, in the **SAML Signing Certificate** section, find **Certificate (Base64)** and select **Download** to download the certificate and save it on your computer.
109-
110-
![The Certificate download link](common/certificatebase64.png)
111-
112-
1. On the **Set up Nitro Productivity Suite** section, copy the appropriate URL(s) based on your requirement.
113130

114-
![Copy configuration URLs](common/copy-configuration-urls.png)
115131
### Create an Azure AD test user
116132

117133
In this section, you'll create a test user in the Azure portal called B.Simon.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ In this tutorial, you'll learn how to integrate OpsGenie with Azure Active Direc
2626
* Enable your users to be automatically signed-in to OpsGenie with their Azure AD accounts.
2727
* Manage your accounts in one central location - the Azure portal.
2828

29-
To learn more about SaaS app integration with Azure AD, see [What is application access and single sign-on with Azure Active Directory](https://docs.microsoft.com/azure/active-directory/what-is-single-sign-on).
29+
To learn more about SaaS app integration with Azure AD, see [What is application access and single sign-on with Azure Active Directory](https://docs.microsoft.com/azure/active-directory/manage-apps/what-is-single-sign-on).
3030

3131
## Prerequisites
3232

@@ -192,7 +192,7 @@ When you click the OpsGenie tile in the Access Panel, you should be automaticall
192192

193193
- [ List of Tutorials on How to Integrate SaaS Apps with Azure Active Directory ](https://docs.microsoft.com/azure/active-directory/active-directory-saas-tutorial-list)
194194

195-
- [What is application access and single sign-on with Azure Active Directory? ](https://docs.microsoft.com/azure/active-directory/what-is-single-sign-on)
195+
- [What is application access and single sign-on with Azure Active Directory? ](https://docs.microsoft.com/azure/active-directory/manage-apps/what-is-single-sign-on)
196196

197197
- [What is conditional access in Azure Active Directory?](https://docs.microsoft.com/azure/active-directory/conditional-access/overview)
198198

articles/aks/use-multiple-node-pools.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.date: 04/08/2020
99

1010
# Create and manage multiple node pools for a cluster in Azure Kubernetes Service (AKS)
1111

12-
In Azure Kubernetes Service (AKS), nodes of the same configuration are grouped together into *node pools*. These node pools contain the underlying VMs that run your applications. The initial number of nodes and their size (SKU) is defined when you create an AKS cluster, which creates a *default node pool*. To support applications that have different compute or storage demands, you can create additional node pools. For example, use these additional node pools to provide GPUs for compute-intensive applications, or access to high-performance SSD storage.
12+
In Azure Kubernetes Service (AKS), nodes of the same configuration are grouped together into *node pools*. These node pools contain the underlying VMs that run your applications. The initial number of nodes and their size (SKU) is defined when you create an AKS cluster, which creates a [system node pool][use-system-pool]. To support applications that have different compute or storage demands, you can create additional *user node pools*. System node pools serve the primary purpose of hosting critical system pods such as CoreDNS and tunnelfront. User node pools serve the primary purpose of hosting your application pods. However, application pods can be scheduled on system node pools if you wish to only have one pool in your AKS cluster. User node pools are where you place your application-specific pods. For example, use these additional user node pools to provide GPUs for compute-intensive applications, or access to high-performance SSD storage.
1313

1414
> [!NOTE]
1515
> This feature enables higher control over how to create and manage multiple node pools. As a result, separate commands are required for create/update/delete. Previously cluster operations through `az aks create` or `az aks update` used the managedCluster API and were the only option to change your control plane and a single node pool. This feature exposes a separate operation set for agent pools through the agentPool API and require use of the `az aks nodepool` command set to execute operations on an individual node pool.
@@ -25,7 +25,8 @@ You need the Azure CLI version 2.2.0 or later installed and configured. Run `az
2525
The following limitations apply when you create and manage AKS clusters that support multiple node pools:
2626

2727
* See [Quotas, virtual machine size restrictions, and region availability in Azure Kubernetes Service (AKS)][quotas-skus-regions].
28-
* You can't delete the system node pool, by default the first node pool.
28+
* You can delete system node pools, provided you have another system node pool to take its place in the AKS cluster.
29+
* System pools must contain at least one node, and user node pools may contain zero or more nodes.
2930
* The AKS cluster must use the Standard SKU load balancer to use multiple node pools, the feature is not supported with Basic SKU load balancers.
3031
* The AKS cluster must use virtual machine scale sets for the nodes.
3132
* The name of a node pool may only contain lowercase alphanumeric characters and must begin with a lowercase letter. For Linux node pools the length must be between 1 and 12 characters, for Windows node pools the length must be between 1 and 6 characters.
@@ -34,6 +35,9 @@ The following limitations apply when you create and manage AKS clusters that sup
3435

3536
## Create an AKS cluster
3637

38+
> [!Important]
39+
> If you run a single system node pool for your AKS cluster in a production environment, we recommend you use at least three nodes for the node pool.
40+
3741
To get started, create an AKS cluster with a single node pool. The following example uses the [az group create][az-group-create] command to create a resource group named *myResourceGroup* in the *eastus* region. An AKS cluster named *myAKSCluster* is then created using the [az aks create][az-aks-create] command. A *--kubernetes-version* of *1.15.7* is used to show how to update a node pool in a following step. You can specify any [supported Kubernetes version][supported-versions].
3842

3943
> [!NOTE]
@@ -749,6 +753,8 @@ az group delete --name myResourceGroup --yes --no-wait
749753

750754
## Next steps
751755

756+
Learn more about [system node pools][use-system-pool].
757+
752758
In this article, you learned how to create and manage multiple node pools in an AKS cluster. For more information about how to control pods across node pools, see [Best practices for advanced scheduler features in AKS][operator-best-practices-advanced-scheduler].
753759

754760
To create and use Windows Server container node pools, see [Create a Windows Server container in AKS][aks-windows].
@@ -784,3 +790,4 @@ To create and use Windows Server container node pools, see [Create a Windows Ser
784790
[tag-limitation]: ../azure-resource-manager/resource-group-using-tags.md
785791
[taints-tolerations]: operator-best-practices-advanced-scheduler.md#provide-dedicated-nodes-using-taints-and-tolerations
786792
[vm-sizes]: ../virtual-machines/linux/sizes.md
793+
[use-system-pool]: use-system-pools.md

articles/aks/use-system-pools.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ ms.date: 04/06/2020
99

1010
# Manage system node pools in Azure Kubernetes Service (AKS)
1111

12-
In Azure Kubernetes Service (AKS), nodes of the same configuration are grouped together into *node pools*. Node pools contain the underlying VMs that run your applications. System node pools and user node pools are two different node pool modes for your AKS clusters. System node pools host essential system services such as CoreDNS. User node pools are where you place your application-specific pods. Every AKS cluster must contain at least one system node pool with at least one node. If you run a single system node pool for your AKS cluster, we recommend you use at least three nodes for the node pool.
12+
In Azure Kubernetes Service (AKS), nodes of the same configuration are grouped together into *node pools*. Node pools contain the underlying VMs that run your applications. System node pools and user node pools are two different node pool modes for your AKS clusters. System node pools serve the primary purpose of hosting critical system pods such as CoreDNS and tunnelfront. User node pools serve the primary purpose of hosting your application pods. However, application pods can be scheduled on system node pools if you wish to only have one pool in your AKS cluster. Every AKS cluster must contain at least one system node pool with at least one node.
13+
14+
> [!Important]
15+
> If you run a single system node pool for your AKS cluster in a production environment, we recommend you use at least three nodes for the node pool.
1316
1417
## Before you begin
1518

articles/aks/virtual-nodes-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Virtual Nodes functionality is heavily dependent on ACI's feature set. The follo
6262
* [Host aliases](https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/)
6363
* [Arguments](../container-instances/container-instances-exec.md#restrictions) for exec in ACI
6464
* [DaemonSets](concepts-clusters-workloads.md#statefulsets-and-daemonsets) will not deploy pods to the virtual node
65-
* [Windows Server nodes (currently in preview in AKS)](windows-container-cli.md) are not supported alongside virtual nodes. You can use virtual nodes to schedule Windows Server containers without the need for Windows Server nodes in an AKS cluster.
65+
* Virtual nodes support scheduling Linux pods. You can manually install the open source [Virtual Kubelet ACI](https://github.com/virtual-kubelet/azure-aci) provider to schedule Windows Server containers to ACI.
6666

6767
## Sign in to Azure
6868

0 commit comments

Comments
 (0)