Merge pull request #197030 from MicrosoftDocs/main

Merge Main to Live, 4 AM

Author: PMEds28

.openpublishing.redirection.azure-monitor.json

@@ -60,6 +60,11 @@
             "redirect_url": "/azure/azure-monitor/logs/cost-logs",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/apm-tables.md",
+            "redirect_url": "/azure/azure-monitor/app/convert-classic-resource#workspace-based-resource-changes",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/logs/data-ingestion-from-file.md",
             "redirect_url": "/azure/azure-monitor/agents/data-sources-custom-logs",

articles/active-directory-b2c/whats-new-docs.md

@@ -1,7 +1,7 @@
 ---
 title: "What's new in Azure Active Directory business-to-customer (B2C)"
 description: "New and updated documentation for the Azure Active Directory business-to-customer (B2C)."
-ms.date: 04/04/2022
+ms.date: 05/04/2022
 ms.service: active-directory
 ms.subservice: B2C
 ms.topic: reference
@@ -15,6 +15,29 @@ manager: CelesteDG
 
 Welcome to what's new in Azure Active Directory B2C documentation. This article lists new docs that have been added and those that have had significant updates in the last three months. To learn what's new with the B2C service, see [What's new in Azure Active Directory](../active-directory/fundamentals/whats-new.md).
 
+## April 2022
+
+### New articles
+
+- [Configure Asignio with Azure Active Directory B2C for multifactor authentication](partner-asignio.md)
+- [Set up sign up and sign in with Mobile ID using Azure Active Directory B2C](identity-provider-mobile-id.md)
+- [Find help and open a support ticket for Azure Active Directory B2C](find-help-open-support-ticket.md)
+
+### Updated articles
+
+- [Configure authentication in a sample single-page application by using Azure AD B2C](configure-authentication-sample-spa-app.md)
+- [Configure xID with Azure Active Directory B2C for passwordless authentication](partner-xid.md)
+- [Azure Active Directory B2C service limits and restrictions](service-limits.md)
+- [Localization string IDs](localization-string-ids.md)
+- [Manage your Azure Active Directory B2C tenant](tenant-management.md)
+- [Page layout versions](page-layout.md)
+- [Secure your API used an API connector in Azure AD B2C](secure-rest-api.md)
+- [Azure Active Directory B2C: What's new](whats-new-docs.md)
+- [Application types that can be used in Active Directory B2C](application-types.md)
+- [Publish your Azure Active Directory B2C app to the Azure Active Directory app gallery](publish-app-to-azure-ad-app-gallery.md)
+- [Quickstart: Set up sign in for a desktop app using Azure Active Directory B2C](quickstart-native-app-desktop.md)
+- [Register a single-page application (SPA) in Azure Active Directory B2C](tutorial-register-spa.md)
+
 ## March 2022
 
 ### New articles

articles/active-directory/app-proxy/application-proxy-integrate-with-traffic-manager.md

@@ -0,0 +1,83 @@
+---
+title: Add your own Traffic Manager to Application Proxy
+description: Learn how to combine the Application Proxy service with a Traffic Manager solution.
+author: kenwith
+ms.author: kenwith
+ms.reviewer: ashishj
+ms.service: active-directory
+ms.subservice: app-proxy
+ms.topic: how-to
+ms.date: 05/02/2022
+ms.custom: template-how-to
+---
+
+# Add your own Traffic Manager to Application Proxy
+
+This article explains how to configure Azure Active Directory (Azure AD) Application Proxy to work with Traffic Manager. With the Application Proxy geo-routing feature, you can optimize which region of the Application Proxy service your connector groups use. You can now combine this functionality with a Traffic Manager solution of your choice. This combination enables a fully dynamic geo-aware solution based on your user location. It unlocks the rich rule set of your preferred Traffic Manager to prioritize how traffic is routed to your apps protected by Application Proxy. With this combination, users can use a single URL to access the instance of the app closest to them.
+
+:::image type="content" source="./media/application-proxy-integrate-with-traffic-manager/application-proxy-integrate-with-traffic-manager-diagram.png" alt-text="Diagram showing how Traffic Manager is integrated with Application Proxy.":::
+
+## Prerequisites
+
+- A Traffic Manager solution.
+- Apps that exist in different regions. Geo-routing is enabled per connector group co-located with the app.
+- A custom domain to use for each app.
+
+## Application Proxy configuration
+
+To use Traffic Manager, you must configure Application Proxy. The configuration steps that follow refer to the following URL definitions:
+
+- Regional URL: The Application Proxy endpoints for each app. For example, nam.contoso.com and india.contoso.com.
+- Alternate URL: The URL configured for the Traffic Manager. For example, contoso.com.
+
+Follow these steps to configure Application Proxy for Traffic Manager:
+
+1. Install connectors for each location your app instances will be in. For each connector group, use the geo-routing feature to assign the connectors to their respective regions.
+
+1. Set up your app instances with Application Proxy as follows:
+   1. For each app, upload a custom domain. Include the alternate URL to use for the apps as a SAN URL to the uploaded certificate.
+   1. Assign each app to its respective connector group.
+   1. If you prefer the alternate URL to be maintained throughout the user session, register each app and add the URL as a reply URL. This step is optional.
+
+1. In the Traffic Manager solution, add the Application Proxy regional URLs that were created for each app as an endpoint.
+
+1. Configure the Traffic Manager's load balancing rules with a standard SKU.
+
+1. To give your Traffic Manager a user-friendly URL, create a CNAME record that points the alternate URL to the Traffic Manager's endpoint.
+
+1. With the `alternateUrl` property, configure the alternate URL on the [onPremisesPublishing resource type](/graph/api/resources/onpremisespublishing) of the app.
+
+1. If you want the alternate URL to be maintained throughout the user session, call `onPremisesPublishing` and set the  `useAlternateUrlForTranslationAndRedirect` flag to `true`.
+
+## Sample Application Proxy configuration
+
+The following table shows a sample Application Proxy configuration. This sample uses the sample app domain www\.contoso.com as the alternate URL.
+
+|     | North America-based app | India-based app | Additional Information |
+|---- | ----------------------- | --------------- | ---------------------- |
+| **Internal URL** | contoso.com | contoso.com | If the apps are hosted in different regions, you can use the same internal URL for each app. |
+| **External URL** | nam.contoso.com | india.contoso.com | Configure a custom domain for each app.|
+| **Custom domain certificate** | DNS: nam.contoso.com SAN: www\.contoso.com | DNS: nam.contoso.com SAN: www\.contoso.com | In the certificate you upload for each app, set the SAN value to the alternate URL. The alternate URL is the URL all users use to reach the app.|
+| **Connector group** | NAM Geo Group | India Geo Group | Ensure you assign each app to the correct connector group by using the geo-routing functionality. |
+| **Redirects** | (Optional) To maintain redirects for the alternate URL, add the application registration for the app.  | (Optional) To maintain redirects for the alternate URL, add the application registration for the app.  | This step is required if the alternate URL (www\.contoso.com) is to be maintained for all redirections. |
+| **Reply URL** | www\.contoso.com.| www\.contoso.com. |
+
+## Traffic manager configuration
+
+Follow these steps to configure the Traffic Manager:
+
+1. Create a Traffic Manager profile with your preferred routing rules.
+
+1. In the Traffic Manager, add the NAM endpoint: nam.contoso.com.
+
+1. Add the India endpoint: india.contoso.com.
+
+1. Add the app proxy endpoints.
+
+1. Add a CNAME record to point www\.contoso.com to the Traffic Manager's URL. For example, contoso.trafficmanager.net.
+
+    The alternate URL now points to the Traffic Manager.
+
+## Next steps
+
+[Publish applications on separate networks and locations using connector groups](application-proxy-connector-groups.md)

articles/active-directory/app-proxy/media/application-proxy-integrate-with-traffic-manager/application-proxy-integrate-with-traffic-manager-diagram.png

@@ -81,6 +81,8 @@
     items:
     - name: Configure with proxy servers
       href: application-proxy-configure-connectors-with-proxy-servers.md
+    - name: Add Traffic Manager
+      href: application-proxy-integrate-with-traffic-manager.md
     - name: Give mobile and desktop apps access to on-premises APIs
       href: application-proxy-secure-api-access.md 
     - name: Configure custom home page

articles/active-directory/app-proxy/toc.yml

@@ -337,6 +337,7 @@ The ID element identifies which property on the source provides the value for th
 | User | preferreddatalocation | Preffered Data Location |
 | User | proxyaddresses | Proxy Addresses |
 | User | usertype | User Type |
+| User | telephonenumber| Business Phones / Office Phones |
 | application, resource, audience | displayname | Display Name |
 | application, resource, audience | objectid | ObjectID |
 | application, resource, audience | tags | Service Principal Tag |
@@ -428,6 +429,7 @@ Based on the method chosen, a set of inputs and outputs is expected. Define the
 | User | userprincipalname|User Principal Name|
 | User | onpremisessamaccountname|On Premises Sam Account Name|
 | User | employeeid|Employee ID|
+| User | telephonenumber| Business Phones / Office Phones |
 | User | extensionattribute1 | Extension Attribute 1 |
 | User | extensionattribute2 | Extension Attribute 2 |
 | User | extensionattribute3 | Extension Attribute 3 |