Skip to content

Commit f76d0b3

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into CarlRabeler1
2 parents ca08e37 + f839380 commit f76d0b3

File tree

172 files changed

+1613
-817
lines changed

Some content is hidden

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

172 files changed

+1613
-817
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/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

articles/api-management/api-management-configuration-repository-git.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ To view and configure your Git configuration settings, you can click the **Secur
5151
>
5252
>
5353
54-
For information on enabling or disabling Git access using the REST API, see [Enable or disable Git access using the REST API](/rest/api/apimanagement/2019-01-01/tenantaccess?EnableGit).
54+
For information on enabling or disabling Git access using the REST API, see [Enable or disable Git access using the REST API](/rest/api/apimanagement/2019-12-01/tenantaccess?EnableGit).
5555

5656
## To save the service configuration to the Git repository
5757

@@ -63,7 +63,7 @@ After a few moments the configuration is saved, and the configuration status of
6363

6464
Once the configuration is saved to the repository, it can be cloned.
6565

66-
For information on performing this operation using the REST API, see [Commit configuration snapshot using the REST API](/rest/api/apimanagement/2019-01-01/tenantaccess?CommitSnapshot).
66+
For information on performing this operation using the REST API, see [Commit configuration snapshot using the REST API](/rest/api/apimanagement/2019-12-01/tenantaccess?CommitSnapshot).
6767

6868
## To clone the repository to your local machine
6969

@@ -137,7 +137,7 @@ git push
137137

138138
Once your local changes are committed and pushed to the server repository, you can deploy them to your API Management service instance.
139139

140-
For information on performing this operation using the REST API, see [Deploy Git changes to configuration database using the REST API](https://docs.microsoft.com/rest/api/apimanagement/2019-01-01/tenantconfiguration).
140+
For information on performing this operation using the REST API, see [Deploy Git changes to configuration database using the REST API](https://docs.microsoft.com/rest/api/apimanagement/2019-12-01/tenantconfiguration).
141141

142142
## File and folder structure reference of local Git repository
143143

@@ -167,9 +167,9 @@ These files can be created, deleted, edited, and managed on your local file syst
167167
> [!NOTE]
168168
> The following entities are not contained in the Git repository and cannot be configured using Git.
169169
>
170-
> * [Users](https://docs.microsoft.com/rest/api/apimanagement/2019-01-01/user)
171-
> * [Subscriptions](https://docs.microsoft.com/rest/api/apimanagement/2019-01-01/subscription)
172-
> * [Named Values](https://docs.microsoft.com/rest/api/apimanagement/2019-01-01/property)
170+
> * [Users](https://docs.microsoft.com/rest/api/apimanagement/2019-12-01/user)
171+
> * [Subscriptions](https://docs.microsoft.com/rest/api/apimanagement/2019-12-01/subscription)
172+
> * [Named Values](https://docs.microsoft.com/rest/api/apimanagement/2019-12-01/property)
173173
> * Developer portal entities other than styles
174174
>
175175
@@ -217,14 +217,14 @@ The final setting, `$ref-policy`, maps to the global policy statements file for
217217
### apis folder
218218
The `apis` folder contains a folder for each API in the service instance, which contains the following items.
219219

220-
* `apis\<api name>\configuration.json` - this is the configuration for the API and contains information about the backend service URL and the operations. This is the same information that would be returned if you were to call [Get a specific API](https://docs.microsoft.com/rest/api/apimanagement/2019-01-01/apis/get) with `export=true` in `application/json` format.
220+
* `apis\<api name>\configuration.json` - this is the configuration for the API and contains information about the backend service URL and the operations. This is the same information that would be returned if you were to call [Get a specific API](https://docs.microsoft.com/rest/api/apimanagement/2019-12-01/apis/get) with `export=true` in `application/json` format.
221221
* `apis\<api name>\api.description.html` - this is the description of the API and corresponds to the `description` property of the [API entity](https://docs.microsoft.com/java/api/com.microsoft.azure.storage.table.entityproperty).
222222
* `apis\<api name>\operations\` - this folder contains `<operation name>.description.html` files that map to the operations in the API. Each file contains the description of a single operation in the API, which maps to the `description` property of the [operation entity](https://docs.microsoft.com/rest/api/visualstudio/operations/list#operationproperties) in the REST API.
223223

224224
### groups folder
225225
The `groups` folder contains a folder for each group defined in the service instance.
226226

227-
* `groups\<group name>\configuration.json` - this is the configuration for the group. This is the same information that would be returned if you were to call the [Get a specific group](https://docs.microsoft.com/rest/api/apimanagement/2019-01-01/group/get) operation.
227+
* `groups\<group name>\configuration.json` - this is the configuration for the group. This is the same information that would be returned if you were to call the [Get a specific group](https://docs.microsoft.com/rest/api/apimanagement/2019-12-01/group/get) operation.
228228
* `groups\<group name>\description.html` - this is the description of the group and corresponds to the `description` property of the [group entity](https://docs.microsoft.com/rest/api/apimanagement/apimanagementrest/azure-api-management-rest-api-group-entity).
229229

230230
### policies folder
@@ -244,7 +244,7 @@ The `portalStyles` folder contains configuration and style sheets for developer
244244
### products folder
245245
The `products` folder contains a folder for each product defined in the service instance.
246246

247-
* `products\<product name>\configuration.json` - this is the configuration for the product. This is the same information that would be returned if you were to call the [Get a specific product](https://docs.microsoft.com/rest/api/apimanagement/2019-01-01/product/get) operation.
247+
* `products\<product name>\configuration.json` - this is the configuration for the product. This is the same information that would be returned if you were to call the [Get a specific product](https://docs.microsoft.com/rest/api/apimanagement/2019-12-01/product/get) operation.
248248
* `products\<product name>\product.description.html` - this is the description of the product and corresponds to the `description` property of the [product entity](https://docs.microsoft.com/rest/api/apimanagement/apimanagementrest/azure-api-management-rest-api-product-entity) in the REST API.
249249

250250
### templates

articles/api-management/api-management-howto-add-products.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Developers must first subscribe to a product to get access to the API. When they
8181
4. Choose an API and click **Select**.
8282

8383
> [!TIP]
84-
> You can create or update user's subscription to a *Product* with custom subscription keys [through REST API](https://docs.microsoft.com/rest/api/apimanagement/2019-01-01/subscription/createorupdate) or PowerShell command.
84+
> You can create or update user's subscription to a *Product* with custom subscription keys [through REST API](https://docs.microsoft.com/rest/api/apimanagement/2019-12-01/subscription/createorupdate) or PowerShell command.
8585
8686
## Next steps
8787

0 commit comments

Comments
 (0)