Merge pull request #6496 from MicrosoftDocs/FromPrivateRepo

From private repo

Author: v-alje

.openpublishing.redirection.json

@@ -3,7 +3,7 @@
             "source_path": "articles/search/search-howto-index-documentdb.md",
             "redirect_url": "/azure/search/search-howto-index-cosmosdb",
             "redirect_document_id": true
-        },     
+        },
         {
             "source_path": "articles/machine-learning/preview/release-notes-sprint-0.md",
             "redirect_url": "/azure/machine-learning/preview/release-notes-sprint-1",
@@ -1127,7 +1127,7 @@
 	    "source_path": "articles/vs-azure-tools-remote-desktop-roles.md",
             "redirect_url": "/azure/cloud-services/cloud-services-role-enable-remote-desktop-visual-studio",
             "redirect_document_id": false
-        },        
+        },
         {
             "source_path": "articles/xplat-cli-azure-resource-manager.md",
             "redirect_url": "/azure/azure-resource-manager/xplat-cli-azure-resource-manager",
@@ -8934,7 +8934,7 @@
             "redirect_url": "migrate-overview",
             "redirect_document_id": false
         },
-	{	     
+	{
             "source_path": "articles/site-recovery/site-recovery-physical-servers-to-azure.md",
             "redirect_url": "physical-azure-disaster-recovery",
             "redirect_document_id": false
@@ -9001,7 +9001,7 @@
         },
         {
             "source_path": "articles/site-recovery/physical-walkthrough-source-target.md",
-            "redirect_url": "physical-azure-disaster-recovery",											   
+            "redirect_url": "physical-azure-disaster-recovery",
             "redirect_document_id": false
         },
         {
@@ -9106,7 +9106,7 @@
         },
         {
             "source_path": "articles/site-recovery/site-recovery-failback-azure-to-vmware.md",
-            "redirect_url": "vmware-azure-failback",																				
+            "redirect_url": "vmware-azure-failback",
             "redirect_document_id": false
         },
          {
@@ -9134,7 +9134,7 @@
             "redirect_url": "vmware-azure-set-up-process-server-azure",
             "redirect_document_id": false
         },
-	{	     
+	{
             "source_path": "articles/site-recovery/site-recovery-architecture-vmware-to-azure.md",
             "redirect_url": "vmware-azure-architecture",
             "redirect_document_id": false
@@ -9898,7 +9898,7 @@
             "source_path": "articles/active-directory/active-directory-app-registration.md",
             "redirect_url": "/azure/active-directory/develop/active-directory-integrating-applications",
             "redirect_document_id": false
-        },                     
+        },
         {
             "source_path": "articles/active-directory/active-directory-java-authenticate-users-access-control-eclipse.md",
             "redirect_url": "/azure/active-directory/develop/active-directory-java-authenticate-users-access-control-eclipse",
@@ -12983,7 +12983,7 @@
             "source_path": "articles/storage/storage-resource-manager-cannot-delete-storage-account-container-vhd.md",
             "redirect_url": "/azure/storage/common/storage-resource-manager-cannot-delete-storage-account-container-vhd",
             "redirect_document_id": false
-        },        
+        },
         {
             "source_path": "articles/storage/common/storage-resource-manager-cannot-delete-storage-account-container-vhd.md",
             "redirect_url": "/azure/storage/common/storage-monitoring-diagnosing-troubleshooting",
@@ -16268,7 +16268,7 @@
             "source_path": "articles/hdinsight/domain-joined/apache-domain-joined-configure.md",
             "redirect_url": "/azure/hdinsight/domain-joined/apache-domain-joined-configure-using-azure-adds",
             "redirect_document_id": false
-        },  
+        },
         {
             "source_path": "articles/hdinsight/hdinsight-domain-joined-introduction.md",
             "redirect_url": "/azure/hdinsight/domain-joined/apache-domain-joined-introduction",
@@ -17477,7 +17477,7 @@
         "source_path": "articles/billing/billing-enterprise-mgmt-grp-find.md",
         "redirect_url": "/azure/azure-resource-manager/management-groups-overview",
         "redirect_document_id": false
-    }, 
+    },
 	{
             "source_path": "articles/active-directory/active-directory-saas-facebook-at-work-provisioning-tutorial.md",
             "redirect_url": "/azure/active-directory/active-directory-saas-workplacebyfacebook-provisioning-tutorial",
@@ -17497,11 +17497,6 @@
             "source_path": "articles/app-service/containers/quickstart-custom-docker-image.md",
             "redirect_url": "/azure/app-service/containers/quickstart-docker-go",
             "redirect_document_id": false
-    },
-	{
-            "source_path": "articles/azure-policy/policy-insights.md",
-            "redirect_url": "/azure/azure-policy/create-manage-policy",
-            "redirect_document_id": false
     },
 	{
             "source_path": "articles/app-service/containers/quickstart-go.md",
@@ -17737,7 +17732,7 @@
         "source_path": "articles/sql-data-warehouse/sql-data-warehouse-backups.md",
         "redirect_url": "/azure/sql-data-warehouse/backup-and-restore",
         "redirect_document_id": false
-    },		
+    },
 	{
         "source_path": "articles/data-factory/tutorial-create-azure-ssis-runtime-portal.md",
         "redirect_url": "/azure/data-factory/tutorial-deploy-ssis-packages-azure",
@@ -17786,4 +17781,3 @@
 
    ]
 }
-

articles/active-directory/active-directory-licensing-whatis-azure-portal.md

@@ -15,7 +15,7 @@
   ms.topic: article
   ms.tgt_pltfrm: na
   ms.workload: identity
-  ms.date: 03/20/2018
+  ms.date: 03/29/2018
   ms.author: curtand
   ms.reviewer: piotrci
 
@@ -31,6 +31,9 @@ Until now, licenses could only be assigned at the individual user level, which c
 
 To address those challenges, Azure AD now includes group-based licensing. You can assign one or more product licenses to a group. Azure AD ensures that the licenses are assigned to all members of the group. Any new members who join the group are assigned the appropriate licenses. When they leave the group, those licenses are removed. This eliminates the need for automating license management via PowerShell to reflect changes in the organization and departmental structure on a per-user basis.
 
+>[!NOTE]
+>This feature currently is in public preview. Be prepared to revert or remove any changes. The feature is available in any Azure Active Directory (Azure AD) subscription during public preview. However, when the feature becomes generally available, some aspects of the feature might require one or more Azure Active Directory Premium licenses.
+
 ## Features
 
 Here are the main features of group-based licensing:

articles/active-directory/active-directory-saas-adpfederatedsso-tutorial.md

@@ -13,7 +13,7 @@ ms.workload: identity
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: article
-ms.date: 03/22/2018
+ms.date: 03/29/2018
 ms.author: jeedes
 
 ---
@@ -208,23 +208,23 @@ Upon receipt of confirmation from your ADP representative, configure your ADP se
 
 	* **ADP Workforce Now**
 		
-	 	`<User access URL>?Relay State=https://fed.adp.com/saml/fedlanding.html?WFN`
+	 	`<User access URL>?relaystate=https://fed.adp.com/saml/fedlanding.html?WFN`
 
 	* **ADP Workforce Now Enhanced Time**
 		
-	 	`<User access URL>?Relay State=https://fed.adp.com/saml/fedlanding.html?EETDC2`
+	 	`<User access URL>?relaystate=https://fed.adp.com/saml/fedlanding.html?EETDC2`
 
 	* **ADP Vantage HCM**
 		
-	 	`<User access URL>?Relay State=https://fed.adp.com/saml/fedlanding.html?ADPVANTAGE`
+	 	`<User access URL>?relaystate=https://fed.adp.com/saml/fedlanding.html?ADPVANTAGE`
 
 	* **ADP Enterprise HR**
 
-	 	`<User access URL>?Relay State=https://fed.adp.com/saml/fedlanding.html?PORTAL`
+	 	`<User access URL>?relaystate=https://fed.adp.com/saml/fedlanding.html?PORTAL`
 
 	* **MyADP**
 
-	 	`<User access URL>?Relay State=https://fed.adp.com/saml/fedlanding.html?REDBOX`
+	 	`<User access URL>?relaystate=https://fed.adp.com/saml/fedlanding.html?REDBOX`
 
 9. **Save** your changes.
 

articles/active-directory/active-directory-saas-slack-tutorial.md

@@ -12,7 +12,7 @@ ms.workload: identity
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: article
-ms.date: 02/28/2018
+ms.date: 03/29/2018
 ms.author: jeedes
 
 ---
@@ -41,7 +41,7 @@ To configure Azure AD integration with Slack, you need the following items:
 To test the steps in this tutorial, you should follow these recommendations:
 
 - Do not use your production environment, unless it is necessary.
-- If you don't have an Azure AD trial environment, you can get a one-month trial [here](https://azure.microsoft.com/pricing/free-trial/).
+- If you don't have an Azure AD trial environment, you can [get a one-month trial](https://azure.microsoft.com/pricing/free-trial/).
 
 ## Scenario description
 In this tutorial, you test Azure AD single sign-on in a test environment. 
@@ -113,14 +113,14 @@ In this section, you enable Azure AD single sign-on in the Azure portal and conf
 	b. In the **Identifier** textbox, type the URL: `https://slack.com`
 
 	> [!NOTE] 
-	> The value is not real. You have to update the value with the actual Sign On URL. Contact [Slack support team](https://slack.com/help/contact) to get the value
+	> The value is not real. You have to update the value with the actual Sign On URL. Contact [Slack support team](https://slack.com/help/contact) to get the value.
 	 
 4. Slack application expects the SAML assertions in a specific format. Configure the following claims for this application. You can manage the values of these attributes from the "**User Attributes**" section on application integration page. The following screenshot shows an example for this.
 
 	![Configure Single Sign-On](./media/active-directory-saas-slack-tutorial/tutorial_slack_attribute.png)
 
 	> [!NOTE] 
-	> If the user has **email address** assigned using the Office365 then only it will be populated, otherwise the **email address** claim will not appear in the SAML Token.
+	> If you have users who’s assigned **email address** is not on a Office365 license, the **User.Email** claim will not appear in the SAML Token. In these cases, we suggest using **user.userprincipalname** as the **User.Email** attribute value to map as **Unique Identifier** instead.
 
 5. In the **User Attributes** section on the **Single sign-on** dialog, select **user.mail**  as **User Identifier** and for each row shown in the table below, perform the following steps:
 
@@ -178,12 +178,6 @@ In this section, you enable Azure AD single sign-on in the Azure portal and conf
     d. Configure the above three settings as appropriate for your Slack team. For more information about the settings, please find the **Slack's SSO configuration guide** here. `https://get.slack.help/hc/articles/220403548-Guide-to-single-sign-on-with-Slack%60`
 
     e.  Click **Save Configuration**.
-	 
-	<!-- Deselect **Allow users to change their email address**.
-
-    e.  Select **Allow users to choose their own username**.
-
-    f.  As **Authentication for your team must be used by**, select **It’s optional**. -->
 
 > [!TIP]
 > You can now read a concise version of these instructions inside the [Azure portal](https://portal.azure.com), while you are setting up the app!  After adding this app from the **Active Directory > Enterprise Applications** section, simply click the **Single Sign-On** tab and access the embedded documentation through the **Configuration** section at the bottom. You can read more about the embedded documentation feature here: [Azure AD embedded documentation]( https://go.microsoft.com/fwlink/?linkid=845985)
@@ -227,7 +221,7 @@ The objective of this section is to create a user called Britta Simon in Slack.
 There is no action item for you in this section. A new user is created during an attempt to access Slack if it doesn't exist yet.
 
 > [!NOTE]
-> If you need to create a user manually, you need to Contact [Slack support team](https://slack.com/help/contact).
+> If you need to create a user manually, you need to contact [Slack support team](https://slack.com/help/contact).
 
 ### Assigning the Azure AD test user
 
@@ -270,8 +264,6 @@ When you click the Slack tile in the Access Panel, you should get automatically
 * [List of Tutorials on How to Integrate SaaS Apps with Azure Active Directory](active-directory-saas-tutorial-list.md)
 * [What is application access and single sign-on with Azure Active Directory?](active-directory-appssoaccess-whatis.md)
 
-
-
 <!--Image references-->
 
 [1]: ./media/active-directory-saas-slack-tutorial/tutorial_general_01.png

articles/active-directory/connect-health/active-directory-aadconnect-health-alert-catalog.md

@@ -21,6 +21,12 @@ Azure AD Connect Health service send alerts indicate that your identity infrastr
 Error, Warning, and Prewarning are three stages of alerts that are generated from Connect Health service. We highly recommend you take immediate actions on triggered alerts. <br />
 Azure AD Connect Health alerts get resolved on a success condition. Azure AD Connect Health Agents detect and report the success conditions to the service periodically. For a few alerts, the suppression is time-based. In other words, if the same error condition is not observed within 72 hours from alert generation, the alert is automatically resolved.
 
+## General Alerts
+
+| Alert Name | Description | Remediation |
+| --- | --- | ----- |
+| Health service data is not up to date | The Health Agent(s) running on one or more servers is not connected to the Health Service and the Health Service is not receiving the latest data from this server. The last data processed by the Health Service is older than 2 Hours. | Ensure that the health agents have outbound connectivity to the following service end points. [Read More](active-directory-aadconnect-health-data-freshness.md) |
+
 ## Alerts for Azure AD Connect (Sync)
 
 | Alert Name | Description | Remediation |
@@ -31,10 +37,10 @@ Azure AD Connect Health alerts get resolved on a success condition. Azure AD Con
 | Export to Active Directory failed | The export operation to Active Directory Connector has failed. | Investigate the event log errors of export operation for further details. | 
 | Import from Active Directory failed | Import from Active Directory failed. As a result, objects from some domains from this forest may not be imported. | <li>Verify DC connectivity</li> <li>Rerun import manually</li> <li> Investigate event log errors of the import operation for further details. | 
 | Export to Azure Active Directory failed |	The export operation to Azure Active Directory Connector has failed. As a result, some objects may not be exported successfully to Azure Active Directory. | Investigate the event log errors of export operation for further details. |
-| Password Synchronization heartbeat was skipped in last 120 minutes | Password Synchronization has not connected with Azure Active Directory in the last 120 minutes. As a result, passwords will not be synchronized with Azure Active Directory. | Restart Microsoft Azure Active Directory Sync Services:</b><br> Any synchronization operations that are currently running will be interrupted. You can choose to perform below steps when no synchronization operation is in progress.<br> 1. Click <b>Start</b>, click <b>Run</b>, type <b>Services.msc</b>, and then click <b>OK</b>.<br> 2. Locate <b>Microsoft Azure AD Sync</b>, right-click it, and then click <b>Restart</b>. | 
+| Password Hash Synchronization heartbeat was skipped in last 120 minutes | Password Hash Synchronization has not connected with Azure Active Directory in the last 120 minutes. As a result, passwords will not be synchronized with Azure Active Directory. | Restart Microsoft Azure Active Directory Sync Services:</b><br> Any synchronization operations that are currently running will be interrupted. You can choose to perform below steps when no synchronization operation is in progress.<br> 1. Click <b>Start</b>, click <b>Run</b>, type <b>Services.msc</b>, and then click <b>OK</b>.<br> 2. Locate <b>Microsoft Azure AD Sync</b>, right-click it, and then click <b>Restart</b>. | 
 | High CPU Usage detected | The percentage of CPU consumption crossed the recommended threshold on this server. | <li>This could be a temporary spike in CPU consumption. Check the CPU usage trend from the Monitoring section.</li><li>Inspect the top processes consuming the highest CPU usage on the server.<ol type="a"><li>You may use the Task Manager or execute the following PowerShell Command: <br> <i>get-process \| Sort-Object -Descending CPU \| Select-Object -First 10</i></li><li>If there are unexpected processes consuming high CPU usage, stop the processes using the following PowerShell command: <br> <i>stop-process -ProcessName [name of the process]</i></li></li></ol><li>If the processes seen in the above list are the intended processes running on the server and the CPU consumption is continuously near the threshold please consider re-evaluating the deployment requirements of this server.</li><li>As a fail-safe option you may consider restarting the server. |
 | High Memory Consumption Detected | The percentage of memory consumption of the server is beyond the recommended threshold on this server. | Inspect the top processes consuming the highest memory on the server. You may use the Task Manager or execute the following PowerShell Command:<br> <i>get-process \| Sort-Object -Descending WS \| Select-Object -First 10</i> </br> If there are unexpected processes consuming high memory, stop the processes using the following PowerShell command:<br><i>stop-process -ProcessName [name of the process] </i></li><li> If the processes seen in the above list are the intended processes running on the server, please consider re-evaluating the deployment requirements of this server.</li><li>As a failsafe option, you may consider restarting the server. | 
-| Password Synchronization has stopped working | The Password Synchronization has stopped. As a result passwords will not be synchronized with Azure Active Directory. | Restart Microsoft Azure Active Directory Sync Services: <br /> Any synchronization operations that are currently running will be interrupted. You can choose to perform below steps when no synchronization operation is in progress. <br /> <ol> <li>Click <b>Start</b>, click <b>Run</b>, type <b>Services.msc</b>, and then click <b>OK</b>.</li> <li>Locate the <b>Microsoft Azure AD Sync</b>, right-click it, and then click <b>Restart</b>.</li> </ol> </p>  | 
+| Password Hash Synchronization has stopped working | Password Hash Synchronization has stopped. As a result passwords will not be synchronized with Azure Active Directory. | Restart Microsoft Azure Active Directory Sync Services: <br /> Any synchronization operations that are currently running will be interrupted. You can choose to perform below steps when no synchronization operation is in progress. <br /> <ol> <li>Click <b>Start</b>, click <b>Run</b>, type <b>Services.msc</b>, and then click <b>OK</b>.</li> <li>Locate the <b>Microsoft Azure AD Sync</b>, right-click it, and then click <b>Restart</b>.</li> </ol> </p>  | 
 | Export to Azure Active Directory was Stopped. Accidental delete threshold was reached | The export operation to Azure Active Directory has failed. There were more objects to be deleted than the configured threshold. As a result, no objects were exported. | <li> The number of objects are marked for deletion are greater than the set threshold. Ensure this outcome is desired.</li> <li> To allow the export to continue, please perform the following steps: <ol type="a"> <li>Disable Threshold by running Disable-ADSyncExportDeletionThreshold</li> <li>Start Sychronization Service Manager</li> <li>Run Export on Connector with type = Azure Active Directory</li> <li>After successfully exporting the objects, enable Threshold by running : Enable-ADSyncExportDeletionThreshold</li> </ol> </li> |
 
 ## Alerts for Active Directory Federation Services