Merge pull request #8178 from MicrosoftDocs/main

Publish 08/02/2022 3:30 PM PT

Author: Angela Fleischmann

memdocs/configmgr/core/clients/manage/collections/collection-evaluation.md

@@ -30,10 +30,6 @@ At a high level, each individual collection evaluation and update follows these
 
 1. Execute the collection query.
 1. Add any systems that are direct members.
-1. Evaluate all *include* collections.
-
-   If the include collections also have query rules, or have include or exclude collections, evaluate them also. If the include collections themselves are limiting collections, evaluate any collections below them. After fully evaluating the tree, return the results to the calling collection.
-
 1. Perform a logical `AND` between the returned results and the limiting collection.
 1. Evaluate the *exclude* collections.
 

memdocs/configmgr/core/clients/manage/collections/media/high-level-collection-update-process.png

@@ -2,7 +2,7 @@
 title: Maintenance tasks
 titleSuffix: Configuration Manager
 description: Understand what maintenance tasks to perform for Configuration Manager sites and hierarchies and when to perform them.
-ms.date: 07/26/2019
+ms.date: 08/02/2020
 ms.prod: configuration-manager
 ms.technology: configmgr-core
 ms.topic: conceptual
@@ -109,9 +109,9 @@ After you install a Configuration Manager site, review the available maintenance
 
  Use the following procedure to help you set up the common settings of maintenance tasks.  
 
-### <a name="bkmk_MTs1906"></a>To set up maintenance tasks for Configuration Manager version 1906
+### <a name="bkmk_MTs1906"></a>To set up maintenance tasks for Configuration Manager
 <!--3555894-->
-Starting in version 1906, site server maintenance tasks can now be viewed, edited, and monitored from their own tab on the details view of a site server. You can still edit maintenance tasks by choosing **Site Maintenance** in the **Settings** group like you did in previous Configuration Manager versions.
+Site server maintenance tasks can now be viewed, edited, and monitored from their own tab on the details view of a site server. You can still edit maintenance tasks by choosing **Site Maintenance** in the **Settings** group like you did in previous Configuration Manager versions.
 
 1. In the Configuration Manager console, go to **Administration** > **Site Configuration** >**Sites**.
 1. Select a site from your list, then click on the **Maintenance Tasks** tab in the detail panel.
@@ -130,19 +130,14 @@ The **Maintenance Tasks** tab gives you information such as:
 - Last completion time
 - If the task completed successfully
 
-### To set up maintenance tasks for Configuration Manager version 1902 and prior
+## Database reindexing can temporarily impact the replication link status
 
-1. In the Configuration Manager console, go to **Administration** > **Site Configuration** >**Sites**.
-2. Choose the site that has the maintenance task that you want to set up.  
-3. On the **Home** tab, in the **Settings** group, choose **Site Maintenance**, and then choose the maintenance task that you want to set up. Only tasks that are available at the selected site are displayed.
-
-4. To set up the task, choose **Edit**. Ensure the **Enable this task** check box is checked, and set up a schedule for when the task runs. If the task also deletes aged data, set up the age of data that will be deleted from the database when the task runs. Choose **OK** to close the task **Properties**.
+When the Configuration Manager database is reindexing, either through the [built in maintenance task](reference-for-maintenance-tasks.md#rebuild-indexes) or SQL Server Management Studio, you may notice that [replication links](monitor-replication.md) will temporarily go into a degraded or failed state during this process. The state degradation occurs because when a reindex is run on the database tables they're blocked and can't be written to. It's an offline operation and is fundamental to [how DBCC REINDEX functions](/sql/t-sql/database-console-commands/dbcc-dbreindex-transact-sql). In order for a sync on a replication group to be considered successful, the site actually has to be able to process the data that it received. This means that during this reindexing process, the link status can bounce between degraded, failed, active, and back again. Depending on how much data is being replicated between the sites, the amount of time to go from a failed state to an active state will vary from environment to environment.
 
-   > [!NOTE]  
-   > For **Delete Aged Status Messages**, you set up the age of data to delete when you set up status filter rules.  
+If the state change during a reindex is problematic for your monitoring, each replication link has a set of [thresholds that can be modified](../../plan-design/hierarchy/database-replication.md#database-replication-thresholds) to adjust when the link goes into a degraded state or when it goes into a failed state. Replication links contain multiple replication groups, which are broken up into two types: global data and site data. Global data attempts to sync every one minute and site data syncs every five minutes. By default, the link changes to degraded when the threshold of 12 failures is reached then changes to the failed state at 24. To set these thresholds, select the link under the **Database Replication** node then select **Link Properties**. In the **Alerts** tab, there are thresholds for setting the link to degraded or failed. By default these values are set to 12 and 24 respectively.
 
-5. To enable or disable the task without editing the task properties, choose the **Enable** or **Disable** button. The button label changes depending on the current configuration of the task.  
-6. When you're finished configuring the maintenance tasks, choose **OK** to finish the procedure.
+> [!IMPORTANT]
+> Take caution when changing these values since the higher the value the longer it will take you to be notified of a problem. When choosing to increase or decrease the value, increment or decrement by 1 and monitor the link closely before making another change to it.
 
 ## Next steps
 

memdocs/configmgr/core/servers/manage/maintenance-tasks.md

@@ -7,7 +7,7 @@ keywords:
 author: Lenewsad
 ms.author: lanewsad
 manager: dougeby
-ms.date: 4/16/2019
+ms.date: 8/1/2022
 ms.topic: how-to
 ms.service: microsoft-intune
 ms.subservice: enrollment
@@ -40,7 +40,7 @@ For more information about how connectors work, see [Understand Azure AD Applica
 
 You can configure the connector to bypass your on-premises proxy to ensure it uses direct connectivity to the Azure services. We recommend this approach, as long as your network policy allows for it, because it means that you have one less configuration to maintain.
 
-To disable outbound proxy usage for the connector, edit the ``:\Program Files\Microsoft Intune\ODJConnector\ODJConnectorUI\ODJConnectorUI.exe.config`` file and add the proxy address and proxy port in the section shown in this code sample:
+To disable outbound proxy usage for the connector, edit the ``:\Program Files\Microsoft Intune\ODJConnector\ODJConnectorUI\ODJConnectorUI.exe.config`` file and set the default proxy to ` "False" ` as shown in the following code example:  
 
 ```xml
 <?xml version="1.0" encoding="utf-8" ?>
@@ -160,4 +160,4 @@ Once the configuration files have been modified, you'll need to restart the Intu
 
 ## Next steps
 
-[Manage your devices](../remote-actions/device-management.md)
+[Manage your devices](../remote-actions/device-management.md)

memdocs/intune/enrollment/autopilot-hybrid-connector-proxy.md

@@ -7,7 +7,7 @@ keywords:
 author: lenewsad
 ms.author: lanewsad
 manager: dougeby
-ms.date: 12/08/2021
+ms.date: 08/02/2022
 ms.topic: end-user-help
 ms.prod:
 ms.service: microsoft-intune
@@ -90,10 +90,12 @@ You'll only see this sign-in option if your organization allows certificate-base
 4. Tap **Continue** to use the certificate.  
 5. Wait while the app verifies your certificate. When done, you can access the features in the app and your organization's resources.  
 
-### Sign in via another device    
-
+### Sign in via another device  
 If you normally use a smart card to access work resources, follow the steps in this section to sign in to Company Portal.  
 
+>[!IMPORTANT]
+> Before you use this sign-in option, [join your work device to your work or school network](https://support.microsoft.com/account-billing/join-your-work-device-to-your-work-or-school-network-ef4d6adb-5095-4e51-829e-5457430f3973).  
+
 1. Open Company Portal on the device you'll be using to access your work resources.  
 
 2. Select **Sign in from another device**.