Skip to content

Commit 2d4362c

Browse files
Ja-DunnJa-Dunn
committed
fix
2 parents fb9c54d + 5b87835 commit 2d4362c

File tree

149 files changed

+3031
-1605
lines changed

Some content is hidden

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

149 files changed

+3031
-1605
lines changed

‎.openpublishing.redirection.json

Lines changed: 31 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -16394,71 +16394,6 @@
1639416394
"redirect_url": "/azure/service-fabric/service-fabric-tutorial-deploy-app-to-party-cluster",
1639516395
"redirect_document_id": false
1639616396
},
16397-
{
16398-
"source_path": "articles/migrate/contoso-migration-infrastructure.md",
16399-
"redirect_url": "contoso-migration-overview",
16400-
"redirect_document_id": false
16401-
},
16402-
{
16403-
"source_path": "articles/migrate/contoso-migration-assessment.md",
16404-
"redirect_url": "contoso-migration-overview",
16405-
"redirect_document_id": false
16406-
},
16407-
{
16408-
"source_path": "articles/migrate/contoso-migration-rehost-vm-sql-managed-instance.md",
16409-
"redirect_url": "contoso-migration-overview",
16410-
"redirect_document_id": false
16411-
},
16412-
{
16413-
"source_path": "articles/migrate/contoso-migration-rehost-vm.md",
16414-
"redirect_url": "contoso-migration-overview",
16415-
"redirect_document_id": false
16416-
},
16417-
{
16418-
"source_path": "articles/migrate/contoso-migration-rehost-vm-sql-ag.md",
16419-
"redirect_url": "contoso-migration-overview",
16420-
"redirect_document_id": false
16421-
},
16422-
{
16423-
"source_path": "articles/migrate/contoso-migration-rehost-linux-vm.md",
16424-
"redirect_url": "contoso-migration-overview",
16425-
"redirect_document_id": false
16426-
},
16427-
{
16428-
"source_path": "articles/migrate/contoso-migration-rehost-linux-vm-mysql.md",
16429-
"redirect_url": "contoso-migration-overview",
16430-
"redirect_document_id": false
16431-
},
16432-
{
16433-
"source_path": "articles/migrate/contoso-migration-refactor-web-app-sql.md",
16434-
"redirect_url": "contoso-migration-overview",
16435-
"redirect_document_id": false
16436-
},
16437-
{
16438-
"source_path": "articles/migrate/contoso-migration-refactor-linux-app-service-mysql.md",
16439-
"redirect_url": "contoso-migration-overview",
16440-
"redirect_document_id": false
16441-
},
16442-
{
16443-
"source_path": "articles/migrate/contoso-migration-tfs-vsts.md",
16444-
"redirect_url": "contoso-migration-overview",
16445-
"redirect_document_id": false
16446-
},
16447-
{
16448-
"source_path": "articles/migrate/contoso-migration-rearchitect-container-sql.md",
16449-
"redirect_url": "contoso-migration-overview",
16450-
"redirect_document_id": false
16451-
},
16452-
{
16453-
"source_path": "articles/migrate/contoso-migration-rebuild.md",
16454-
"redirect_url": "contoso-migration-overview",
16455-
"redirect_document_id": false
16456-
},
16457-
{
16458-
"source_path": "articles/migrate/contoso-migration-scale.md",
16459-
"redirect_url": "contoso-migration-overview",
16460-
"redirect_document_id": false
16461-
},
1646216397
{
1646316398
"source_path": "articles/migrate/how-to-tag-v-center.md",
1646416399
"redirect_url": "how-to-create-a-group",
@@ -39492,6 +39427,36 @@
3949239427
"source_path": "articles/sql-database/sql-database-elastic-jobs-uninstall.md",
3949339428
"redirect_url": "/azure/sql-database/elastic-jobs-overview",
3949439429
"redirect_document_id": false
39495-
}
39430+
},
39431+
{
39432+
"source_path": "articles/azure-monitor/app/analytics-troubleshooting.md",
39433+
"redirect_url": "/azure/azure-monitor/azure-monitor-app-hub",
39434+
"redirect_document_id": false
39435+
},
39436+
{
39437+
"source_path": "articles/azure-monitor/app/detect-triage-diagnose.md",
39438+
"redirect_url": "/azure/azure-monitor/azure-monitor-app-hub",
39439+
"redirect_document_id": false
39440+
},
39441+
{
39442+
"source_path": "articles/azure-monitor/app/scom.md",
39443+
"redirect_url": "/azure/azure-monitor/azure-monitor-app-hub",
39444+
"redirect_document_id": false
39445+
},
39446+
{
39447+
"source_path": "articles/azure-monitor/app/windows-services.md",
39448+
"redirect_url": "/azure/azure-monitor/azure-monitor-app-hub",
39449+
"redirect_document_id": false
39450+
},
39451+
{
39452+
"source_path": "articles/azure-monitor/app/release-notes-vsix.md",
39453+
"redirect_url": "/azure/azure-monitor/azure-monitor-app-hub",
39454+
"redirect_document_id": false
39455+
},
39456+
{
39457+
"source_path": "articles/azure-monitor/app/app-insights-dashboards.md",
39458+
"redirect_url": "/azure/azure-monitor/app/overview-dashboard",
39459+
"redirect_document_id": false
39460+
}
3949639461
]
3949739462
}

‎articles/active-directory/authentication/howto-mfa-getstarted.md

Lines changed: 59 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -171,16 +171,65 @@ Get-MsolUser -All | where {$_.StrongAuthenticationMethods.Count -eq 0} | Select-
171171
If your users were enabled using per-user enabled and enforced Azure Multi-Factor Authentication the following PowerShell can assist you in making the conversion to Conditional Access based Azure Multi-Factor Authentication.
172172

173173
```PowerShell
174-
# Save current StrongAuthenticationMethods
175-
$Methods= (Get-MsolUser-UserPrincipalName<UPN>).StrongAuthenticationMethods
176-
177-
# Disable MFA by setting the StrongAuthenticationRequirements to an empty array
178-
# This will also remove the StrongAuthenticationMethods
179-
Set-MsolUser-UserPrincipalName<UPN>-StrongAuthenticationRequirements @()
180-
181-
# Restore the StrongAuthenticationMethods value that was saved
182-
Set-MsolUser-UserPrincipalName<UPN>-StrongAuthenticationMethods$Methods
183-
# From here you can create a function on a loop to perform against all users. ( Test first of course.. )
174+
# Disable MFA for all users, keeping their MFA methods intact
175+
Get-MsolUser -All | Disable-MFA -KeepMethods
176+
177+
# Enforce MFA for all users
178+
Get-MsolUser -All | Set-MfaState -State Enforced
179+
180+
# Wrapper to disable MFA with the option to keep the MFA
181+
# methods (to avoid having to proof-up again later)
182+
function Disable-Mfa {
183+
184+
[CmdletBinding()]
185+
param(
186+
[Parameter(ValueFromPipeline=$True)]
187+
$User,
188+
[switch] $KeepMethods
189+
)
190+
191+
Process {
192+
193+
Write-Verbose ("Disabling MFA for user '{0}'" -f $User.UserPrincipalName)
194+
$User | Set-MfaState -State Disabled
195+
196+
if ($KeepMethods) {
197+
# Restore the MFA methods which got cleared when disabling MFA
198+
Set-MsolUser -ObjectId $User.ObjectId `
199+
-StrongAuthenticationMethods $User.StrongAuthenticationMethods
200+
}
201+
}
202+
}
203+
204+
# Sets the MFA requirement state
205+
function Set-MfaState {
206+
207+
[CmdletBinding()]
208+
param(
209+
[Parameter(ValueFromPipelineByPropertyName=$True)]
210+
$ObjectId,
211+
[Parameter(ValueFromPipelineByPropertyName=$True)]
212+
$UserPrincipalName,
213+
[ValidateSet("Disabled","Enabled","Enforced")]
214+
$State
215+
)
216+
217+
Process {
218+
Write-Verbose ("Setting MFA state for user '{0}' to '{1}'." -f $ObjectId, $State)
219+
$Requirements = @()
220+
if ($State -ne "Disabled") {
221+
$Requirement =
222+
[Microsoft.Online.Administration.StrongAuthenticationRequirement]::new()
223+
$Requirement.RelyingParty = "*"
224+
$Requirement.State = $State
225+
$Requirements += $Requirement
226+
}
227+
228+
Set-MsolUser -ObjectId $ObjectId -UserPrincipalName $UserPrincipalName `
229+
-StrongAuthenticationRequirements $Requirements
230+
}
231+
}
232+
184233
```
185234

186235
## Plan Conditional Access policies

‎articles/active-directory/authentication/howto-mfa-userstates.md

Lines changed: 59 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -136,16 +136,65 @@ which can also be shortened to:
136136
The following PowerShell can assist you in making the conversion to Conditional Access based Azure Multi-Factor Authentication.
137137

138138
```PowerShell
139-
# Save current StrongAuthenticationMethods
140-
$Methods= (Get-MsolUser-UserPrincipalName<UPN>).StrongAuthenticationMethods
141-
142-
# Disable MFA by setting the StrongAuthenticationRequirements to an empty array
143-
# This will also remove the StrongAuthenticationMethods
144-
Set-MsolUser-UserPrincipalName<UPN>-StrongAuthenticationRequirements @()
145-
146-
# Restore the StrongAuthenticationMethods value that was saved
147-
Set-MsolUser-UserPrincipalName<UPN>-StrongAuthenticationMethods$Methods
148-
# From here you can create a function on a loop to perform against all users. ( Test first of course.. )
139+
# Disable MFA for all users, keeping their MFA methods intact
140+
Get-MsolUser -All | Disable-MFA -KeepMethods
141+
142+
# Enforce MFA for all users
143+
Get-MsolUser -All | Set-MfaState -State Enforced
144+
145+
# Wrapper to disable MFA with the option to keep the MFA
146+
# methods (to avoid having to proof-up again later)
147+
function Disable-Mfa {
148+
149+
[CmdletBinding()]
150+
param(
151+
[Parameter(ValueFromPipeline=$True)]
152+
$User,
153+
[switch] $KeepMethods
154+
)
155+
156+
Process {
157+
158+
Write-Verbose ("Disabling MFA for user '{0}'" -f $User.UserPrincipalName)
159+
$User | Set-MfaState -State Disabled
160+
161+
if ($KeepMethods) {
162+
# Restore the MFA methods which got cleared when disabling MFA
163+
Set-MsolUser -ObjectId $User.ObjectId `
164+
-StrongAuthenticationMethods $User.StrongAuthenticationMethods
165+
}
166+
}
167+
}
168+
169+
# Sets the MFA requirement state
170+
function Set-MfaState {
171+
172+
[CmdletBinding()]
173+
param(
174+
[Parameter(ValueFromPipelineByPropertyName=$True)]
175+
$ObjectId,
176+
[Parameter(ValueFromPipelineByPropertyName=$True)]
177+
$UserPrincipalName,
178+
[ValidateSet("Disabled","Enabled","Enforced")]
179+
$State
180+
)
181+
182+
Process {
183+
Write-Verbose ("Setting MFA state for user '{0}' to '{1}'." -f $ObjectId, $State)
184+
$Requirements = @()
185+
if ($State -ne "Disabled") {
186+
$Requirement =
187+
[Microsoft.Online.Administration.StrongAuthenticationRequirement]::new()
188+
$Requirement.RelyingParty = "*"
189+
$Requirement.State = $State
190+
$Requirements += $Requirement
191+
}
192+
193+
Set-MsolUser -ObjectId $ObjectId -UserPrincipalName $UserPrincipalName `
194+
-StrongAuthenticationRequirements $Requirements
195+
}
196+
}
197+
149198
```
150199

151200
## Next steps

‎articles/active-directory/fundamentals/active-directory-data-storage-eu.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ For customers who provided an address in Europe, Azure AD keeps most of the iden
2424

2525
- All two-factor authentication using phone calls or SMS originate from US datacenters and are also routed by global providers.
2626
- Push notifications using the Microsoft Authenticator app originate from US datacenters. In addition, device vendor specific services may also come into play and these services maybe outside Europe.
27-
- OATH codes are always validated in the U.S.
28-
29-
For more information about what user information is collected by Azure Multi-Factor Authentication Server (MFA Server) and cloud-based Azure MFA, see [Azure Multi-Factor Authentication user data collection](https://docs.microsoft.com/azure/active-directory/authentication/howto-mfa-reporting-datacollection).
27+
- OATH codes are always validated in the U.S.
3028

3129
## Microsoft Azure Active Directory B2C (Azure AD B2C)
3230

‎articles/active-directory/hybrid/whatis-phs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ For more information, see [What is hybrid identity?](whatis-hybrid-identity.md).
4242

4343
## Next Steps
4444

45-
- [What is hybrid identity?](whatis-phs.md)
45+
- [What is hybrid identity?](whatis-hybrid-identity.md)
4646
- [What is Azure AD Connect and Connect Health?](whatis-azure-ad-connect.md)
4747
- [What is pass-through authentication (PTA)?](how-to-connect-pta.md)
4848
- [What is federation?](whatis-fed.md)

0 commit comments

Comments
 (0)