Merge pull request #194957 from MicrosoftDocs/main

Merge Main to Live, 4 AM

Author: PMEds28

.openpublishing.redirection.defender-for-iot.json

@@ -1,5 +1,10 @@
 {
     "redirections": [
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-configure-windows-endpoint-monitoring.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/how-to-control-what-traffic-is-monitored#configure-windows-endpoint-monitoring",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/defender-for-iot/organizations/concept-key-concepts.md",
             "redirect_url": "/azure/defender-for-iot/organizations/overview",

articles/active-directory-b2c/TOC.yml

@@ -685,7 +685,7 @@
   - name: Stack Overflow
     href: https://stackoverflow.com/questions/tagged/azure-ad-b2c+identity-experience-framework
   - name: Support
-    href: ../active-directory/fundamentals/active-directory-troubleshooting-support-howto.md?bc=%2fazure%2factive-directory-b2c%2fbread%2ftoc.json&toc=%2fazure%2factive-directory-b2c%2fTOC.json
+    href: find-help-open-support-ticket.md
     displayName: technical
   - name: Videos
-    href: azure-ad-external-identities-videos.md
+    href: azure-ad-external-identities-videos.md

articles/active-directory-b2c/find-help-open-support-ticket.md

@@ -0,0 +1,94 @@
+---
+title: Find help and open a support ticket for Azure Active Directory B2C
+titleSuffix: Azure AD B2C
+description: Learn how to find technical, pre-sales, billing, and subscription help and open a support ticket for Azure Active Directory B2C 
+services: active-directory-b2c
+author: kengaderdus
+manager: CelesteDG
+
+ms.service: active-directory
+ms.workload: identity
+ms.topic: troubleshooting
+ms.date: 03/30/2022
+ms.author: kengaderdus
+ms.subservice: B2C
+---
+
+# Find help and open a support ticket for Azure Active Directory B2C
+
+Microsoft provides global technical, pre-sales, billing, and subscription support for Azure Active Directory B2C (Azure AD B2C). Support is available both online and by phone for Microsoft Azure paid and trial subscriptions. Phone support and online billing support are available in additional languages.
+
+## Find help without opening a support ticket
+
+Before creating a support ticket, check out the following resources for answers and information. 
+
+* For content such as how-to information or code samples for IT professionals and developers, see the [technical documentation for Azure AD B2C at docs.microsoft.com](../active-directory-b2c/index.yml).
+
+* The [Microsoft Technical Community](https://techcommunity.microsoft.com/) is the place for our IT pro partners and customers to collaborate, share, and learn. The [Microsoft Technical Community Info Center](https://techcommunity.microsoft.com/t5/Community-Info-Center/ct-p/Community-Info-Center) is used for announcements, blog posts, ask-me-anything (AMA) interactions with experts, and more. You can also [join the community to submit your ideas](https://techcommunity.microsoft.com/t5/Communities/ct-p/communities).
+
+## Open a support ticket
+
+If you're unable to find answers by using self-help resources, you can open an online support ticket. You should open each support ticket for only a single problem to enable us to connect you to the support engineers who are subject matter experts for your problem. Also, Azure AD B2C engineering teams prioritize their work based on incidents that are generated, so you're often contributing to service improvements.
+
+### How to open a support ticket for Azure AD B2C in the Azure portal
+
+> [!NOTE]
+> For billing or subscription issues, use the [Microsoft 365 admin center](https://admin.microsoft.com).  
+
+1. Sign in to [the Azure portal](https://portal.azure.com).
+
+1. Make sure you're using the Azure Active Directory (Azure AD) tenant that contains your Azure subscription:
+
+    1. In the Azure portal toolbar, select the **Directories + subscriptions** (:::image type="icon" source="./../active-directory/develop/media/common/portal-directory-subscription-filter.png" border="false":::) icon.
+    
+    1. On the **Portal settings | Directories + subscriptions** page, find your Azure AD directory in the **Directory name** list, and then select **Switch** button next to it.
+     
+1. In the Azure portal, search for and select **Azure Active Directory**.
+
+1. In the left menu, under **Troubleshooting + Support**, select **New support request**.
+   
+1. On the **1. Problem description** tab: 
+
+    1. For **Issue type**, select **Technical**.
+
+    1. For **Subscription**, select your Azure subscription.
+
+    1. For **Service type**, select **Azure Active Directory Business to Consumer (B2C)**. This action shows **Summary** and **Problem type** fields. 
+    
+    1. For **Summary**, write a descriptive summary for your request. The summary needs to be under 140 characters.
+  
+    1. For **Problem type**, and then select a category for that type. 
+
+1. Select **Next**. 
+
+1. Under the **2. Recommended solution** tab, you're offered self-help solution and documentation. If none of the solutions recommended resolves your problem, select **Next**.  
+
+1. Under **3. Additional details** tab, fill out the required details accurately. For example:
+
+    1. Your tenant ID or domain name. See how to find your [tenant ID](tenant-management.md#get-your-tenant-id) or [tenant name](tenant-management.md#get-your-tenant-name).  
+
+    1. The time and date when the problem occurred.
+ 
+    1. Additional details to describe the problem. 
+   
+    1. Under **Advanced diagnostic information**, select **Yes (Recommended)** to allow Microsoft support to access your Azure resources for faster problem resolution. 
+    
+    1. Select a **[Severity](https://azure.microsoft.com/support/plans/response)**, and your preferred contact method.
+    
+
+    :::image type="content" source="media/find-help-and-submit-support-ticket/find-help-and-submit-support-ticket-1.png" alt-text="Screenshot of how to find help and submit support ticket part 1.":::
+
+    :::image type="content" source="media/find-help-and-submit-support-ticket/find-help-and-submit-support-ticket-2.png" alt-text="Screenshot of how to find help and submit support ticket part 2.":::
+ 
+1. Select **Next**. Under **4. Review + create**, you'll see a summary of your support ticket. 
+
+1. If the details of your support ticket are accurate, select **Create** to submit the support ticket. Otherwise, select **Previous** to make corrections. 
+
+    :::image type="content" source="media/find-help-and-submit-support-ticket/review-and-create.png" alt-text="Screenshot of how to find help and submit support ticket Review and create tab.":::
+
+##  Next steps
+
+* [Microsoft Tech Community](https://techcommunity.microsoft.com/)
+
+* [Technical documentation for Azure AD B2C at docs.microsoft.com](../active-directory-b2c/index.yml)
+

articles/active-directory-b2c/media/find-help-and-submit-support-ticket/find-help-and-submit-support-ticket-1.png

@@ -0,0 +1,33 @@
+---
+title: Customer data storage for Japan customers - Azure AD
+description: Learn about where Azure Active Directory stores customer-related data for its Japan customers.
+services: active-directory
+author: justinha
+manager: karenhoran
+ms.author: justinha
+
+ms.service: active-directory
+ms.subservice: fundamentals
+ms.workload: identity
+ms.topic: conceptual
+ms.date: 04/12/2022
+ms.custom: "it-pro, seodec18, references_regions"
+ms.collection: M365-identity-device-management
+---
+
+# Customer data storage for Japan customers in Azure Active Directory 
+
+Azure Active Directory (Azure AD) stores its Customer Data in a geographical location based on the country you provided when you signed up for a Microsoft Online service. Microsoft Online services include Microsoft 365 and Azure. 
+
+For information about where Azure AD and other Microsoft services' data is located, see the [Where your data is located](https://www.microsoft.com/trust-center/privacy/data-location) section of the Microsoft Trust Center.
+
+From April 15, 2022, Microsoft began storing Azure AD’s Customer Data for new tenants with a Japan billing address within the Japanese datacenters. From April 15, 2022 to June 30, 2022 a backup copy of the Azure AD’s Customer Data for these new tenants will be stored in Asia to ensure a smooth transition to the Japanese datacenters. This copy will be destroyed on June 30, 2022.
+
+Additionally, certain Azure AD features do not yet support storage of Customer Data in Japan. Please go to the [Azure AD data map](https://msit.powerbi.com/view?r=eyJrIjoiYzEyZTc5OTgtNTdlZS00ZTVkLWExN2ItOTM0OWU4NjljOGVjIiwidCI6IjcyZjk4OGJmLTg2ZjEtNDFhZi05MWFiLTJkN2NkMDExZGI0NyIsImMiOjV9), for specific feature information. For example, Microsoft Azure AD Multi-Factor Authentication stores Customer Data in the US and processes it globally. See [Data residency and customer data for Azure AD Multi-Factor Authentication](../authentication/concept-mfa-data-residency.md).
+
+> [!NOTE]
+> Microsoft products, services, and third-party applications that integrate with Azure AD have access to Customer Data. Evaluate each product, service, and application you use to determine how Customer Data is processed by that specific product, service, and application, and whether they meet your company's data storage requirements. For more information about Microsoft services' data residency, see the [Where your data is located](https://www.microsoft.com/trust-center/privacy/data-location) section of the Microsoft Trust Center.
+
+## Azure role-based access control (Azure RBAC)
+
+Role definitions, role assignments, and deny assignments are stored globally to ensure that you have access to your resources regardless of the region you created the resource. For more information, see [What is Azure role-based access control (Azure RBAC)?](../../role-based-access-control/overview.md#where-is-azure-rbac-data-stored).

articles/active-directory-b2c/media/find-help-and-submit-support-ticket/find-help-and-submit-support-ticket-2.png

@@ -298,4 +298,6 @@
     - name: Identity data storage for Europe
       href: active-directory-data-storage-eu.md
     - name: Identity data storage for Australia and New Zealand
-      href: active-directory-data-storage-australia-newzealand.md
+      href: active-directory-data-storage-australia-newzealand.md
+    - name: Identity data storage for Japan
+      href: active-directory-data-storage-japan.md      

articles/active-directory-b2c/media/find-help-and-submit-support-ticket/review-and-create.png

@@ -169,7 +169,7 @@
           href: start-stop-cluster.md
         - name: Use planned maintenance (preview)
           href: planned-maintenance.md
-        - name: Cloud Controller Manager (preview)
+        - name: Cloud Controller Manager
           href: out-of-tree.md
         - name: Upgrade an AKS cluster
           href: upgrade-cluster.md

articles/active-directory/fundamentals/active-directory-data-storage-japan.md

@@ -1,37 +1,38 @@
 ---
-title: Enable Cloud Controller Manager (Preview)
+title: Enable Cloud Controller Manager 
 description: Learn how to enable the Out of Tree cloud provider
 services: container-service
 ms.topic: article
-ms.date: 8/25/2021
+ms.date: 04/08/2022
 ms.author: juda
 
 ---
 
-# Enable Cloud Controller Manager (Preview)
+# Enable Cloud Controller Manager 
 
 As a Cloud Provider, Microsoft Azure works closely with the Kubernetes community to support our infrastructure on behalf of users.
 
-Currently, Cloud provider integration within Kubernetes is "in-tree", where any changes to Cloud specific features must follow the standard Kubernetes release cycle.  When we find, fix issues, or need to roll out enhancements, we must do this within the Kubernetes community's release cycle.
+Previously, Cloud provider integration with Kubernetes was "in-tree", where any changes to Cloud specific features would follow the standard Kubernetes release cycle. When issues were fixed or enhancements were rolled out, they would need to be within the Kubernetes community's release cycle.
 
-The Kubernetes community is now adopting an "out-of-tree" model where the Cloud providers will control their releases independently of the core Kubernetes release schedule through the [cloud-provider-azure][cloud-provider-azure] component.  We have already rolled out the Cloud Storage Interface (CSI) drivers to be the default in Kubernetes version 1.21 and above.
+The Kubernetes community is now adopting an "out-of-tree" model where the Cloud providers will control their releases independently of the core Kubernetes release schedule through the [cloud-provider-azure][cloud-provider-azure] component. As part of this cloud-provider-azure component, we are also introducing a cloud-node-manager component, which is a component of the Kubernetes node lifecycle controller. This component is deployed by a DaemonSet in the *kube-system* namespace. To view this component, use
 
-> [!Note]
-> When enabling Cloud Controller Manager on your AKS cluster, this will also enable the out of tree CSI drivers.
-
-The Cloud Controller Manager will be the default controller from Kubernetes 1.22, supported by AKS.
+```azurecli-interactive
+kubectl get po -n kube-system | grep cloud-node-manager
+```
 
+We recently rolled out the Cloud Storage Interface (CSI) drivers to be the default in Kubernetes version 1.21 and above.
 
-[!INCLUDE [preview features callout](./includes/preview/preview-callout.md)]
+> [!Note]
+> When enabling Cloud Controller Manager on your AKS cluster, this will also enable the out of tree CSI drivers.
 
-## Before you begin
+The Cloud Controller Manager is the default controller from Kubernetes 1.22, supported by AKS. If running < v1.22, follow instructions below.
 
+## Prerequisites 
 You must have the following resource installed:
 
 * The Azure CLI
-* The `aks-preview` extension version 0.5.5 or later
 * Kubernetes version 1.20.x or above
-
+* The `aks-preview` extension version 0.5.5 or later
 
 ### Register the `EnableCloudControllerManager` feature flag
 
@@ -62,7 +63,7 @@ az extension add --name aks-preview
 az extension update --name aks-preview
 ```
 
-## Create an AKS cluster with Cloud Controller Manager
+## Create a new AKS cluster with Cloud Controller Manager with version <1.22 
 
 To create a cluster using the Cloud Controller Manager, pass `EnableCloudControllerManager=True` as a customer header to the Azure API using the Azure CLI.
 
@@ -71,7 +72,7 @@ az group create --name myResourceGroup --location eastus
 az aks create -n aks -g myResourceGroup --aks-custom-headers EnableCloudControllerManager=True
 ```
 
-## Upgrade an AKS cluster to Cloud Controller Manager
+## Upgrade an AKS cluster to Cloud Controller Manager on an existing cluster with version <1.22 
 
 To upgrade a cluster to use the Cloud Controller Manager, pass `EnableCloudControllerManager=True` as a customer header to the Azure API using the Azure CLI.