Skip to content

Commit 1ca5efe

Browse files
committed
Merge branch 'main' into comvis-updates
2 parents 5921805 + 9b7f67c commit 1ca5efe

File tree

2,110 files changed

+48283
-46361
lines changed

Some content is hidden

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

2,110 files changed

+48283
-46361
lines changed

.openpublishing.redirection.active-directory.json

Lines changed: 18525 additions & 3 deletions
Large diffs are not rendered by default.

.openpublishing.redirection.azure-monitor.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6383,6 +6383,21 @@
63836383
"source_path_from_root": "/articles/azure-monitor/app/tutorial-app-dashboards.md",
63846384
"redirect_url": "/azure/azure-monitor/app/overview-dashboard#create-custom-kpi-dashboards-using-application-insights",
63856385
"redirect_document_id": false
6386+
},
6387+
{
6388+
"source_path_from_root": "/articles/azure-monitor/app/tutorial-asp-net-core.md",
6389+
"redirect_url": "/previous-versions/azure/azure-monitor/app/tutorial-asp-net-core",
6390+
"redirect_document_id": false
6391+
},
6392+
{
6393+
"source_path_from_root": "/articles/azure-monitor/app/tutorial-asp-net-custom-metrics.md",
6394+
"redirect_url": "/previous-versions/azure/azure-monitor/app/tutorial-asp-net-custom-metrics",
6395+
"redirect_document_id": false
6396+
},
6397+
{
6398+
"source_path_from_root": "/articles/azure-monitor/app/data-retention-privacy.md",
6399+
"redirect_url": "/azure/azure-monitor/app/app-insights-overview#how-does-application-insights-handle-data-collection-retention-storage-and-privacy",
6400+
"redirect_document_id": false
63866401
}
63876402
]
63886403
}

.openpublishing.redirection.json

Lines changed: 176 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24490,6 +24490,181 @@
2449024490
"source_path_from_root": "/articles/load-balancer/upgrade-basic-standard-virtual-machine-scale-sets.md",
2449124491
"redirect_url": "/azure/load-balancer/upgrade-basic-standard-with-powershell",
2449224492
"redirect_document_id": false
24493-
}
24493+
},
24494+
{
24495+
"source_path_from_root": "/articles/spring-apps/how-to-enable-redundancy-and-disaster-recovery.md",
24496+
"redirect_url": "/azure/reliability/reliability-spring-apps",
24497+
"redirect_document_id": false
24498+
},
24499+
{
24500+
"source_path": "articles/update-center/assessment-options.md",
24501+
"redirect_url": "/azure/update-manager/assessment-options",
24502+
"redirect_document_id": false
24503+
},
24504+
{
24505+
"source_path": "articles/update-center/configure-wu-agent.md",
24506+
"redirect_url": "/azure/update-manager/configure-wu-agent",
24507+
"redirect_document_id": false
24508+
},
24509+
{
24510+
"source_path": "articles/update-center/deploy-updates.md",
24511+
"redirect_url": "/azure/update-manager/deploy-updates",
24512+
"redirect_document_id": false
24513+
},
24514+
{
24515+
"source_path": "articles/update-center/dynamic-scope-overview.md",
24516+
"redirect_url": "/azure/update-manager/dynamic-scope-overview",
24517+
"redirect_document_id": false
24518+
},
24519+
{
24520+
"source_path": "articles/update-center/guidance-migration-automation-update-management-azure-update-manager.md",
24521+
"redirect_url": "/azure/update-manager/guidance-migration-automation-update-management-azure-update-manager",
24522+
"redirect_document_id": false
24523+
},
24524+
{
24525+
"source_path": "articles/update-center/guidance-migration-azure.md",
24526+
"redirect_url": "/azure/update-manager/guidance-migration-azure",
24527+
"redirect_document_id": false
24528+
},
24529+
{
24530+
"source_path": "articles/update-center/guidance-patching-sql-server-azure-vm.md",
24531+
"redirect_url": "/azure/update-manager/guidance-patching-sql-server-azure-vm",
24532+
"redirect_document_id": false
24533+
},
24534+
{
24535+
"source_path": "articles/update-center/index.yml",
24536+
"redirect_url": "/azure/update-manager/index",
24537+
"redirect_document_id": false
24538+
},
24539+
{
24540+
"source_path": "articles/update-center/manage-arc-enabled-servers-programmatically.md",
24541+
"redirect_url": "/azure/update-manager/manage-arc-enabled-servers-programmatically",
24542+
"redirect_document_id": false
24543+
},
24544+
{
24545+
"source_path": "articles/update-center/manage-dynamic-scoping.md",
24546+
"redirect_url": "/azure/update-manager/manage-dynamic-scoping",
24547+
"redirect_document_id": false
24548+
},
24549+
{
24550+
"source_path": "articles/update-center/manage-multiple-machines.md",
24551+
"redirect_url": "/azure/update-manager/manage-multiple-machines",
24552+
"redirect_document_id": false
24553+
},
24554+
{
24555+
"source_path": "articles/update-center/manage-update-settings.md",
24556+
"redirect_url": "/azure/update-manager/manage-update-settings",
24557+
"redirect_document_id": false
24558+
},
24559+
{
24560+
"source_path": "articles/update-center/manage-updates-customized-images.md",
24561+
"redirect_url": "/azure/update-manager/manage-updates-customized-images",
24562+
"redirect_document_id": false
24563+
},
24564+
{
24565+
"source_path": "articles/update-center/manage-vms-programmatically.md",
24566+
"redirect_url": "/azure/update-manager/manage-vms-programmatically",
24567+
"redirect_document_id": false
24568+
},
24569+
{
24570+
"source_path": "articles/update-center/manage-workbooks.md",
24571+
"redirect_url": "/azure/update-manager/manage-workbooks",
24572+
"redirect_document_id": false
24573+
},
24574+
{
24575+
"source_path": "articles/update-center/overview.md",
24576+
"redirect_url": "/azure/update-manager/overview",
24577+
"redirect_document_id": false
24578+
},
24579+
{
24580+
"source_path": "articles/update-center/periodic-assessment-at-scale.md",
24581+
"redirect_url": "/azure/update-manager/periodic-assessment-at-scale",
24582+
"redirect_document_id": false
24583+
},
24584+
{
24585+
"source_path": "articles/update-center/prerequsite-for-schedule-patching.md",
24586+
"redirect_url": "/azure/update-manager/prerequsite-for-schedule-patching",
24587+
"redirect_document_id": false
24588+
},
24589+
{
24590+
"source_path": "articles/update-center/query-logs.md",
24591+
"redirect_url": "/azure/update-manager/query-logs",
24592+
"redirect_document_id": false
24593+
},
24594+
{
24595+
"source_path": "articles/update-center/quickstart-on-demand.md",
24596+
"redirect_url": "/azure/update-manager/quickstart-on-demand",
24597+
"redirect_document_id": false
24598+
},
24599+
{
24600+
"source_path": "articles/update-center/sample-query-logs.md",
24601+
"redirect_url": "azure/update-manager/sample-query-logs",
24602+
"redirect_document_id": false
24603+
},
24604+
{
24605+
"source_path": "articles/update-center/scheduled-patching.md",
24606+
"redirect_url": "/azure/update-manager/scheduled-patching",
24607+
"redirect_document_id": false
24608+
},
24609+
{
24610+
"source_path": "articles/update-center/security-awareness-ubuntu-support.md",
24611+
"redirect_url": "/azure/update-manager/security-awareness-ubuntu-support",
24612+
"redirect_document_id": false
24613+
},
24614+
{
24615+
"source_path": "articles/update-center/support-matrix.md",
24616+
"redirect_url": "/azure/update-manager/support-matrix",
24617+
"redirect_document_id": false
24618+
},
24619+
{
24620+
"source_path": "articles/update-center/troubleshoot.md",
24621+
"redirect_url": "/azure/update-manager/troubleshoot",
24622+
"redirect_document_id": false
24623+
},
24624+
{
24625+
"source_path": "articles/update-center/tutorial-assessment-deployment-using-policy.md",
24626+
"redirect_url": "/azure/update-manager/tutorial-assessment-deployment-using-policy",
24627+
"redirect_document_id": false
24628+
},
24629+
{
24630+
"source_path": "articles/update-center/tutorial-dynamic-grouping-for-scheduled-patching.md",
24631+
"redirect_url": "/azure/update-manager/tutorial-dynamic-grouping-for-scheduled-patching",
24632+
"redirect_document_id": false
24633+
},
24634+
{
24635+
"source_path": "articles/update-center/update-manager-faq.md",
24636+
"redirect_url": "/azure/update-manager/update-manager-faq",
24637+
"redirect_document_id": false
24638+
},
24639+
{
24640+
"source_path": "articles/update-center/updates-maintenance-schedules.md",
24641+
"redirect_url": "/azure/update-manager/updates-maintenance-schedules",
24642+
"redirect_document_id": false
24643+
},
24644+
{
24645+
"source_path": "articles/update-center/view-updates.md",
24646+
"redirect_url": "/azure/update-manager/view-updates",
24647+
"redirect_document_id": false
24648+
},
24649+
{
24650+
"source_path": "articles/update-center/whats-new.md",
24651+
"redirect_url": "/azure/update-manager/whats-new",
24652+
"redirect_document_id": false
24653+
},
24654+
{
24655+
"source_path": "articles/update-center/whats-upcoming.md",
24656+
"redirect_url": "/azure/update-manager/whats-upcoming",
24657+
"redirect_document_id": false
24658+
},
24659+
{
24660+
"source_path": "articles/update-center/workbooks.md",
24661+
"redirect_url": "/azure/update-manager/workbooks",
24662+
"redirect_document_id": false
24663+
},
24664+
{
24665+
"source_path_from_root": "/articles/orbital/delete-contact.md",
24666+
"redirect_url": "/azure/orbital/spacecraft-object",
24667+
"redirect_document_id": false
24668+
},
2449424669
]
2449524670
}

articles/active-directory-b2c/troubleshoot-with-application-insights.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ For more information about querying, see [Overview of log queries in Azure Monit
136136
We recommend you to install the [Azure AD B2C extension](https://marketplace.visualstudio.com/items?itemName=AzureADB2CTools.aadb2c) for [VS Code](https://code.visualstudio.com/). With the Azure AD B2C extension, the logs are organized for you by the policy name, correlation ID (the application insights presents the first digit of the correlation ID), and the log timestamp. This feature helps you to find the relevant log based on the local timestamp and see the user journey as executed by Azure AD B2C.
137137

138138
> [!NOTE]
139-
> The community has developed the vs code extension for Azure AD B2C to help identity developers. The extension is not supported by Microsoft, and is made available strictly as-is.
139+
> The community has developed the VS Code extension to help people implementing and maintaining Azure AD B2C solutions. The extension is not supported by Microsoft, and is made available strictly as-is.
140140

141141
### Set Application Insights API access
142142

articles/active-directory/app-provisioning/on-premises-scim-provisioning.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.reviewer: arvinh
1414

1515
# Microsoft Entra on-premises application provisioning to SCIM-enabled apps
1616

17-
The Microsoft Entra provisioning service supports a [SCIM 2.0](https://techcommunity.microsoft.com/t5/security-compliance-and-identity/provisioning-with-scim-getting-started/ba-p/880010) client that can be used to automatically provision users into cloud or on-premises applications. This article outlines how you can use the Microsoft Entra provisioning service to provision users into an on-premises application that's SCIM enabled. If you want to provision users into non-SCIM on-premises applications that use SQL as a data store, see the [Microsoft Entra ECMA Connector Host Generic SQL Connector tutorial](tutorial-ecma-sql-connector.md). If you want to provision users into cloud apps such as DropBox and Atlassian, review the app-specific [tutorials](../../active-directory/saas-apps/tutorial-list.md).
17+
The Microsoft Entra provisioning service supports a [SCIM 2.0](https://techcommunity.microsoft.com/t5/security-compliance-and-identity/provisioning-with-scim-getting-started/ba-p/880010) client that can be used to automatically provision users into cloud or on-premises applications. This article outlines how you can use the Microsoft Entra provisioning service to provision users into an on-premises application that's SCIM enabled. If you want to provision users into non-SCIM on-premises applications that use SQL as a data store, see the [Microsoft Entra ECMA Connector Host Generic SQL Connector tutorial](tutorial-ecma-sql-connector.md). If you want to provision users into cloud apps such as DropBox and Atlassian, review the app-specific [tutorials](../saas-apps/tutorial-list.md).
1818

1919
![Diagram that shows SCIM architecture.](./media/on-premises-scim-provisioning/scim-4.png)
2020

@@ -51,7 +51,7 @@ Once the agent is installed, no further configuration is necessary on-premises,
5151

5252
1. Sign in to the [Microsoft Entra admin center](https://entra.microsoft.com) as at least a [Application Administrator](../roles/permissions-reference.md#application-administrator).
5353
1. Browse to **Identity** > **Applications** > **Enterprise applications**.
54-
1. Add the **On-premises SCIM app** from the [gallery](../../active-directory/manage-apps/add-application-portal.md).
54+
1. Add the **On-premises SCIM app** from the [gallery](../manage-apps/add-application-portal.md).
5555
1. From the left hand menu navigate to the **Provisioning** option and select **Get started**.
5656
1. Select **Automatic** from the dropdown list and expand the **On-Premises Connectivity** option.
5757
1. Select the agent that you installed from the dropdown list and select **Assign Agent(s)**.
@@ -66,11 +66,11 @@ Once the agent is installed, no further configuration is necessary on-premises,
6666
> If the test connection fails, you will see the request made. Please note that while the URL in the test connection error message is truncated, the actual request sent to the application contains the entire URL provided above.
6767
6868
1. Configure any [attribute mappings](customize-application-attributes.md) or [scoping](define-conditional-rules-for-provisioning-user-accounts.md) rules required for your application.
69-
1. Add users to scope by [assigning users and groups](../../active-directory/manage-apps/add-application-portal-assign-users.md) to the application.
69+
1. Add users to scope by [assigning users and groups](../manage-apps/add-application-portal-assign-users.md) to the application.
7070
1. Test provisioning a few users [on demand](provision-on-demand.md).
7171
1. Add more users into scope by assigning them to your application.
7272
1. Go to the **Provisioning** pane, and select **Start provisioning**.
73-
1. Monitor using the [provisioning logs](../../active-directory/reports-monitoring/concept-provisioning-logs.md).
73+
1. Monitor using the [provisioning logs](../reports-monitoring/concept-provisioning-logs.md).
7474

7575
The following video provides an overview of on-premises provisioning.
7676

articles/active-directory/app-provisioning/sap-successfactors-integration-reference.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,8 +323,8 @@ This section describes how you can update the JSONPath settings to definitely re
323323

324324
| **String to find** | **String to use for replace** | **Purpose** |
325325
| ------------------ | ----------------------------- | ------------ |
326-
| `$.employmentNav.results[0].<br>jobInfoNav.results[0].emplStatus` | `$.employmentNav..jobInfoNav..results[?(@.emplStatusNav.externalCode == 'A' || @.emplStatusNav.externalCode == 'U' || @.emplStatusNav.externalCode == 'P' )].emplStatusNav.externalCode` | With this find-replace, we're adding the ability to expand emplStatusNav OData object. |
327-
| `$.employmentNav.results[0].<br>jobInfoNav.results[0]` | `$.employmentNav..jobInfoNav..results[?(@.emplStatusNav.externalCode == 'A' || @.emplStatusNav.externalCode == 'U' || @.emplStatusNav.externalCode == 'P')]` | With this find-replace, we instruct the connector to always retrieve attributes associated with the active SuccessFactors EmpJobInfo record. Attributes associated with terminated/inactive records in SuccessFactors are ignored. |
326+
| `$.employmentNav.results[0].jobInfoNav.results[0].emplStatus` | `$.employmentNav..jobInfoNav..results[?(@.emplStatusNav.externalCode == 'A' || @.emplStatusNav.externalCode == 'U' || @.emplStatusNav.externalCode == 'P' )].emplStatusNav.externalCode` | With this find-replace, we're adding the ability to expand emplStatusNav OData object. |
327+
| `$.employmentNav.results[0].jobInfoNav.results[0]` | `$.employmentNav..jobInfoNav..results[?(@.emplStatusNav.externalCode == 'A' || @.emplStatusNav.externalCode == 'U' || @.emplStatusNav.externalCode == 'P')]` | With this find-replace, we instruct the connector to always retrieve attributes associated with the active SuccessFactors EmpJobInfo record. Attributes associated with terminated/inactive records in SuccessFactors are ignored. |
328328
| `$.employmentNav.results[0]` | `$.employmentNav..results[?(@.jobInfoNav..results[?(@.emplStatusNav.externalCode == 'A' || @.emplStatusNav.externalCode == 'U' || @.emplStatusNav.externalCode == 'P')])]` | With this find-replace, we instruct the connector to always retrieve attributes associated with the active SuccessFactors Employment record. Attributes associated with terminated/inactive records in SuccessFactors are ignored. |
329329

330330
1. Save the schema.

0 commit comments

Comments
 (0)