Skip to content

Commit 5830e48

Browse files
authored
Merge branch 'main' into patch-3
2 parents 0d3627e + 883b709 commit 5830e48

263 files changed

Lines changed: 2089 additions & 1680 deletions

File tree

Some content is hidden

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

.openpublishing.redirection.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,35 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "memdocs/intune/configuration/vpn-settings-windows-phone-8-1.md",
5+
"redirect_url": "https://support.microsoft.com/windows/windows-phone-8-1-end-of-support-faq-7f1ef0aa-0aaf-0747-3724-5c44456778a3",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "memdocs/intune/configuration/email-settings-windows-phone-8-1.md",
10+
"redirect_url": "https://support.microsoft.com/windows/windows-phone-8-1-end-of-support-faq-7f1ef0aa-0aaf-0747-3724-5c44456778a3",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "memdocs/intune/configuration/device-restrictions-windows-phone-8-1.md",
15+
"redirect_url": "https://support.microsoft.com/windows/windows-phone-8-1-end-of-support-faq-7f1ef0aa-0aaf-0747-3724-5c44456778a3",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "memdocs/intune/configuration/custom-settings-windows-phone-8-1.md",
20+
"redirect_url": "https://support.microsoft.com/windows/windows-phone-8-1-end-of-support-faq-7f1ef0aa-0aaf-0747-3724-5c44456778a3",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "memdocs/intune/apps/store-apps-windows-phone-8-1.md",
25+
"redirect_url": "/mem/intune/apps/apps-add",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "memdocs/intune/apps/lob-apps-windows-phone.md",
30+
"redirect_url": "/mem/intune/apps/apps-add",
31+
"redirect_document_id": false
32+
},
333
{
434
"source_path": "memdocs/intune/user-help/set-or-change-your-password-windows.md",
535
"redirect_url": "https://support.microsoft.com/windows/windows-sign-in-options-and-account-protection-7b34d4cf-794f-f6bd-ddcc-e73cdf1a6fbf",

memdocs/analytics/enroll-configmgr.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Quickstart - Enroll Configuration Manager devices
33
titleSuffix: Microsoft Endpoint Manager
44
description: In this quickstart, you enroll Configuration Manager devices into Endpoint analytics.
5-
ms.date: 11/15/2021
5+
ms.date: 05/03/2022
66
ms.prod: configuration-manager
77
ms.technology: configmgr-analytics
88
ms.topic: quickstart
@@ -33,7 +33,7 @@ Before you start this tutorial, make sure you have the following prerequisites:
3333
3434
### Licensing Prerequisites
3535

36-
Devices enrolled in Endpoint analytics need a valid license for the use of Microsoft Endpoint Manager. For more information, see [Microsoft Intune licensing](../intune/fundamentals/licenses.md) or [Microsoft Endpoint Configuration Manager licensing](../configmgr/core/understand/learn-more-editions.md).
36+
Devices enrolled in Endpoint analytics need a valid license for the use of Microsoft Endpoint Manager. For more information, see [Microsoft Intune licensing](../intune/fundamentals/licenses.md) or [Microsoft Endpoint Configuration Manager licensing](../configmgr/core/understand/learn-more-editions.md). Proactive remediations has an additional licensing requirement, for more information see, the [Endpoint analytics licensing requirements overview](overview.md#licensing-prerequisites).
3737

3838
## Endpoint analytics permissions
3939

memdocs/analytics/enroll-intune.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Quickstart - Enroll Intune devices
33
titleSuffix: Microsoft Endpoint Manager
44
description: In this quickstart, you enroll Intune devices into Endpoint analytics.
5-
ms.date: 10/05/2021
5+
ms.date: 05/03/2022
66
ms.prod: configuration-manager
77
ms.technology: configmgr-analytics
88
ms.topic: quickstart
@@ -43,7 +43,7 @@ To enroll devices to Endpoint analytics, they need to send required functional d
4343

4444
### Licensing Prerequisites
4545

46-
Devices enrolled in Endpoint analytics need a valid license for the use of Microsoft Endpoint Manager. For more information, see [Microsoft Intune licensing](../intune/fundamentals/licenses.md) or [Microsoft Endpoint Configuration Manager licensing](../configmgr/core/understand/learn-more-editions.md).
46+
Devices enrolled in Endpoint analytics need a valid license for the use of Microsoft Endpoint Manager. For more information, see [Microsoft Intune licensing](../intune/fundamentals/licenses.md) or [Microsoft Endpoint Configuration Manager licensing](../configmgr/core/understand/learn-more-editions.md). Proactive remediations has an additional licensing requirement, for more information see, the [Endpoint analytics licensing requirements overview](overview.md#licensing-prerequisites).
4747

4848
### Endpoint analytics permissions
4949

memdocs/analytics/proactive-remediations.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,14 @@ Proactive remediations requires the [licensing for Endpoint analytics](enroll-in
6262
- You can have up to 200 script packages.
6363
- A script package can contain a detection script only or both a detection script and a remediation script.
6464
- Ensure the scripts are encoded in UTF-8.
65+
- If the option **Enforce script signature check** is enabled in the [Settings](#bkmk_prs_deploy) page of creating a script package, then make sure that the scripts are encoded in UTF-8 not UTF-8 BOM.
6566
- The maximum allowed output size limit is 2048 characters.
6667
- If the option **Enforce script signature check** is enabled in the [Settings](#bkmk_prs_deploy) page of creating a script package, the script runs using the device's PowerShell execution policy. The default execution policy for Windows client computers is **Restricted**. The default execution for Windows Server devices is **RemoteSigned**. For more information, see [PowerShell execution policies](/powershell/module/microsoft.powershell.core/about/about_execution_policies#powershell-execution-policies).
6768
- Scripts built into Proactive remediations are signed and the certificate is added to the **Trusted Publishers** certificate store of the device.
6869
- When using third-party scripts that are signed, make sure the certificate is in the **Trusted Publishers** certificate store. As with any certificate, the certificate authority must be trusted by the device.
6970
- Scripts without **Enforce script signature check** use the **Bypass** execution policy.
71+
- Don't put secrets in scripts. Consider using parameters to handle secrets instead. <!--13957089-->
72+
- Don't put reboot commands in detection or remediations scripts. <!--13957089-->
7073

7174
## <a name="bkmk_prs_deploy"></a> Deploy built-in script packages
7275

memdocs/configmgr/core/TOC.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -285,14 +285,14 @@ items:
285285
items:
286286
- name: Technical Preview overview
287287
href: get-started/technical-preview.md
288+
- name: 2204 features
289+
href: get-started/2022/technical-preview-2204.md
288290
- name: 2203 features
289291
href: get-started/2022/technical-preview-2203.md
290292
- name: 2202 features
291293
href: get-started/2022/technical-preview-2202.md
292294
- name: 2201 features
293-
href: get-started/2022/technical-preview-2201.md
294-
- name: 2112 features
295-
href: get-started/2021/technical-preview-2112.md
295+
href: get-started/2022/technical-preview-2201.md
296296
- name: Migrate data between hierarchies
297297
items:
298298
- name: Migration overview

memdocs/configmgr/core/get-started/2019/includes/1909/3556022.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ The tool doesn't currently have any tasks to migrate the database from on-premis
9292

9393
- [Backup and restore the database](../../../../servers/manage/backup-and-recovery.md)
9494
- [Configure a SQL Server Always On availability group and allow the data to replicate](../../../../servers/deploy/configure/sql-server-alwayson-for-a-highly-available-site-database.md#changes-for-site-backup)
95-
- [Migrate a SQL Server database to an Azure SQL Server VM](/azure/virtual-machines/windows/sql/virtual-machines-windows-migrate-sql)
95+
- [Migrate a SQL Server database to an Azure SQL Server VM](/azure/azure-sql/virtual-machines/windows/migrate-to-vm-from-sql-server)
9696

9797
#### Site system roles
9898

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
---
2+
title: [Administrative Management option added in Azure Service]
3+
titleSuffix: Configuration Manager
4+
description: Configure Administrative Management to enhance security of the Administrative Service Azure AD endpoints.
5+
ms.date: 04/29/2022
6+
ms.prod: configuration-manager
7+
author: banreet
8+
ms.author: banreetkaur
9+
ms.manager: apoorvseth
10+
ms.topic : include
11+
---
12+
## <a name="bkmk_administration"></a> Administration Service Management option
13+
<!--12952905-->
14+
When configuring Azure Services, a new option called **Administration Service Management** is now added for enhanced security. Selecting this option allows administrators to segment their admin privileges between [cloud management gateway (CMG)](../../../../clients/manage/cmg/overview.md) and [administration service](../../../../../../configmgr/develop/adminservice/overview.md). By enabling this option, access is restricted to only administration service endpoints. Configuration Management clients will authenticate to the site using Azure Active Directory.
15+
16+
> [!NOTE]
17+
> Currently, the administration service management option can’t be used with CMG.
18+
19+
:::image type="content" source="../../media/12952905-administration-service-management-azure-services.png" alt-text="Screenshot of administration service management option in the Azure Service Wizard.":::
20+
21+
### Try it out!
22+
23+
Try to complete the tasks. Then send [Feedback](../../../../understand/product-feedback.md) with your thoughts on the feature.
24+
25+
Generate an Azure Active Directory (Azure AD) token and call the administration service by using a PowerShell script. The sample script and details can be found in the [Microsoft/configmgr-hub GitHub repository](https://aka.ms/cmadminservicetokensample).
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
---
2+
author: Baladelli
3+
ms.author: Baladell
4+
ms.prod: configuration-manager
5+
ms.technology: configmgr-core
6+
ms.topic: include
7+
ms.date: 04/29/2022
8+
ms.localizationpriority: medium
9+
---
10+
11+
## <a name="bkmk_folder"></a> Folders for automatic deployment rules (ADRs)
12+
<!--13507410-->
13+
14+
Admins can now organize ADRs by using folders. This change allows for better categorization and management of ADRs. Folder management for ADRs is also supported with PowerShell cmdlets.
15+
16+
:::image type="content" source="../../media/13507410-sum-adrdeployment.png" alt-text="Screenshot of right-click menu displaying folder options for the automatic deployment rules node." lightbox="../../media/13507410-sum-adrdeployment.png":::
17+
18+
### Try it out!
19+
20+
Try to complete the tasks. Then send [Feedback](../../../../understand/product-feedback.md) with your thoughts on the feature.
21+
22+
1. Open the Configuration Manager console, go to the **Software Library** workspace, and then go to **Automatic Deployment Rules**.
23+
2. From the ribbon or right-click menu, and in the **Automatic Deployment Rules** select from the following options:
24+
- **Create Folder**
25+
- **Delete Folder**
26+
- **Rename Folder**
27+
- **Move Folders**
28+
- **Set Security Scopes**
54.3 KB
Loading
728 KB
Loading

0 commit comments

Comments
 (0)