Skip to content

Commit b08f8ae

Browse files
authored
Merge branch 'FeatureConfig-chrisda' into patch-6
2 parents ca32e03 + efb97bb commit b08f8ae

12 files changed

+337
-63
lines changed

exchange/exchange-ps/exchange/Get-FeatureConfiguration.md

+54-4
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,11 @@ For information about the parameter sets in the Syntax section below, see [Excha
2222
## SYNTAX
2323

2424
```
25-
Get-FeatureConfiguration -FeatureScenario <Microsoft.Office.CompliancePolicy.PolicyConfiguration.PolicyScenario>
26-
[[-Identity] <Microsoft.Office.CompliancePolicy.Tasks.PolicyIdParameter>]
25+
Get-FeatureConfiguration [[-Identity] <PolicyIdParameter>] [-FeatureScenario] <PolicyScenario>
26+
[-All]
2727
[-Confirm]
28+
[-GeneralDiscovery]
29+
[-IrmDiscovery]
2830
[-WhatIf]
2931
[<CommonParameters>]
3032
```
@@ -58,7 +60,7 @@ The Identity policy specifies the feature configuration that you want to view. Y
5860
- GUID
5961

6062
```yaml
61-
Type: Microsoft.Office.CompliancePolicy.Tasks.PolicyIdParameter
63+
Type: PolicyIdParameter
6264
Parameter Sets: (All)
6365
Aliases:
6466
Applicable: Security & Compliance
@@ -76,7 +78,7 @@ The FeatureScenario parameter specifies the scenario for the feature configurati
7678
- `TrustContainer` for Endpoint DLP trust container
7779

7880
```yaml
79-
Type: Microsoft.Office.CompliancePolicy.PolicyConfiguration.PolicyScenario
81+
Type: PolicyScenario
8082
Parameter Sets: (All)
8183
Aliases:
8284
Applicable: Security & Compliance
@@ -88,6 +90,22 @@ Accept pipeline input: False
8890
Accept wildcard characters: False
8991
```
9092

93+
### -All
94+
{{ Fill All Description }}
95+
96+
```yaml
97+
Type: SwitchParameter
98+
Parameter Sets: (All)
99+
Aliases:
100+
Applicable: Security & Compliance
101+
102+
Required: False
103+
Position: Named
104+
Default value: None
105+
Accept pipeline input: False
106+
Accept wildcard characters: False
107+
```
108+
91109
### -Confirm
92110
This parameter is reserved for internal Microsoft use.
93111

@@ -104,6 +122,38 @@ Accept pipeline input: False
104122
Accept wildcard characters: False
105123
```
106124

125+
### -GeneralDiscovery
126+
{{ Fill GeneralDiscovery Description }}
127+
128+
```yaml
129+
Type: SwitchParameter
130+
Parameter Sets: (All)
131+
Aliases:
132+
Applicable: Security & Compliance
133+
134+
Required: False
135+
Position: Named
136+
Default value: None
137+
Accept pipeline input: False
138+
Accept wildcard characters: False
139+
```
140+
141+
### -IrmDiscovery
142+
{{ Fill IrmDiscovery Description }}
143+
144+
```yaml
145+
Type: SwitchParameter
146+
Parameter Sets: (All)
147+
Aliases:
148+
Applicable: Security & Compliance
149+
150+
Required: False
151+
Position: Named
152+
Default value: None
153+
Accept pipeline input: False
154+
Accept wildcard characters: False
155+
```
156+
107157
### -WhatIf
108158
This parameter is reserved for internal Microsoft use.
109159

exchange/exchange-ps/exchange/New-FeatureConfiguration.md

+76-14
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,24 @@ schema: 2.0.0
99
# New-FeatureConfiguration
1010

1111
## SYNOPSIS
12-
**Note**: Currently, this cmdlet is available only in Private Preview.
12+
**Note**: This cmdlet is available in Public Preview.
1313

1414
This cmdlet is available only in Security & Compliance PowerShell. For more information, see [Security & Compliance PowerShell](https://learn.microsoft.com/powershell/exchange/scc-powershell).
1515

16-
Use the New-FeatureConfiguration cmdlet to create Discovery policies.
16+
Use the New-FeatureConfiguration cmdlet to create Microsoft Purview feature configurations within your organization, including:
17+
- Collection policies
18+
- Endpoint DLP trust container
1719

1820
For information about the parameter sets in the Syntax section below, see [Exchange cmdlet syntax](https://learn.microsoft.com/powershell/exchange/exchange-cmdlet-syntax).
1921

2022
## SYNTAX
2123

2224
```
23-
New-FeatureConfiguration [-Name] <String> -Mode <Microsoft.Office.CompliancePolicy.Tasks.PolicyMode> -FeatureScenario <Microsoft.Office.CompliancePolicy.PolicyConfiguration.PolicyScenario> -ScenarioConfig <String>
25+
New-FeatureConfiguration [-Name] <String> -Mode <PolicyMode> -FeatureScenario <PolicyScenario> -ScenarioConfig <String>
2426
[-Comment <String>]
2527
[-Confirm]
28+
[-GeneralDiscovery]
29+
[-IrmDiscovery]
2630
[-Locations <String>]
2731
[-WhatIf]
2832
[<CommonParameters>]
@@ -35,15 +39,39 @@ To use this cmdlet in Security & Compliance PowerShell, you need to be assigned
3539

3640
### Example 1
3741
```powershell
38-
New-FeatureConfiguration -Name "Discovery policy for Contoso executives" -FeatureScenario KnowYourData -Mode Enable -ScenarioConfig '{"Activities": ["UploadText", "UploadFile"], "EnforcementPlanes": ["Browser"], "SensitiveTypeIds": ["a44669fe-0d48-453d-a9b1-2cc83f2cba77","50842eb7-edc8-4019-85dd-5a5c1f2bb085"]}' –Locations '[{"Workload": "Applications","Location": "51622","Inclusions": [{"Type": "Group","Identity": "[email protected]"}]},{"Workload": "Applications","Location": "51399","Inclusions": [{"Type": "Group","Identity": "[email protected]"}]},{"Workload": "Applications","Location": "51279","Inclusions": [{"Type": "Group","Identity": "[email protected]"}]}]'
42+
New-FeatureConfiguration -Name "Collection policy for supported Copilots" -FeatureScenario KnowYourData -Mode Enable -ScenarioConfig '{"Activities":["UploadText","DownloadText"],"EnforcementPlanes":["CopilotExperiences","Browser"],"SensitiveTypeIds":["All"],"IsIngestionEnabled":true}' –Locations '[{"Workload":"Applications","Location":"52655","LocationSource":"SaaS","LocationType":"Individual","Inclusions":[{"Type":"Tenant","Identity":"All","DisplayName":"All","Name":"All"}]},{"Workload":"Applications","Location":"49baeafd-1a6b-4c58-be55-75ae6d1dff6a","LocationSource":"PurviewConfig","LocationType":"Group","Inclusions":[{"Type":"Tenant","Identity":"All","DisplayName":"All","Name":"All"}]}]'
3943
```
4044

41-
This example displays a discovery policy that includes the group "Executives" and targets a specific set of sensitive information types.
45+
This example creates an enabled collection policy named "Collection policy for supported Copilots" that:
46+
- Includes UploadText & DownloadText activity for all supported classifiers
47+
- Captures all AI prompts
48+
- Includes Microsoft Copilot & Copilot Experiences locations, both scoped to all users & groups
49+
50+
### Example 2
51+
```powershell
52+
New-FeatureConfiguration -Name "Scoped browser collection policy for Microsoft Copilot" -FeatureScenario KnowYourData -Mode Enable -ScenarioConfig '{"Activities":["UploadText"],"EnforcementPlanes":["Browser"],"SensitiveTypeIds":["All"],"ExcludedSensitiveTypeIds":["50b8b56b-4ef8-44c2-a924-03374f5831ce","8548332d-6d71-41f8-97db-cc3b5fa544e6"],"IsIngestionEnabled":false}' –Locations '[{"Workload":"Applications","Location":"52655","LocationDisplayName":null,"LocationSource":"SaaS","LocationType":"Individual","Inclusions":[{"Type":"Tenant","Identity":"All","DisplayName":"All","Name":"All"}],"Exclusions":[{"Type":"Group","Identity":"db458ddb-4f56-4d88-a4f7-e29545560839","DisplayName":"Contoso Executives","Name":"[email protected]"}]}]'
53+
```
54+
55+
This example creates an enabled collection policy named "Scoped browser collection policy for Microsoft Copilot" that:
56+
- Includes UploadText activity for all supported classifiers except "All Full Names" and "All Physical Addresses"
57+
- Includes Microsoft Copilot location, for all users & groups except the "Contoso Executives Group"
58+
59+
### Example 3
60+
```powershell
61+
New-FeatureConfiguration -Name "Scoped collection policies for browser and devices" -FeatureScenario KnowYourData -Mode Disable -ScenarioConfig '{"Activities":["UploadText","filecreated","filedeleted","filemodified"],"EnforcementPlanes":["Devices","Browser"],"SensitiveTypeIds":["a44669fe-0d48-453d-a9b1-2cc83f2cba77","cb353f78-2b72-4c3c-8827-92ebe4f69fdf"],"FileExtensions":["pdf"],"IsIngestionEnabled":false}' –Locations '[{"Workload":"EndpointDevices","Location":"","Inclusions":[{"Type":"Group","Identity":"db458ddb-4f56-4d88-a4f7-e29545560839","DisplayName":"All Company","Name":"[email protected]"}],"Exclusions":[{"Type":"IndividualResource","Identity":"a828f25a-cede-4d0e-97e6-b0b0c913732a","DisplayName":"Alex Wilber","Name":"[email protected]"}]},{"Workload":"Applications","Location":"52655","LocationSource":"SaaS","LocationType":"Individual","Inclusions":[{"Type":"IndividualResource","Identity":"84f9af2e-b224-4cb8-b9cd-bc531bb07a48","DisplayName":"Adele Vance","Name":"[email protected]"}]}]'
62+
```
63+
64+
This example creates a disabled collection policy named "Scoped collection policies for browser and devices" that:
65+
- Includes UploadText (for browser) and filecreated, filedeleted, and filemodified activities (for devices)
66+
- Includes "U.S. Social Security Number (SSN)" and "ABA Routing Number" classifiers only
67+
- Detects files on devices with "pdf" file extension only
68+
- Includes devices location, scoped to the "All company" group, excluding the user "Alex Wilber"
69+
- Includes Microsoft Copilot location, scoped only to the user "Adele Vance"
4270

4371
## PARAMETERS
4472

4573
### -Name
46-
The Name parameter specifies the unique name for the Discovery policy. The maximum length is 64 characters. If the value contains spaces, enclose the value in quotation marks (").
74+
The Name parameter specifies the unique name for the feature configuration. The maximum length is 64 characters. If the value contains spaces, enclose the value in quotation marks (").
4775

4876
```yaml
4977
Type: String
@@ -59,10 +87,12 @@ Accept wildcard characters: False
5987
```
6088
6189
### -FeatureScenario
62-
The FeatureScenario parameter specifies the scenario for the Discovery policy. Currently, the only valid value is KnowYourData.
90+
The FeatureScenario parameter specifies the scenario for the feature configuration. Currently, the only valid values are:
91+
- `KnowYourData` for collection policies
92+
- `TrustContainer` for Endpoint DLP trust container
6393

6494
```yaml
65-
Type: Microsoft.Office.CompliancePolicy.PolicyConfiguration.PolicyScenario
95+
Type: PolicyScenario
6696
Parameter Sets: (All)
6797
Aliases:
6898
Applicable: Security & Compliance
@@ -75,13 +105,13 @@ Accept wildcard characters: False
75105
```
76106

77107
### -Mode
78-
The Mode parameter specifies the action and notification level of the Discovery policy. Valid values are:
108+
The Mode parameter specifies feature configuration mode. Valid values are:
79109

80-
- Enable: The policy is enabled for actions and notifications. This is the default value.
81-
- Disable: The policy is disabled.
110+
- Enable: The feature configuration is enabled.
111+
- Disable: The feature configuration is disabled.
82112

83113
```yaml
84-
Type: Microsoft.Office.CompliancePolicy.Tasks.PolicyMode
114+
Type: PolicyMode
85115
Parameter Sets: (All)
86116
Aliases:
87117
Applicable: Security & Compliance
@@ -94,7 +124,7 @@ Accept wildcard characters: False
94124
```
95125

96126
### -ScenarioConfig
97-
The ScenarioConfig parameter specifies additional information about the policy configuration.
127+
The ScenarioConfig parameter specifies additional information about the feature configuration.
98128

99129
```yaml
100130
Type: String
@@ -144,8 +174,40 @@ Accept pipeline input: False
144174
Accept wildcard characters: False
145175
```
146176

177+
### -GeneralDiscovery
178+
{{ Fill GeneralDiscovery Description }}
179+
180+
```yaml
181+
Type: SwitchParameter
182+
Parameter Sets: (All)
183+
Aliases:
184+
Applicable: Security & Compliance
185+
186+
Required: False
187+
Position: Named
188+
Default value: None
189+
Accept pipeline input: False
190+
Accept wildcard characters: False
191+
```
192+
193+
### -IrmDiscovery
194+
{{ Fill IrmDiscovery Description }}
195+
196+
```yaml
197+
Type: SwitchParameter
198+
Parameter Sets: (All)
199+
Aliases:
200+
Applicable: Security & Compliance
201+
202+
Required: False
203+
Position: Named
204+
Default value: None
205+
Accept pipeline input: False
206+
Accept wildcard characters: False
207+
```
208+
147209
### -Locations
148-
The locations parameter specifies where the policy applies.
210+
The locations parameter specifies where the feature configuration applies.
149211

150212
```yaml
151213
Type: String

exchange/exchange-ps/exchange/Remove-FeatureConfiguration.md

+42-6
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,23 @@ schema: 2.0.0
99
# Remove-FeatureConfiguration
1010

1111
## SYNOPSIS
12-
**Note**: Currently, this cmdlet is available only in Private Preview.
12+
**Note**: This cmdlet is available in Public Preview.
1313

1414
This cmdlet is available only in Security & Compliance PowerShell. For more information, see [Security & Compliance PowerShell](https://learn.microsoft.com/powershell/exchange/scc-powershell).
1515

16-
Use the Remove-FeatureConfiguration cmdlet to remove Discovery policies.
16+
Use the Remove-FeatureConfiguration cmdlet to remove Microsoft Purview feature configurations within your organization, including:
17+
- Collection policies
18+
- Endpoint DLP trust container
1719

1820
For information about the parameter sets in the Syntax section below, see [Exchange cmdlet syntax](https://learn.microsoft.com/powershell/exchange/exchange-cmdlet-syntax).
1921

2022
## SYNTAX
2123

2224
```
23-
Remove-FeatureConfiguration [-Identity] <Microsoft.Office.CompliancePolicy.Tasks.PolicyIdParameter>
25+
Remove-FeatureConfiguration [-Identity] <PolicyIdParameter>
2426
[-Confirm]
27+
[-GeneralDiscovery]
28+
[-IrmDiscovery]
2529
[-WhatIf]
2630
[<CommonParameters>]
2731
```
@@ -36,19 +40,19 @@ To use this cmdlet in Security & Compliance PowerShell, you need to be assigned
3640
Remove-FeatureConfiguration -Identity "Engineering Group"
3741
```
3842

39-
This example removes the specified Discovery policy.
43+
This example removes the specified feature configuration.
4044

4145
## PARAMETERS
4246

4347
### -Identity
44-
The Identity policy specifies the Discovery policy that you want to remove. You can use any value that uniquely identifies the policy. For example:
48+
The Identity policy specifies the feature configuration that you want to remove. You can use any value that uniquely identifies the configuration. For example:
4549

4650
- Name
4751
- Distinguished name (DN)
4852
- GUID
4953

5054
```yaml
51-
Type: Microsoft.Office.CompliancePolicy.Tasks.PolicyIdParameter
55+
Type: PolicyIdParameter
5256
Parameter Sets: (All)
5357
Aliases:
5458
Applicable: Security & Compliance
@@ -79,6 +83,38 @@ Accept pipeline input: False
7983
Accept wildcard characters: False
8084
```
8185

86+
### -GeneralDiscovery
87+
{{ Fill GeneralDiscovery Description }}
88+
89+
```yaml
90+
Type: SwitchParameter
91+
Parameter Sets: (All)
92+
Aliases:
93+
Applicable: Security & Compliance
94+
95+
Required: False
96+
Position: Named
97+
Default value: None
98+
Accept pipeline input: False
99+
Accept wildcard characters: False
100+
```
101+
102+
### -IrmDiscovery
103+
{{ Fill IrmDiscovery Description }}
104+
105+
```yaml
106+
Type: SwitchParameter
107+
Parameter Sets: (All)
108+
Aliases:
109+
Applicable: Security & Compliance
110+
111+
Required: False
112+
Position: Named
113+
Default value: None
114+
Accept pipeline input: False
115+
Accept wildcard characters: False
116+
```
117+
82118
### -WhatIf
83119
The WhatIf switch simulates the actions of the command. You can use this switch to view the changes that would occur without actually applying those changes. You don't need to specify a value with this switch.
84120

exchange/exchange-ps/exchange/Resume-MoveRequest.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ This example resumes any failed move requests.
5151

5252
### Example 3
5353
```powershell
54-
Get-MoveRequest -MoveStatus Suspended | Get-MoveRequestStatistics |Where {$_.Message -like "*resume after 10 P.M."} | Resume-MoveRequest
54+
Get-MoveRequest -MoveStatus Suspended | Get-MoveRequestStatistics | Where {$_.Message -like "*resume after 10 P.M."} | Resume-MoveRequest
5555
```
5656

5757
This example resumes any move requests that have the suspend comment "Resume after 10 P.M."

exchange/exchange-ps/exchange/Resume-PublicFolderMoveRequest.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ This example resumes failed public folder move requests.
4949

5050
### Example 3
5151
```powershell
52-
Get-PublicFolderMoveRequest -MoveStatus Suspended | Get-PublicFolderMoveRequestStatistics |Where {$_.Message -like "*resume after 10 P.M."} | Resume-PublicFolderMoveRequest
52+
Get-PublicFolderMoveRequest -MoveStatus Suspended | Get-PublicFolderMoveRequestStatistics | Where {$_.Message -like "*resume after 10 P.M."} | Resume-PublicFolderMoveRequest
5353
```
5454

5555
This example resumes a move request that has the suspend comment "Resume after 10 P.M."

exchange/exchange-ps/exchange/Set-AppRetentionCompliancePolicy.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ A valid value is a JSON string. Refer to the Examples section for syntax and usa
385385

386386
For information about the inactive mailbox scenario, see [Learn about inactive mailboxes](https://learn.microsoft.com/purview/inactive-mailboxes-in-office-365).
387387

388-
**CAUTION**: This parameter uses the SMTP address of the deleted mailbox or mail user, which might also be specified for other mailboxes or mail users. If you use this parameter without first taking additional steps, other mailboxes and mail users with the same SMTP address in the retention policy will also be excluded. To check for additional mailboxes or mail users with the same SMTP address, use the following command and replace *user@example.com* with the SMTP address to check: `Get-Recipient -IncludeSoftDeletedRecipients [email protected] |Select-Object DisplayName, EmailAddresses, Description, Alias, RecipientTypeDetails, WhenSoftDeleted`
388+
**CAUTION**: This parameter uses the SMTP address of the deleted mailbox or mail user, which might also be specified for other mailboxes or mail users. If you use this parameter without first taking additional steps, other mailboxes and mail users with the same SMTP address in the retention policy will also be excluded. To check for additional mailboxes or mail users with the same SMTP address, use the following command and replace `user@contoso.com` with the SMTP address to check: `Get-Recipient -IncludeSoftDeletedRecipients [email protected] | Select-Object DisplayName, EmailAddresses, Description, Alias, RecipientTypeDetails, WhenSoftDeleted`
389389

390390
To prevent active mailboxes or mail users with the same SMTP address from being excluded, put the mailbox on [Litigation Hold](https://learn.microsoft.com/purview/ediscovery-create-a-litigation-hold) before you run the command with the DeletedResources parameter.
391391

0 commit comments

Comments
 (0)