Skip to content

Commit 0b5a0ab

Browse files
batamigbatamig
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into eiot-redux
2 parents 30c84cf + 7091e84 commit 0b5a0ab

File tree

875 files changed

+10537
-5710
lines changed

Some content is hidden

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

875 files changed

+10537
-5710
lines changed

‎.openpublishing.publish.config.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -970,6 +970,7 @@
970970
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-old.json",
971971
"articles/cognitive-services/.openpublishing.redirection.cognitive-services.json",
972972
".openpublishing.redirection.baremetal-infrastructure.json",
973-
"articles/iot-dps/.openpublishing.redirection.iot-dps.json"
973+
"articles/iot-dps/.openpublishing.redirection.iot-dps.json",
974+
"articles/cloud-shell/.openpublishing.redirection.cloud-shell.json"
974975
]
975976
}

‎.openpublishing.redirection.json‎

Lines changed: 17 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@
99
"source_path_from_root": "/articles/api-management/developer-portal-use-community-widgets.md",
1010
"redirect_url": "/azure/api-management/developer-portal-extend-custom-functionality",
1111
"redirect_document_id": false
12-
},
12+
},
1313
{
1414
"source_path": "articles/sentinel/whats-new-archive.md",
1515
"redirect_url": "/azure/sentinel/whats-new",
16-
"redirect_document_id": false
16+
"redirect_document_id": false
1717
},
1818
{
1919
"source_path": "articles/backup/sap-hana-db-manage.md",
2020
"redirect_url": "/azure/backup/sap-hana-database-manage",
21-
"redirect_document_id": false
21+
"redirect_document_id": false
2222
},
2323
{
2424
"source_path": "articles/backup/sap-hana-db-restore.md",
2525
"redirect_url": "/azure/backup/sap-hana-database-restore",
26-
"redirect_document_id": false
26+
"redirect_document_id": false
2727
},
2828
{
2929
"source_path": "articles/backup/sap-hana-db-about.md",
@@ -93,32 +93,32 @@
9393
{
9494
"source_path": "articles/site-recovery/switch-replication-appliance-preview.md",
9595
"redirect_url": "/azure/site-recovery/switch-replication-appliance-modernized",
96-
"redirect_document_id": false
96+
"redirect_document_id": false
9797
},
9898
{
9999
"source_path": "articles/site-recovery/upgrade-mobility-service-preview.md",
100100
"redirect_url": "/azure/site-recovery/upgrade-mobility-service-modernized",
101-
"redirect_document_id": false
101+
"redirect_document_id": false
102102
},
103103
{
104104
"source_path": "articles/site-recovery/vmware-azure-set-up-replication-tutorial-preview.md",
105105
"redirect_url": "/azure/site-recovery/vmware-azure-set-up-replication-tutorial-modernized",
106-
"redirect_document_id": false
106+
"redirect_document_id": false
107107
},
108108
{
109109
"source_path": "articles/site-recovery/vmware-azure-architecture-preview.md",
110110
"redirect_url": "/azure/site-recovery/vmware-azure-architecture-modernized",
111-
"redirect_document_id": false
111+
"redirect_document_id": false
112112
},
113113
{
114114
"source_path": "articles/physical-server-azure-architecture-preview.md",
115115
"redirect_url": "/azure/physical-server-azure-architecture-modernized",
116-
"redirect_document_id": false
116+
"redirect_document_id": false
117117
},
118118
{
119119
"source_path": "articles/vmware-azure-tutorial-failover-failback-preview.md",
120120
"redirect_url": "/azure/vmware-azure-tutorial-failover-failback-modernized",
121-
"redirect_document_id": false
121+
"redirect_document_id": false
122122
},
123123
{
124124
"source_path": "articles/automanage/automanage-virtual-machines.md",
@@ -790,7 +790,7 @@
790790
},
791791
{
792792
"source_path_from_root": "/articles/aks/concepts-diagnostics.md",
793-
"redirect_url": "/troubleshoot/azure/azure-kubernetes/welcome-azure-kubernetes",
793+
"redirect_url": "/azure/aks/aks-diagnostics",
794794
"redirect_document_id": false
795795
},
796796
{
@@ -6353,12 +6353,12 @@
63536353
"redirect_url": "/azure/azure-cache-for-redis/scripts/create-manage-cache",
63546354
"redirect_document_id": false
63556355
},
6356-
{
6356+
{
63576357
"source_path_from_root": "/articles/storage/blobs/anonymous-read-access-client.md",
63586358
"redirect_url": "/azure/storage/blobs/anonymous-read-access-prevent",
63596359
"redirect_document_id": false
63606360
},
6361-
{
6361+
{
63626362
"source_path_from_root": "/articles/storage/common/storage-auth-abac-attributes.md",
63636363
"redirect_url": "/azure/storage/blobs/storage-auth-abac-attributes",
63646364
"redirect_document_id": false
@@ -10493,21 +10493,6 @@
1049310493
"redirect_url": "/azure/cloud-services/diagnostics-performance-counters",
1049410494
"redirect_document_id": false
1049510495
},
10496-
{
10497-
"source_path_from_root": "/articles/cloud-shell/features-powershell.md",
10498-
"redirect_url": "/azure/cloud-shell/features",
10499-
"redirect_document_id": false
10500-
},
10501-
{
10502-
"source_path_from_root": "/articles/cloud-shell/index.md",
10503-
"redirect_url": "/azure/cloud-shell/overview",
10504-
"redirect_document_id": false
10505-
},
10506-
{
10507-
"source_path_from_root": "/articles/cloud-shell/persisting-shell-storage-powershell.md",
10508-
"redirect_url": "/azure/cloud-shell/persisting-shell-storage",
10509-
"redirect_document_id": false
10510-
},
1051110496
{
1051210497
"source_path_from_root": "/articles/jenkins/azure-container-agents-plugin-run-container-as-an-agent.md",
1051310498
"redirect_url": "/azure/container-instances/container-instances-jenkins",
@@ -25437,7 +25422,7 @@
2543725422
"source_path_from_root": "/articles/virtual-machines/scripts/virtual-machines-cli-sample-copy-managed-disks-to-same-or-different-subscription.md",
2543825423
"redirect_url": "/previous-versions/azure/virtual-machines/scripts/virtual-machines-cli-sample-copy-managed-disks-to-same-or-different-subscription",
2543925424
"redirect_document_id": false
25440-
},
25425+
},
2544125426
{
2544225427
"source_path_from_root": "/articles/virtual-machines/disks-cross-tenant-cmk.md",
2544325428
"redirect_url": "/azure/virtual-machines/disks-cross-tenant-customer-managed-keys",
@@ -29495,9 +29480,9 @@
2949529480
"redirect_document_id": false
2949629481
},
2949729482
{
29498-
"source_path_from_root": "/articles/cloud-shell/example-terraform-bash.md",
29499-
"redirect_url": "/azure/developer/terraform/quickstart-configure",
29500-
"redirect_document_id": false
29483+
"source_path_from_root": "/articles/aks/managed-cluster-snapshot.md",
29484+
"redirect_url": "/azure/aks/intro-kubernetes",
29485+
"redirect_document_id": "false"
2950129486
}
2950229487
]
2950329488
}

‎.openpublishing.redirection.security-benchmark.json‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -386,11 +386,6 @@
386386
"redirect_url": "/security/benchmark/azure/baselines/batch-security-baseline",
387387
"redirect_document_id": false
388388
},
389-
{
390-
"source_path_from_root": "/articles/cloud-shell/security-baseline.md",
391-
"redirect_url": "/security/benchmark/azure/baselines/cloud-shell-security-baseline",
392-
"redirect_document_id": false
393-
},
394389
{
395390
"source_path_from_root": "/articles/cognitive-services/security-baseline.md",
396391
"redirect_url": "/security/benchmark/azure/baselines/cognitive-services-security-baseline",

‎articles/active-directory-b2c/index.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ conceptualContent:
244244
url: azure-sentinel.md
245245
itemType: how-to-guide
246246
- text: Regulations
247-
url: https://docs.microsoft.com/azure/compliance/
247+
url: ../compliance/index.yml
248248
itemType: concept
249249
#- text: 'Manage user access: Minors and parental consent'
250250
# url: manage-user-access.md
@@ -364,4 +364,4 @@ tools:
364364
- title: MSAL React
365365
url: https://github.com/Azure-Samples/ms-identity-javascript-react-tutorial/tree/main/3-Authorization-II/2-call-api-b2c
366366
imageSrc: ../active-directory/develop/media/hub/react.svg
367-
## BAND 4 - TOOLS END #######################################################################################################################################
367+
## BAND 4 - TOOLS END #######################################################################################################################################

‎articles/active-directory/app-provisioning/on-premises-ecma-troubleshoot.md‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ manager: amycolannino
77
ms.service: active-directory
88
ms.workload: identity
99
ms.topic: overview
10-
ms.date: 04/04/2022
10+
ms.date: 11/12/2022
1111
ms.subservice: hybrid
1212
ms.author: billmath
1313
ms.collection: M365-identity-device-management
@@ -16,7 +16,7 @@ ms.collection: M365-identity-device-management
1616
# Troubleshoot on-premises application provisioning
1717

1818
## Troubleshoot test connection issues
19-
After you configure the provisioning agent and ECMA host, it's time to test connectivity from the Azure Active Directory (Azure AD) provisioning service to the provisioning agent, the ECMA host, and the application. To perform this end-to-end test, select **Test connection** in the application in the Azure portal. When the test connection fails, try the following troubleshooting steps:
19+
After you configure the provisioning agent and ECMA host, it's time to test connectivity from the Azure Active Directory (Azure AD) provisioning service to the provisioning agent, the ECMA host, and the application. To perform this end-to-end test, select **Test connection** in the application in the Azure portal. Be sure to wait 10 to 20 minutes after assigning an initial agent or changing the agent before testing the connection. If after this time the test connection fails, try the following troubleshooting steps:
2020

2121
1. Check that the agent and ECMA host are running:
2222
1. On the server with the agent installed, open **Services** by going to **Start** > **Run** > **Services.msc**.
@@ -31,7 +31,8 @@ After you configure the provisioning agent and ECMA host, it's time to test conn
3131
6. After you assign an agent, you need to wait 10 to 20 minutes for the registration to complete. The connectivity test won't work until the registration completes.
3232
7. Ensure that you're using a valid certificate. Go to the **Settings** tab of the ECMA host to generate a new certificate.
3333
8. Restart the provisioning agent by going to the taskbar on your VM by searching for the Microsoft Azure AD Connect provisioning agent. Right-click **Stop**, and then select **Start**.
34-
9. When you provide the tenant URL in the Azure portal, ensure that it follows the following pattern. You can replace `localhost` with your host name, but it isn't required. Replace `connectorName` with the name of the connector you specified in the ECMA host. The error message 'invalid resource' generally indicates that the URL does not follow the expected format.
34+
1. If you continue to see `The ECMA host is currently importing data from the target application` even after restarting the ECMA Connector Host and the provisioning agent, and waiting for the initial import to complete, then you may need to cancel and re-start configuring provisioning to the application in the Azure portal.
35+
1. When you provide the tenant URL in the Azure portal, ensure that it follows the following pattern. You can replace `localhost` with your host name, but it isn't required. Replace `connectorName` with the name of the connector you specified in the ECMA host. The error message 'invalid resource' generally indicates that the URL does not follow the expected format.
3536

3637
```
3738
https://localhost:8585/ecma2host_connectorName/scim
@@ -142,7 +143,7 @@ After the ECMA Connector Host schema mapping has been configured, start the serv
142143
| Error | Resolution |
143144
| ----------- | ----------- |
144145
| Could not load file or assembly 'file:///C:\Program Files\Microsoft ECMA2Host\Service\ECMA\Cache\8b514472-c18a-4641-9a44-732c296534e8\Microsoft.IAM.Connector.GenericSql.dll' or one of its dependencies. Access is denied. | Ensure that the network service account has 'full control' permissions over the cache folder. |
145-
| Invalid LDAP style of object's DN. DN: [email protected]" | Ensure the 'DN is Anchor' checkbox is not checked in the 'connectivity' page of the ECMA host. Ensure the 'autogenerated' checkbox is selected in the 'object types' page of the ECMA host. See [About anchor attributes and distinguished names](on-premises-application-provisioning-architecture.md#about-anchor-attributes-and-distinguished-names) for more information.|
146+
| Invalid LDAP style of object's DN. DN: [email protected]" or `Target Site: ValidByLdapStyle` | Ensure the 'DN is Anchor' checkbox is not checked in the 'connectivity' page of the ECMA host. Ensure the 'autogenerated' checkbox is selected in the 'object types' page of the ECMA host. See [About anchor attributes and distinguished names](on-premises-application-provisioning-architecture.md#about-anchor-attributes-and-distinguished-names) for more information.|
146147
147148
## Understand incoming SCIM requests
148149
@@ -232,7 +233,7 @@ By using Azure AD, you can monitor the provisioning service in the cloud and col
232233
```
233234

234235
### I am getting an Invalid LDAP style DN error when trying to configure the ECMA Connector Host with SQL
235-
By default, the genericSQL connector expects the DN to be populated using the LDAP style (when the 'DN is anchor' attribute is left unchecked in the first connectivity page). In the error message above, you can see that the DN is a UPN, rather than an LDAP style DN that the connector expects.
236+
By default, the generic SQL connector expects the DN to be populated using the LDAP style (when the 'DN is anchor' attribute is left unchecked in the first connectivity page). In the error message `Invalid LDAP style DN` or `Target Site: ValidByLdapStyle`, you may see that the DN field contains a user principal name (UPN), rather than an LDAP style DN that the connector expects.
236237

237238
To resolve this, ensure that **Autogenerated** is selected on the object types page when you configure the connector.
238239

‎articles/active-directory/authentication/concept-authentication-phone-options.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ With phone call verification during SSPR or Azure AD Multi-Factor Authentication
5252

5353
## Office phone verification
5454

55-
With phone call verification during SSPR or Azure AD Multi-Factor Authentication, an automated voice call is made to the phone number registered by the user. To complete the sign-in process, the user is prompted to press # on their keypad.
55+
With office phone call verification during SSPR or Azure AD Multi-Factor Authentication, an automated voice call is made to the phone number registered by the user. To complete the sign-in process, the user is prompted to press # on their keypad.
5656

5757
## Troubleshooting phone options
5858

‎articles/active-directory/authentication/how-to-mfa-server-migration-utility.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: multi-factor-authentication
66
ms.service: active-directory
77
ms.subservice: authentication
88
ms.topic: how-to
9-
ms.date: 11/11/2022
9+
ms.date: 11/14/2022
1010

1111
ms.author: justinha
1212
author: justinha
@@ -202,7 +202,7 @@ The settings option allows you to change the settings for the migration process:
202202
:::image type="content" border="true" source="./media/how-to-mfa-server-migration-utility/settings.png" alt-text="Screenshot of settings.":::
203203

204204
- Migrate – This setting allows you to specify which method(s) should be migrated for the selection of users
205-
- User Match – Allows you to specify a different attribute for matching users instead of the default UPN-matching
205+
- User Match – Allows you to specify a different on-premises Active Directory attribute for matching Azure AD UPN instead of the default match to userPrincipalName
206206
- Automatic synchronization – Starts a background service that will continually monitor any authentication method changes to users in the on-premises MFA Server, and write them to Azure AD at the specified time interval defined
207207

208208
The migration process can be an automatic process, or a manual process.

0 commit comments

Comments
 (0)