Skip to content

Commit 102e4d8

Browse files
rolyonrolyon
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-pim-toc-mvc
2 parents 948980e + 747adbf commit 102e4d8

File tree

106 files changed

+2039
-1176
lines changed

Some content is hidden

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

106 files changed

+2039
-1176
lines changed

‎.openpublishing.redirection.json

Lines changed: 42 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2926,13 +2926,13 @@
29262926
"redirect_url": "/azure/automation/automation-create-alert-triggered-runbook",
29272927
"redirect_document_id": false
29282928
},
2929-
2929+
29302930
{
29312931
"source_path": "articles/automation/automation-migrate-account-subscription.md",
29322932
"redirect_url": "/azure/azure-resource-manager/resource-group-move-resources",
29332933
"redirect_document_id": false
29342934
},
2935-
2935+
29362936
{
29372937
"source_path": "articles/automation/automation-troubleshooting-automation-errors.md",
29382938
"redirect_url": "/azure/automation/troubleshoot/runbooks",
@@ -14478,7 +14478,7 @@
1447814478
"source_path": "articles/active-directory/active-directory-reporting-activity-sign-ins-mfa.md",
1447914479
"redirect_url": "/azure/active-directory/authentication/howto-mfa-reporting",
1448014480
"redirect_document_id": false
14481-
},
14481+
},
1448214482
{
1448314483
"source_path": "articles/active-directory/active-directory-reporting-api-audit-reference.md",
1448414484
"redirect_url": "https://developer.microsoft.com/en-us/graph/docs/api-reference/beta/resources/directoryaudit",
@@ -17933,120 +17933,120 @@
1793317933
"source_path": "articles/active-directory/reports-monitoring/sample-sign-in-api.md",
1793417934
"redirect_url": "/azure/active-directory/reports-monitoring/tutorial-access-api-with-certificates",
1793517935
"redirect_document_id": false
17936-
},
17936+
},
1793717937
{
1793817938
"source_path": "articles/active-directory/active-directory-reporting-api-getting-started-azure-portal.md",
1793917939
"redirect_url": "/azure/active-directory/reports-monitoring/concept-reporting-api",
1794017940
"redirect_document_id": false
17941-
},
17941+
},
1794217942
{
1794317943
"source_path": "articles/active-directory/active-directory-reporting-api-prerequisites-azure-portal.md",
1794417944
"redirect_url": "/azure/active-directory/reports-monitoring/howto-configure-prerequisites-for-reporting-api",
1794517945
"redirect_document_id": false
17946-
},
17947-
17946+
},
17947+
1794817948
{
1794917949
"source_path": "articles/active-directory/active-directory-reporting-api-sign-in-activity-samples.md",
1795017950
"redirect_url": "/azure/active-directory/reports-monitoring/sample-sign-in-api",
1795117951
"redirect_document_id": false
17952-
},
17953-
17952+
},
17953+
1795417954
{
1795517955
"source_path": "articles/active-directory/active-directory-reporting-api-with-certificates.md",
1795617956
"redirect_url": "/azure/active-directory/reports-monitoring/tutorial-access-api-with-certificates",
1795717957
"redirect_document_id": false
17958-
},
17959-
17958+
},
17959+
1796017960
{
1796117961
"source_path": "articles/active-directory/active-directory-reporting-azure-portal.md",
1796217962
"redirect_url": "/azure/active-directory/reports-monitoring/overview-reports",
1796317963
"redirect_document_id": false
17964-
},
17965-
17964+
},
17965+
1796617966
{
1796717967
"source_path": "articles/active-directory/active-directory-reporting-faq.md",
1796817968
"redirect_url": "/azure/active-directory/reports-monitoring/reports-faq",
1796917969
"redirect_document_id": false
17970-
},
17971-
17970+
},
17971+
1797217972
{
1797317973
"source_path": "articles/active-directory/active-directory-reporting-latencies-azure-portal.md",
1797417974
"redirect_url": "/azure/active-directory/reports-monitoring/reference-reports-latencies",
1797517975
"redirect_document_id": false
17976-
},
17977-
17976+
},
17977+
1797817978
{
1797917979
"source_path": "articles/active-directory/active-directory-reporting-migration.md",
1798017980
"redirect_url": "/azure/active-directory/reports-monitoring/howto-find-activity-reports",
1798117981
"redirect_document_id": false
17982-
},
17983-
17982+
},
17983+
1798417984
{
1798517985
"source_path": "articles/active-directory/active-directory-reporting-power-bi-content-pack-how-to.md",
1798617986
"redirect_url": "/azure/active-directory/reports-monitoring/howto-power-bi-content-pack",
1798717987
"redirect_document_id": false
17988-
},
17989-
17988+
},
17989+
1799017990
{
1799117991
"source_path": "articles/active-directory/active-directory-reporting-retention.md",
1799217992
"redirect_url": "/azure/active-directory/reports-monitoring/reference-reports-data-retention",
1799317993
"redirect_document_id": false
17994-
},
17994+
},
1799517995
{
1799617996
"source_path": "articles/active-directory/active-directory-reporting-risk-events.md",
1799717997
"redirect_url": "/azure/active-directory/reports-monitoring/concept-risk-events",
1799817998
"redirect_document_id": false
17999-
},
17999+
},
1800018000
{
1800118001
"source_path": "articles/active-directory/active-directory-reporting-security-risky-sign-ins.md",
1800218002
"redirect_url": "/azure/active-directory/reports-monitoring/concept-risky-sign-ins",
1800318003
"redirect_document_id": false
18004-
},
18004+
},
1800518005
{
1800618006
"source_path": "articles/active-directory/active-directory-reporting-security-user-at-risk.md",
1800718007
"redirect_url": "/azure/active-directory/reports-monitoring/concept-user-at-risk",
1800818008
"redirect_document_id": false
18009-
},
18009+
},
1801018010
{
1801118011
"source_path": "articles/active-directory/active-directory-reporting-troubleshoot-content-pack.md",
1801218012
"redirect_url": "/azure/active-directory/reports-monitoring/troubleshoot-content-pack",
1801318013
"redirect_document_id": false
18014-
},
18014+
},
1801518015
{
1801618016
"source_path": "articles/active-directory/active-directory-reporting-troubleshoot-graph-api.md",
1801718017
"redirect_url": "/azure/active-directory/reports-monitoring/troubleshoot-graph-api",
1801818018
"redirect_document_id": false
18019-
},
18019+
},
1802018020
{
1802118021
"source_path": "articles/active-directory/active-directory-reporting-troubleshoot-missing-audit-data.md",
1802218022
"redirect_url": "/azure/active-directory/reports-monitoring/troubleshoot-missing-audit-data",
1802318023
"redirect_document_id": false
18024-
},
18024+
},
1802518025
{
1802618026
"source_path": "articles/active-directory/active-directory-reporting-troubleshoot-missing-data-download.md",
1802718027
"redirect_url": "/azure/active-directory/reports-monitoring/troubleshoot-missing-data-download",
1802818028
"redirect_document_id": false
18029-
},
18029+
},
1803018030
{
1803118031
"source_path": "articles/active-directory/active-directory-report-security-user-at-risk-remediation.md",
1803218032
"redirect_url": "/azure/active-directory/reports-monitoring/howto-remediate-users-flagged-for-risk",
1803318033
"redirect_document_id": false
18034-
},
18034+
},
1803518035
{
1803618036
"source_path": "articles/active-directory/reporting-azure-monitor-diagnostics-audit-log-schema.md",
1803718037
"redirect_url": "/azure/active-directory/reports-monitoring/reference-azure-monitor-audit-log-schema",
1803818038
"redirect_document_id": false
18039-
},
18039+
},
1804018040
{
1804118041
"source_path": "articles/active-directory/reporting-azure-monitor-diagnostics-azure-event-hub.md",
1804218042
"redirect_url": "/azure/active-directory/reports-monitoring/quickstart-azure-monitor-stream-logs-to-event-hub",
1804318043
"redirect_document_id": false
18044-
},
18044+
},
1804518045
{
1804618046
"source_path": "articles/active-directory/reporting-azure-monitor-diagnostics-azure-storage-account.md",
1804718047
"redirect_url": "/azure/active-directory/reports-monitoring/quickstart-azure-monitor-route-logs-to-storage-account",
1804818048
"redirect_document_id": false
18049-
},
18049+
},
1805018050
{
1805118051
"source_path": "articles/active-directory/reporting-azure-monitor-diagnostics-overview.md",
1805218052
"redirect_url": "/azure/active-directory/reports-monitoring/overview-activity-logs-in-azure-monitor",
@@ -18061,7 +18061,7 @@
1806118061
"source_path": "articles/active-directory/reporting-azure-monitor-diagnostics-splunk-integration.md",
1806218062
"redirect_url": "/azure/active-directory/reports-monitoring/tutorial-integrate-activity-logs-with-splunk",
1806318063
"redirect_document_id": false
18064-
},
18064+
},
1806518065
{
1806618066
"source_path": "articles/active-directory/active-directory-known-networks.md",
1806718067
"redirect_url": "/azure/active-directory/active-directory-named-locations",
@@ -23362,6 +23362,11 @@
2336223362
"redirect_url": "/azure/cognitive-services/bing-web-search",
2336323363
"redirect_document_id": false
2336423364
},
23365+
{
23366+
"source_path": "articles/cognitive-services/Bing-Web-Search/sdk.md",
23367+
"redirect_url": "/azure/cognitive-services/bing-web-search/sdk-samples",
23368+
"redirect_document_id": true
23369+
},
2336523370
{
2336623371
"source_path": "articles/active-directory/active-directory-understanding-resource-access.md",
2336723372
"redirect_url": "/azure/role-based-access-control/rbac-and-directory-admin-roles",
@@ -26975,7 +26980,7 @@
2697526980
{
2697626981
"source_path": "articles/cognitive-services/LUIS/Cortana-Prebuilt-App.md",
2697726982
"redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-cortana-prebuilt-app",
26978-
"redirect_document_id": true
26983+
"redirect_document_id": true
2697926984
},
2698026985
{
2698126986
"source_path": "articles/cloud-shell/features-powershell.md",
@@ -27066,7 +27071,7 @@
2706627071
"source_path": "articles/active-directory/authentication/end-user/current/sign-in-experience-updates.md",
2706727072
"redirect_url": "/azure/active-directory/user-help/microsoft-authenticator-app-phone-signin-faq",
2706827073
"redirect_document_id": false
27069-
},
27074+
},
2707027075
{
2707127076
"source_path": "articles/active-directory/active-directory-passwords-reset-register.md",
2707227077
"redirect_url": "/azure/active-directory/user-help/active-directory-passwords-reset-register",
@@ -27182,7 +27187,7 @@
2718227187
"redirect_url": "/azure/active-directory-b2c/active-directory-b2c-tutorials-spa",
2718327188
"redirect_document_id": true
2718427189
},
27185-
{
27190+
{
2718627191
"source_path": "articles/cognitive-services/video-indexer/video-indexer-output-json.md",
2718727192
"redirect_url": "/azure/cognitive-services/video-indexer/video-indexer-output-json-v2",
2718827193
"redirect_document_id": true

‎articles/active-directory/active-directory-hybrid-identity-design-considerations-tools-comparison.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ ms.workload: identity
1111
ms.tgt_pltfrm: na
1212
ms.devlang: na
1313
ms.topic: get-started-article
14-
ms.date: 04/27/2018
14+
ms.date: 08/28/2018
1515
ms.component: hybrid
16-
ms.date: 05/31/2018
1716
ms.author: billmath
1817

1918
---
@@ -41,14 +40,20 @@ PP = Public Preview
4140
| Connect to single on-premises AD forest |● |● |● |● |● |
4241
| Connect to multiple on-premises AD forests |● |● | |● |● |
4342
| Connect to multiple on-premises Exchange Orgs |● | | | | |
44-
| Connect to single on-premises LDAP directory | | | |● |● |
45-
| Connect to multiple on-premises LDAP directories | | | |● |● |
46-
| Connect to on-premises AD and on-premises LDAP directories | | | |● |● |
43+
| Connect to single on-premises LDAP directory |●* | | |● |● |
44+
| Connect to multiple on-premises LDAP directories |●* | | |● |● |
45+
| Connect to on-premises AD and on-premises LDAP directories |●* | | |● |● |
4746
| Connect to custom systems (i.e. SQL, Oracle, MySQL, etc.) |FR | | |● |● |
4847
| Synchronize customer defined attributes (directory extensions) |● | | | | |
4948
| Connect to on-premises HR (i.e., SAP, Oracle eBusiness,PeopleSoft) |FR | | |● |● |
5049
| Supports FIM synchronization rules and connectors for provisioning to on-premises systems. | | | |● |● |
5150

51+
52+
* Currently there are two supported options for this. They are:
53+
54+
1. You can use the generic LDAP connector and enable it outside of Azure AD Connect. This is complex and requires a partner for on-boarding and a premier support agreement to maintain. This option can handle both single and multiple LDAP directories.
55+
56+
2. You can develop your own solution for moving objects from LDAP to Active Directory. Then synchronize the objects with Azure AD Connect. MIM or FIM could be used as a possible solution for moving the objects.
5257

5358
## Cloud to On-Premises Synchronization
5459
| Feature | Azure Active Directory Connect | Azure Active Directory Synchronization Services- NO LONGER SUPPORTED | Azure Active Directory Synchronization Tool (DirSync)- NO LONGER SUPPORTED | Forefront Identity Manager 2010 R2 (FIM) | Microsoft Identity Manager 2016 (MIM) |

0 commit comments

Comments
 (0)