Merge pull request #182843 from MicrosoftDocs/master

12/14 PM Publish

Author: huypub

.openpublishing.publish.config.json

@@ -818,6 +818,7 @@
     ".openpublishing.redirection.sql-database.json",
     ".openpublishing.redirection.synapse-analytics.json",
     ".openpublishing.redirection.azure-web-pubsub.json",
+    ".openpublishing.redirection.azure-monitor.json",
     ".openpublishing.redirection.azure-percept.json",
     "articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
     "articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",   

.openpublishing.redirection.azure-monitor.json

@@ -0,0 +1,14 @@
+{
+    "redirections": [
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/app-insights-dashboards.md",
+            "redirect_url": "/azure/azure-monitor/app/overview-dashboard",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/application-insights/app-insights-performance-counters.md",
+            "redirect_url": "/azure/azure-monitor/app/performance-counters",
+            "redirect_document_id": true
+        }
+    ]
+}

.openpublishing.redirection.json

@@ -7701,16 +7701,6 @@
       "redirect_url": "/azure/cognitive-services/LUIS/luis-concept-devops-automation",
       "redirect_document_id": true
     },
-    {
-      "source_path_from_root": "/articles/azure-monitor/app/app-insights-dashboards.md",
-      "redirect_url": "/azure/azure-monitor/app/overview-dashboard",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/application-insights/app-insights-performance-counters.md",
-      "redirect_url": "/azure/azure-monitor/app/performance-counters",
-      "redirect_document_id": true
-    },
     {
       "source_path_from_root": "/articles/application-insights/app-insights-platforms.md",
       "redirect_url": "/azure/azure-monitor/app/platforms",
@@ -40738,6 +40728,11 @@
       "redirect_url": "/azure/batch/credential-access-key-vault",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/batch/batch-low-pri-vms.md",
+      "redirect_url": "/azure/batch/batch-spot-vms",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/cognitive-services/QnAMaker/Quickstarts/quickstart-rest-curl.md",
       "redirect_url": "azure/cognitive-services/QnAMaker/Quickstarts/quickstart-sdk",

articles/active-directory/cloud-sync/how-to-configure.md

@@ -7,7 +7,7 @@ manager: daveba
 ms.service: active-directory
 ms.workload: identity
 ms.topic: how-to
-ms.date: 09/10/2021
+ms.date: 12/14/2021
 ms.subservice: hybrid
 ms.author: billmath
 ms.collection: M365-identity-device-management
@@ -54,9 +54,8 @@ You can scope the agent to synchronize specific users and groups by using on-pre
  ![Configuration section](media/how-to-configure/scope-1.png)
 
  5. Under **Configure**, select **Edit scoping filters** to change the scope of the configuration rule.
- ![Edit scope](media/how-to-configure/scope-3.png)
- 7. On the right, you can change the scope.  Click **Done**  and **Save** when you have finished.
- 8. Once you have changed the scope, you should [restart provisioning](#restart-provisioning) to initiate an immediate synchronization of the changes.
+ 6. On the right, you can change the scope.  Click **Done**  and **Save** when you have finished.
+ 7. Once you have changed the scope, you should [restart provisioning](#restart-provisioning) to initiate an immediate synchronization of the changes.
 
 ## Attribute mapping
 Azure AD Connect cloud sync allows you to easily map attributes between your on-premises user/group objects and the objects in Azure AD.  You can customize the default attribute-mappings according to your business needs. So, you can change or delete existing attribute-mappings, or create new attribute-mappings.  For more information see [attribute mapping](how-to-attribute-mapping.md).

articles/active-directory/cloud-sync/reference-cloud-sync-faq.yml

@@ -8,7 +8,7 @@ metadata:
   ms.service: active-directory
   ms.workload: identity
   ms.topic: reference
-  ms.date: 10/18/2021
+  ms.date: 12/13/2021
   ms.subservice: hybrid
   ms.author: billmath
   ms.collection: M365-identity-device-management
@@ -118,6 +118,10 @@ sections:
           Does the cloud provisioning agent load balance if I have multiple agents installed?
         answer: |
           No. Only one agent is ever active. 
+      - question: |
+          Does the cloud provisioning agent require a preferred domain controller list be set?
+        answer: |
+          No. The preferred domain controller list is specified during [agent installation](how-to-install.md) but it is optional.  If no preferred DCs are configured, then the agent will use any available DC in the domain.
 additionalContent: |
 
   ## Next steps 

articles/active-directory/conditional-access/controls.md

@@ -24,6 +24,9 @@ Custom controls is a preview capability of the Azure Active Directory. When usin
 
 ## Creating custom controls
 
+> [!IMPORTANT]
+> Custom controls cannot be used with Identity Protection's automation requiring Azure AD Multi-Factor Authentication, Azure AD self-service password reset (SSPR), satisfying multi-factor authentication claim requirements, to elevate roles in Privileged Identity Manager (PIM), as part of Intune device enrollment, or when joining devices to Azure AD.
+
 Custom Controls works with a limited set of approved authentication providers. To create a custom control, you should first contact the provider that you wish to utilize. Each non-Microsoft provider has its own process and requirements to sign up, subscribe, or otherwise become a part of the service, and to indicate that you wish to integrate with Conditional Access. At that point, the provider will provide you with a block of data in JSON format. This data allows the provider and Conditional Access to work together for your tenant, creates the new control and defines how Conditional Access can tell if your users have successfully performed verification with the provider.
 
 Copy the JSON data and then paste it into the related textbox. Do not make any changes to the JSON unless you explicitly understand the change you're making. Making any change could break the connection between the provider and Microsoft and potentially lock you and your users out of your accounts.

articles/active-directory/fundamentals/media/multi-tenant-user-management-scenarios/single-resource-tenant-scenario.png

@@ -226,7 +226,7 @@ The mesh topology can be used in as few as two tenants, such as in the scenario
 
 #### Single resource tenant topology
 
-![Single resource tenant](media/multi-tenant-user-management-scenarios/single-resource-tenant.png)
+![Single resource tenant](media/multi-tenant-user-management-scenarios/single-resource-tenant-scenario.png)
 
 In a single resource tenant topology, users and their attributes are synchronized to the resource tenant (Company A in the illustration above). 
 

articles/active-directory/fundamentals/media/multi-tenant-user-management-scenarios/single-resource-tenant.png

@@ -71,10 +71,10 @@ Uninstall-ADServiceAccount
 ```
 
 
-To work effectively, gMSAs must be in the managed service account's organizational unit (OU).
+To work effectively, gMSAs must be in the Managed Service Accounts AD container.
 
 
-![Screen shot of a gMSA account in the managed service account OU.](./media/securing-service-accounts/secure-gmsa-image-1.png)
+![Screen shot of a gMSA account in the managed service accounts container.](./media/securing-service-accounts/secure-gmsa-image-1.png)
 
 To find service MSAs that might not be in the list, run the following commands: