Merge branch 'main' into load

Author: Scott Kang

.openpublishing.publish.config.json

@@ -74,6 +74,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "ms-identity-ciam-dotnet-tutorial",
+      "url": "https://github.com/Azure-Samples/ms-identity-ciam-dotnet-tutorial",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "_themes",
       "url": "https://github.com/Microsoft/templates.docs.msft",

.openpublishing.redirection.active-directory.json

@@ -11221,6 +11221,11 @@
       "redirect_url": "/azure/active-directory/privileged-identity-management/pim-create-azure-ad-roles-and-resource-roles-review",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory-b2c/user-manage-inactive.md",
+      "redirect_url": "/azure/active-directory-b2c/manage-users-portal",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory-b2c/troubleshoot-custom-policies.md",
       "redirect_url": "/azure/active-directory-b2c/troubleshoot",
@@ -12892,7 +12897,94 @@
         "source_path_from_root": "/articles/active-directory/authentication/active-directory-certificate-based-authentication-get-started.md",
         "redirect_url": "/azure/active-directory/authentication/certificate-based-authentication-federation-get-started",
         "redirect_document_id": false
+      },
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-access-create-new-tenant.md",
+        "redirect_url": "/azure/active-directory/fundamentals/create-new-tenant",
+        "redirect_document_id": false
+      },
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-architecture.md",
+        "redirect_url": "/azure/active-directory/fundamentals/architecture",
+        "redirect_document_id": false
+      },
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-data-storage-australia.md",
+        "redirect_url": "/azure/active-directory/fundamentals/data-storage-australia",
+        "redirect_document_id": false
+      },
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-data-storage-australia-newzealand.md",
+        "redirect_url": "/azure/active-directory/fundamentals/data-storage-australia-newzealand",
+        "redirect_document_id": false
+      },
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-data-storage-eu.md",
+        "redirect_url": "/azure/active-directory/fundamentals/data-storage-eu",
+        "redirect_document_id": false
+      },
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-faq.yml",
+        "redirect_url": "/azure/active-directory/fundamentals/faq",
+        "redirect_document_id": false
+      },
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-data-storage-japan.md",
+        "redirect_url": "/azure/active-directory/fundamentals/data-storage-japan",
+        "redirect_document_id": false
+      },
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-get-started-premium.md",
+        "redirect_url": "/azure/active-directory/fundamentals/get-started-premium",
+        "redirect_document_id": false
+      },
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-view-azure-portal.md",
+        "redirect_url": "/azure/active-directory/fundamentals/groups-view-azure-portal",
+        "redirect_document_id": false
+      },
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-how-subscriptions-associated-directory.md",
+        "redirect_url": "/azure/active-directory/fundamentals/how-subscriptions-associated-directory",
+        "redirect_document_id": false
+      },
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-how-to-find-tenant.md",
+        "redirect_url": "/azure/active-directory/fundamentals/how-to-find-tenant.md",
+        "redirect_document_id": false
+      },
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-users-assign-role-azure-portal.md",
+        "redirect_url": "/azure/active-directory/fundamentals/how-subscriptions-associated-directory",
+        "redirect_document_id": false
+      },
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-properties-area.md",
+        "redirect_url": "/azure/active-directory/fundamentals/properties-area",
+        "redirect_document_id": false
+      },
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-licensing-whatis-azure-portal.md",
+        "redirect_url": "/azure/active-directory/fundamentals/licensing-whatis-azure-portal",
+        "redirect_document_id": false
+      },
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-users-reset-password-azure-portal.md",
+        "redirect_url": "/azure/active-directory/fundamentals/users-reset-password-azure-portal",
+        "redirect_document_id": false
+      },
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-users-restore.md",
+        "redirect_url": "/azure/active-directory/fundamentals/users-restore",
+        "redirect_document_id": false
       }
 
+      
+      
+      
+      
+      
+      
+      
       ]
 } 

.openpublishing.redirection.azure-monitor.json

@@ -6170,6 +6170,11 @@
             "source_path_from_root": "/articles/azure-monitor/app/javascript-sdk-advanced.md",
             "redirect_url": "/azure/azure-monitor/app/javascript-sdk-configuration",
             "redirect_document_id": false
-        }
+        },
+       {
+            "source_path_from_root": "/articles/azure-monitor/agents/data-collection-firewall.md",
+            "redirect_url": "/azure/azure-monitor/agents/data-collection-rule-azure-monitor-agent",
+            "redirect_document_id": false
+        } 
     ]
 }

.openpublishing.redirection.defender-for-cloud.json

@@ -480,6 +480,11 @@
             "redirect_url": "/azure/defender-for-cloud/enable-enhanced-security",
             "redirect_document_id": true
         },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/enable-enhanced-security.md",
+            "redirect_url": "/azure/defender-for-cloud/enable-all-plans",
+            "redirect_document_id": true
+        },
         {
             "source_path_from_root": "/articles/security-center/enhanced-security-features-overview.md",
             "redirect_url": "/azure/defender-for-cloud/enhanced-security-features-overview",
@@ -815,6 +820,11 @@
             "redirect_url": "/azure/defender-for-cloud/faq-data-collection-agents",
             "redirect_document_id": true
         },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/quickstart-enable-database-protections.md",
+            "redirect_url": "/azure/defender-for-cloud/tutorial-enable-databases-plan",
+            "redirect_document_id": true
+        },
         {
             "source_path_from_root": "/articles/defender-for-cloud/defender-for-storage-exclude.md",
             "redirect_url": "/azure/defender-for-cloud/defender-for-storage-classic-enable#exclude-a-storage-account-from-a-protected-subscription-in-the-per-transaction-plan",

.openpublishing.redirection.json

@@ -13460,7 +13460,7 @@
         },
         {
             "source_path_from_root": "/articles/security/fundamentals/iot-best-practices.md",
-            "redirect_url": "/azure/iot/iot-security-best-practices",
+            "redirect_url": "/azure/iot/iot-overview-security",
             "redirect_document_id": false
         },
         {
@@ -14038,6 +14038,56 @@
             "redirect_url": "/azure/load-balancer/tutorial-load-balancer-standard-public-zone-redundant-portal",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/load-balancer/scripts/load-balancer-linux-cli-sample-zone-redundant-frontend.md",
+            "redirect_url": "/azure/load-balancer/tutorial-multi-availability-sets-portal",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/load-balancer/scripts/load-balancer-linux-cli-load-balance-multiple-websites-vm.md",
+            "redirect_url": "/azure/load-balancer/load-balancer-multiple-ip",
+            "redirect_document_id": false 
+        },
+        {
+            "source_path_from_root": "/articles/load-balancer/scripts/load-balancer-linux-cli-sample-nlb.md",
+            "redirect_url": "/azure/load-balancer/tutorial-multi-availability-sets-portal",
+            "redirect_document_id": false 
+        },
+        {
+            "source_path_from_root": "/articles/load-balancer/scripts/load-balancer-linux-cli-sample-zonal-frontend.md",
+            "redirect_url": "/azure/load-balancer/tutorial-load-balancer-standard-public-zonal-portal",
+            "redirect_document_id": false 
+        },
+        {
+            "source_path_from_root": "/articles/load-balancer/scripts/load-balancer-windows-powershell-sample-nlb.md",
+            "redirect_url": "/azure/load-balancer/tutorial-multi-availability-sets-portal",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/load-balancer/scripts/load-balancer-windows-powershell-load-balance-multiple-websites-vm.md",
+            "redirect_url": "/azure/load-balancer/load-balancer-multiple-ip",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/load-balancer/cli-samples.md",
+            "redirect_url": "/azure/load-balancer/quickstart-load-balancer-standard-public-cli",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/load-balancer/powershell-samples.md",
+            "redirect_url": "/azure/load-balancer/quickstart-load-balancer-standard-public-powershell",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/load-balancer/python-samples.md",
+            "redirect_url": "/samples/azure-samples/azure-samples-python-management/network-python-manage-loadbalancer/",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/load-balancer-windows-powershell-load-balance-multiple-websites-vm.md",
+            "redirect_url": "/azure/load-balancer/load-balancer-multiple-ip-powershell",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/dms/tutorial-sql-server-azure-sql-online.md",
             "redirect_url": "/azure/dms/tutorial-sql-server-to-azure-sql",
@@ -23917,6 +23967,26 @@
             "source_path_from_root": "/articles/active-directory/manage-apps/migrate-okta-sync-provisioning-to-azure-active-directory.md",
             "redirect_url": "/azure/active-directory/manage-apps/migrate-okta-sync-provisioning",
             "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/networking/connectivty-interoperability-preface.md",
+            "redirect_url": "/azure/networking/manage-apps/connectivity-interoperability-preface",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/networking/connectivty-interoperability-configuration.md",
+            "redirect_url": "/azure/networking/manage-apps/connectivity-interoperability-configuration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/networking/connectivty-interoperability-control-plane.md",
+            "redirect_url": "/azure/networking/manage-apps/connectivity-interoperability-control-plane",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/networking/connectivty-interoperability-data-plane.md",
+            "redirect_url": "/azure/networking/manage-apps/connectivity-interoperability-data-plane",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.reliability.json

@@ -0,0 +1,11 @@
+{
+  "redirections": [
+    {
+      "source_path_from_root": "/articles/reliability/reliability-energy-data-services.md",
+      "redirect_url": "/azure/energy-data-services/reliability-energy-data-services",
+      "redirect_document_id": true
+    }  
+  ]
+}
+
+

articles/active-directory-b2c/TOC.yml

@@ -403,10 +403,7 @@
       displayName: create users, add users, delete users, revoke sessions
     - name: Migrate users
       href: user-migration.md
-      displayName: bulk import
-    - name: Manage inactive users   
-      href: user-manage-inactive.md
-      displayName: Manage and delete inactive users          
+      displayName: bulk import        
     - name: Partner integration
       items:
       - name: N8identity

articles/active-directory-b2c/azure-monitor.md

@@ -11,7 +11,8 @@ ms.workload: identity
 ms.topic: how-to
 ms.author: kengaderdus
 ms.subservice: B2C
-ms.date: 01/31/2023
+ms.date: 06/12/2023
+ms.custom: "b2c-support"
 ---
 
 # Monitor Azure AD B2C with Azure Monitor
@@ -345,6 +346,19 @@ workspace("AD-B2C-TENANT1").AuditLogs
 
 Azure Monitor Logs are designed to scale and support collecting, indexing, and storing massive amounts of data per day from any source in your enterprise or deployed in Azure. By default, logs are retained for 30 days, but retention duration can be increased to up to two years. Learn how to [manage usage and costs with Azure Monitor Logs](../azure-monitor/logs/cost-logs.md). After you select the pricing tier, you can [Change the data retention period](../azure-monitor/logs/data-retention-archive.md).
 
+## Disable monitoring data collection
+
+To stop collecting logs to your Log Analytics workspace, delete the diagnostic settings you created. You'll continue to incur charges for retaining log data you've already collected into your workspace. If you no longer need the monitoring data you've collected, you can delete your Log Analytics workspace and the resource group you created for Azure Monitor. Deleting the Log Analytics workspace deletes all data in the workspace and prevents you from incurring additional data retention charges.
+
+## Delete Log Analytics workspace and resource group
+
+1. Sign in to the [Azure portal](https://portal.azure.com).
+1. Make sure you're using the directory that contains your *Azure AD* tenant:
+   1. Select the **Directories + subscriptions** icon in the portal toolbar.
+   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. Choose the resource group that contains the Log Analytics workspace. This example uses a resource group named _azure-ad-b2c-monitor_ and a Log Analytics workspace named `AzureAdB2C`.
+1. [Delete the Logs Analytics workspace](../azure-monitor/logs/delete-workspace.md#azure-portal).
+1. Select the **Delete** button to delete the resource group.
 ## Next steps
 
 - Find more samples in the Azure AD B2C [SIEM gallery](https://aka.ms/b2csiem).

articles/active-directory-b2c/billing.md

@@ -22,7 +22,7 @@ In this article, learn about MAU and Go Local billing, linking Azure AD B2C tena
 
 ## MAU overview
 
-A monthly active user (MAU) is a unique user that performs an authentication within a given month. A user that authenticates multiple times within a given month is counted as one MAU. Customers aren't charged for a MAU’s subsequent authentications during the month, nor for inactive users. Authentications may include:
+A monthly active user (MAU) is a unique user that performs an authentication within a given month. A user that authenticates at least once within a given month is counted as one MAU. Customers aren't charged for a MAU’s subsequent authentications during the month, nor for inactive users. Authentications may include:
 
 - Active, interactive sign in by the user. For example, [sign-up or sign in](add-sign-up-and-sign-in-policy.md), [self-service password reset](add-password-reset-policy.md), or any type of [user flow](user-flow-overview.md) or [custom policy](custom-policy-overview.md).
 - Passive, non-interactive sign in such as [single sign-on (SSO)](session-behavior.md), or any type of token acquisition. For example, authorization code flow, token refresh, or [resource owner password credentials flow](add-ropc-policy.md).

articles/active-directory-b2c/data-residency.md

@@ -9,7 +9,7 @@ manager: CelesteDG
 ms.service: active-directory
 ms.workload: identity
 ms.topic: reference
-ms.date: 06/06/2023
+ms.date: 06/24/2023
 ms.author: kengaderdus
 ms.subservice: B2C
 ms.custom: references_regions
@@ -78,7 +78,10 @@ At the moment, the following countries/regions have the local data residence opt
 
 #### What do I need to do? 
 
-If you've an existing Azure AD B2C tenant, you need to opt in to start using Go-Local add-on. If you're creating a new Azure AD B2C tenant, you can enable Go-Local add-on when you create it. Learn how to [create your Azure AD B2C](tutorial-create-tenant.md) tenant.
+|Tenant status  | What to do  |
+|-------------|---------|
+| I've an existing tenant | You need to opt in to start using Go-Local add-on by using the steps in [Activate Go-Local ad-on](tutorial-create-tenant.md#activate-azure-ad-b2c-go-local-add-on). |
+| I'm creating a new tenant | You enable Go-Local add-on when you create your new Azure AD B2C tenant. Learn how to [create your Azure AD B2C](tutorial-create-tenant.md) tenant.|
 
 ## EU Data Boundary