Skip to content

Commit 0cb3ca2

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 5fd8142 + ee176e8 commit 0cb3ca2

File tree

111 files changed

+1903
-882
lines changed

Some content is hidden

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

111 files changed

+1903
-882
lines changed

articles/active-directory/develop/app-registrations-training-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ms.collection: M365-identity-device-management
2424

2525
You can find numerous improvements in the new [App registrations](https://go.microsoft.com/fwlink/?linkid=2083908) experience in the Azure portal. If you're more familiar with the legacy experience, use this training guide to get you started using the new experience.
2626

27-
In Azure Active Directory, the new application registration experience described here generally available (GA). In Azure Active Directory B2C (Azure AD B2C), this experience is in preview.
27+
In Azure Active Directory, the new application registration experience described here is generally available (GA). In Azure Active Directory B2C (Azure AD B2C), this experience is in preview.
2828

2929
## Key changes
3030

articles/active-directory/manage-apps/toc.yml

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
items:
66
- name: What is cloud app management and single sign-on?
77
href: what-is-application-management.md
8-
- name: What is automatic user provisioning?
8+
- name: What is application provisioning?
99
href: user-provisioning.md
1010
- name: What is Application Proxy for on-premises apps?
1111
href: what-is-application-proxy.md
@@ -17,7 +17,7 @@
1717
href: view-applications-portal.md
1818
- name: Tutorials
1919
items:
20-
- name: SaaS apps tutorials
20+
- name: Integrated gallery apps (e.g. ServiceNow, Salesforce, Dropbox)
2121
href: /azure/active-directory/saas-apps/
2222
- name: Add an on-premises app with Application Proxy
2323
href: application-proxy-add-on-premises-application.md
@@ -66,12 +66,12 @@
6666
href: howto-saml-token-encryption.md
6767
- name: End-user portals
6868
href: end-user-experiences.md
69-
- name: Automatic user provisioning
69+
- name: Application provisioning (SCIM)
7070
items:
71-
- name: Plan an automatic user provisioning deployment
72-
href: plan-auto-user-provisioning.md
7371
- name: Automatic provisioning for SCIM-enabled apps
7472
href: use-scim-to-provision-users-and-groups.md
73+
- name: Plan an automatic user provisioning deployment
74+
href: plan-auto-user-provisioning.md
7575
- name: Application Proxy for on-premises apps
7676
items:
7777
- name: Application Proxy
@@ -223,23 +223,21 @@
223223
href: access-panel-extension-problem-installing.md
224224
- name: Error using self-service app access
225225
href: access-panel-troubleshoot-self-service-access.md
226-
- name: Automatic user provisioning
226+
- name: Application provisioning (SCIM)
227227
items:
228228
- name: Configure user provisioning
229229
items:
230-
- name: User provisioning for gallery apps
230+
- name: Manual vs. automatic provisioning
231231
href: application-provisioning-config-how-to.md
232-
- name: Enable automatic user provisioning for multi-tenant apps
233-
href: isv-automatic-provisioning-multi-tenant-apps.md
234232
- name: Configure automatic user provisioning
235233
href: configure-automatic-user-provisioning-portal.md
236-
- name: Customize application attributes
234+
- name: Customize attribute mappings
237235
href: Customize-application-attributes.md
238-
- name: Scoping filters
236+
- name: Scoping users or groups to be provisioned
239237
href: define-conditional-rules-for-provisioning-user-accounts.md
240238
- name: Skip deletion for out-of-scope users
241239
href: skip-out-of-scope-deletions.md
242-
- name: Check provisioning status
240+
- name: Monitor provisioning status and performance
243241
href: application-provisioning-when-will-provisioning-finish-specific-user.md
244242
- name: Report on automatic user provisioning
245243
href: check-status-user-account-provisioning.md
@@ -249,20 +247,20 @@
249247
items:
250248
- name: Troubleshoot user provisioning
251249
href: application-provisioning-config-problem.md
252-
- name: Quarantine status
253-
href: application-provisioning-quarantine-status.md
254-
- name: Provisioning logs
255-
href: /azure/active-directory/reports-monitoring/concept-provisioning-logs?context=azure/active-directory/manage-apps/context/manage-apps-context
256-
- name: Sync an attribute for mapping - gallery app
257-
href: user-provisioning-sync-attributes-for-mapping.md
258-
- name: Taking hours - gallery app
259-
href: application-provisioning-when-will-provisioning-finish.md
260-
- name: Problem saving administrator credentials while configuring user provisioning gallery app
250+
- name: Authorization issue (unable to save admin credentials)
261251
href: application-provisioning-config-problem-storage-limit.md
262-
- name: Users are not provisioned - gallery app
252+
- name: Users are not provisioned
263253
href: application-provisioning-config-problem-no-users-provisioned.md
264-
- name: Wrong users provisioned - gallery app
254+
- name: Wrong users provisioned
265255
href: application-provisioning-config-problem-wrong-users-provisioned.md
256+
- name: Provisioning job in quarantine
257+
href: application-provisioning-quarantine-status.md
258+
- name: Missing source attribute
259+
href: user-provisioning-sync-attributes-for-mapping.md
260+
- name: Provisioning job is slow
261+
href: application-provisioning-when-will-provisioning-finish.md
262+
- name: Provisioning logs
263+
href: /azure/active-directory/reports-monitoring/concept-provisioning-logs?context=azure/active-directory/manage-apps/context/manage-apps-context
266264
- name: Application Proxy for on-premises apps
267265
items:
268266
- name: Configure connectors
@@ -357,10 +355,13 @@
357355
href: application-proxy-understand-cors-issues.md
358356
- name: Reference
359357
items:
360-
- name: Automatic user provisioning
358+
- name: Application provisioning (SCIM)
361359
items:
362360
- name: Write expressions for attribute mappings
363361
href: functions-for-customizing-application-data.md
362+
- name: Choosing a provisioning method
363+
href: isv-automatic-provisioning-multi-tenant-apps.md
364+
364365
- name: Azure AD Connect Provisioning Agent
365366
items:
366367
- name: Provisioning Agent version history

articles/active-directory/reports-monitoring/concept-provisioning-logs.md

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.topic: conceptual
1414
ms.tgt_pltfrm: na
1515
ms.workload: identity
1616
ms.subservice: report-monitor
17-
ms.date: 07/29/2019
17+
ms.date: 11/04/2019
1818
ms.author: markvi
1919
ms.reviewer: arvinh
2020

@@ -208,6 +208,20 @@ The **summary** tab provides an overview of what happened and identifiers for th
208208
|---|---|
209209
|Conflict, EntryConflict|Correct the conflicting attribute values in either Azure AD or the application, or review your matching attribute configuration if the conflicting user account was supposed to be matched and taken over. Review the following [documentation](https://docs.microsoft.com/azure/active-directory/manage-apps/customize-application-attributes) for more information on configuring matching attributes.|
210210
|TooManyRequests|The target app rejected this attempt to update the user because it is overloaded and receiving too many requests. There is nothing to do. This attempt will automatically be retired. Microsoft has also been notified of this issue.|
211+
|InternalServerError |The target app returned an unexpected error. There may be a service issue with the target application that is preventing this from working. This attempt will automatically be retired in 40 minutes.|
212+
|InsufficientRights, MethodNotAllowed, NotPermitted, Unauthorized| Azure AD was able to authenticate with the target application, but was not authorized to perform the update. Please review any instructions provided by the target application as well as the respective application [tutorial](https://docs.microsoft.com/azure/active-directory/saas-apps/tutorial-list).|
213+
|UnprocessableEntity|The target application returned an unexpected response. The configuration of the target application may not be correct, or there may be a service issue with the target application that is preventing this from working.|
214+
|WebExceptionProtocolError |An HTTP protocol error occurred while connecting to the target application. There is nothing to do. This attempt will automatically be retired in 40 minutes.|
215+
|InvalidAnchor|A user that was previously created or matched by the provisioning service no longer exists. Check to ensure the user exists. To force a re-match of all users, use the MS Graph API to [restart job](https://docs.microsoft.com/graph/api/synchronization-synchronizationjob-restart?view=graph-rest-beta&tabs=http). Note that restarting provisioning will trigger an initial cycle, which can take time to complete. It also deletes the cache the provisioning service uses to operate, meaning that all users and groups in the tenant will have to be evaluated again and certain provisioning events could be dropped.|
216+
|NotImplemented | The target app returned an unexpected response. The configuration of the app may not be correct, or there may be a service issue with the target app that is preventing this from working. Please review any instructions provided by the target application as well as the respective application [tutorial](https://docs.microsoft.com/azure/active-directory/saas-apps/tutorial-list). |
217+
|MandatoryFieldsMissing, MissingValues |The user could not be created because required values are missing. Correct the missing attribute values in the source record, or review your matching attribute configuration to ensure the required fields are not omitted. [Learn more](https://docs.microsoft.com/azure/active-directory/manage-apps/customize-application-attributes) about configuring matching attributes.|
218+
|SchemaAttributeNotFound |Could not perform the operation because an attribute was specified that does not exist in the target application. See the [documentation](https://docs.microsoft.com/azure/active-directory/manage-apps/customize-application-attributes) on attribute customization and ensure your configuration is correct.|
219+
|InternalError |An internal service error occurred within the Azure AD provisioning service. There is nothing to do. This attempt will automatically be retried in 40 minutes.|
220+
|InvalidDomain |The operation could not be performed due to an attribute value containing an invalid domain name. Update the domain name on the user or add it to the permitted list in the target application. |
221+
|Timeout |The operation could not be completed because the target application took too long to respond. There is nothing to do. This attempt will automatically be retried in 40 minutes.|
222+
|LicenseLimitExceeded|The user could not be created in the target application because there are no available licenses for this user. Either procure additional licenses for the target application, or review your user assignments and attribute mapping configuration to ensure that the correct users are assigned with the correct attributes.|
223+
|DuplicateTargetEntries |The operation could not be completed because more than one user in the target application was found with the configured matching attributes. Either remove the duplicate user from the target application, or reconfigure your attribute mappings as described [here](https://docs.microsoft.com/azure/active-directory/manage-apps/customize-application-attributes).|
224+
|DuplicateSourceEntries | The operation could not be completed because more than one user was found with the configured matching attributes. Either remove the duplicate user, or reconfigure your attribute mappings as described [here](https://docs.microsoft.com/azure/active-directory/manage-apps/customize-application-attributes).|
211225

212226
## Next steps
213227

articles/ansible/ansible-azure-hdinsight-configure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Tutorial - Configure a cluster in Azure HDInsight using Ansible
3-
description: Learn how to use Ansible to create and resize an Azure HDInsight
3+
description: Learn how to use Ansible to configure, resize, and delete an Azure HDInsight cluster
44
keywords: ansible, azure, devops, bash, playbook, apache hadoop, hdinsight
55
ms.topic: tutorial
66
ms.service: ansible

articles/ansible/ansible-create-configure-aks.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.service: ansible
77
author: tomarchermsft
88
manager: jeconnoc
99
ms.author: tarcher
10-
ms.date: 04/30/2019
10+
ms.date: 11/04/2019
1111
---
1212

1313
# Tutorial: Configure Azure Kubernetes Service (AKS) clusters in Azure using Ansible
@@ -49,7 +49,8 @@ Save the following playbook as `azure_create_aks.yml`:
4949
ssh_key: "your_ssh_key"
5050
client_id: "your_client_id"
5151
client_secret: "your_client_secret"
52-
tasks:
52+
aks_version: aks_version
53+
tasks:
5354
- name: Create resource group
5455
azure_rm_resourcegroup:
5556
name: "{{ resource_group }}"
@@ -60,6 +61,7 @@ Save the following playbook as `azure_create_aks.yml`:
6061
location: "{{ location }}"
6162
resource_group: "{{ resource_group }}"
6263
dns_prefix: "{{ aks_name }}"
64+
kubernetes_version: "{{aks_version}}"
6365
linux_profile:
6466
admin_username: "{{ username }}"
6567
ssh_key: "{{ ssh_key }}"
@@ -79,6 +81,7 @@ Before running the playbook, see the following notes:
7981
- The first section within `tasks` defines a resource group named `myResourceGroup` within the `eastus` location.
8082
- The second section within `tasks` defines an AKS cluster named `myAKSCluster` within the `myResourceGroup` resource group.
8183
- For the `your_ssh_key` placeholder, enter your RSA public key in the single-line format - starting with "ssh-rsa" (without the quotes).
84+
- For the `aks_version` placeholder, use the [az aks get-versions](/cli/azure/aks?view=azure-cli-latest#az-aks-get-versions) command.
8285

8386
Run the playbook using the `ansible-playbook` command:
8487

articles/ansible/ansible-create-configure-route-table.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Tutorial - Configure Azure route tables using Ansible
3-
description: Learn how to create, change, and delete Azure route tables using Ansible
3+
description: Learn how to create, manage, and delete Azure route tables using Ansible. Also learn how to create and delete routes.
44
keywords: ansible, azure, devops, bash, playbook, networking, route, route table
55
ms.topic: tutorial
66
ms.service: ansible

articles/ansible/ansible-data-cache-for-redis-configure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Tutorial - Configure caches in Azure Cache for Redis using Ansible
3-
description: Learn how to use Ansible to create, scale and, reboot Azure Cache for Redis
3+
description: Learn how to use Ansible to create, scale, reboot, and add a firewall rule to Azure Cache for Redis
44
keywords: ansible, azure, devops, bash, playbook, cache, redis
55
ms.topic: tutorial
66
ms.service: ansible

0 commit comments

Comments
 (0)