Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into nw-cm

Author: halkazwini

.openpublishing.redirection.json

@@ -1,6 +1,16 @@
 {
     "redirections": [
     {
+      "source_path": "articles/traffic-manager/powershell-samples.md",
+      "redirect_url": "/previous-versions/azure/traffic-manager/powershell-samples",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/traffic-manager/scripts/traffic-manager-cli-websites-high-availability.md",
+      "redirect_url": "/previous-versions/azure/traffic-manager/scripts/traffic-manager-cli-websites-high-availability",
+      "redirect_document_id": false
+     },
+     {
       "source_path": "articles/network-watcher/network-watcher-security-group-view-powershell.md",
       "redirect_url": "/previous-versions/azure/network-watcher/network-watcher-security-group-view-powershell",
       "redirect_document_id": false
@@ -34,7 +44,7 @@
       "source_path": "articles/germany/index.yml",
       "redirect_url": "/previous-versions/azure/germany/index",
       "redirect_document_id": false
-    },
+     },
         {
             "source_path_from_root": "/articles/internet-analyzer/internet-analyzer-cli.md",
             "redirect_url": "/previous-versions/azure/internet-analyzer/internet-analyzer-cli",

articles/ai-services/metrics-advisor/encryption.md

@@ -69,11 +69,11 @@ Metrics Advisor supports CMK and double encryption by using BYOS (bring your own
     1. Set 'Allow access to Azure services' as 'Yes'. 
     2. Add your clientIP address to sign in to Azure Database for PostgreSQL.
 
-- Get the access-token for your account with resource type 'https://server-name.database.windows.net'. The access token is the password you need to sign in to the Azure Database for PostgreSQL by your account. An example using `az` client:
+- Get the access-token for your account with resource type 'https://ossrdbms-aad.database.windows.net'. The access token is the password you need to sign in to the Azure Database for PostgreSQL by your account. An example using `az` client:
 
    ```
    az login
-   az account get-access-token --resource https://server-name.database.windows.net
+   az account get-access-token --resource https://ossrdbms-aad.database.windows.net
    ```
 
 - After getting the token, use it to sign in to your Azure Database for PostgreSQL. Replace the 'servername' as the one that you can find in the 'overview' of your Azure Database for PostgreSQL.

articles/app-service/includes/tutorial-connect-msi-azure-database/code-mysql-mi.md

@@ -26,7 +26,7 @@ using MySqlConnector;
 //     });
 
 var tokenRequestContext = new TokenRequestContext(
-    new[] { "https://server-name.database.windows.net/.default" });
+    new[] { "https://ossrdbms-aad.database.windows.net/.default" });
 AccessToken accessToken = await credential.GetTokenAsync(tokenRequestContext);
 // Open a connection to the MySQL server using the access token.
 string connectionString =
@@ -93,7 +93,7 @@ For more information, see [Use Java and JDBC with Azure Database for MySQL - Fle
     # cred = ManagedIdentityCredential(client_id=managed_identity_client_id)
 
     # acquire token
-    accessToken = cred.get_token('https://server-name.database.windows.net/.default')
+    accessToken = cred.get_token('https://ossrdbms-aad.database.windows.net/.default')
 
     # open connect to Azure MySQL with the access token.
     host = os.getenv('AZURE_MYSQL_HOST')
@@ -136,7 +136,7 @@ For more information, see [Use Java and JDBC with Azure Database for MySQL - Fle
    // });
 
    // acquire token
-   var accessToken = await credential.getToken('https://server-name.database.windows.net/.default');
+   var accessToken = await credential.getToken('https://ossrdbms-aad.database.windows.net/.default');
 
    const connection = mysql.createConnection({
      host: process.env.AZURE_MYSQL_HOST,

articles/app-service/includes/tutorial-connect-msi-azure-database/code-postgres-mi.md

@@ -30,7 +30,7 @@ using Npgsql;
 AccessToken accessToken = await sqlServerTokenProvider.GetTokenAsync(
     new TokenRequestContext(scopes: new string[]
     {
-        "https://server-name.database.windows.net/.default"
+        "https://ossrdbms-aad.database.windows.net/.default"
     }));
 
 // Combine the token with the connection string from the environment variables provided by Service Connector.
@@ -102,7 +102,7 @@ For more information, see the following resources:
     # cred = ManagedIdentityCredential(client_id=managed_identity_client_id)   
 
     # Acquire the access token
-    accessToken = cred.get_token('https://server-name.database.windows.net/.default')
+    accessToken = cred.get_token('https://ossrdbms-aad.database.windows.net/.default')
 
     # Combine the token with the connection string from the environment variables added by Service Connector to establish the connection.
     conn_string = os.getenv('AZURE_POSTGRESQL_CONNECTIONSTRING')
@@ -135,7 +135,7 @@ For more information, see the following resources:
     // });
 
     // Acquire the access token.
-    var accessToken = await credential.getToken('https://server-name.database.windows.net/.default');
+    var accessToken = await credential.getToken('https://ossrdbms-aad.database.windows.net/.default');
 
     // Use the token and the connection information from the environment variables added by Service Connector to establish the connection.
     (async () => {

articles/app-service/tutorial-connect-msi-azure-database.md

@@ -197,7 +197,7 @@ If you encounter any problem when creating a connection, refer to [Troubleshooti
 Connectivity to the Azure Database for MySQL in your code follows the `DefaultAzureCredential` pattern for all language stacks. `DefaultAzureCredential` is flexible enough to adapt to both the development environment and the Azure environment. When running locally, it can retrieve the logged-in Azure user from the environment of your choice (Visual Studio, Visual Studio Code, Azure CLI, or Azure PowerShell). When running in Azure, it retrieves the managed identity. So it's possible to have connectivity to database both at development time and in production. The pattern is as follows:
 
 1. Instantiate a `DefaultAzureCredential` from the Azure Identity client library. If you're using a user-assigned identity, specify the client ID of the identity.
-2. Get an access token for Azure Database for MySQL: `https://server-name.database.windows.net/.default`.
+2. Get an access token for Azure Database for MySQL: `https://ossrdbms-aad.database.windows.net/.default`.
 3. Add the token to your connection string.
 4. Open the connection.
 
@@ -208,7 +208,7 @@ Connectivity to the Azure Database for MySQL in your code follows the `DefaultAz
 Connectivity to the Azure Database for PostgreSQL in your code follows the `DefaultAzureCredential` pattern for all language stacks. `DefaultAzureCredential` is flexible enough to adapt to both the development environment and the Azure environment. When running locally, it can retrieve the logged-in Azure user from the environment of your choice (Visual Studio, Visual Studio Code, Azure CLI, or Azure PowerShell). When running in Azure, it retrieves the managed identity. So it's possible to have connectivity to database both at development time and in production. The pattern is as follows:
 
 1. Instantiate a `DefaultAzureCredential` from the Azure Identity client library. If you're using a user-assigned identity, specify the client ID of the identity.
-2. Get an access token for Azure Database for PostgreSQL: `https://server-name.database.windows.net/.default`.
+2. Get an access token for Azure Database for PostgreSQL: `https://ossrdbms-aad.database.windows.net/.default`.
 3. Add the token to your connection string.
 4. Open the connection.
 

articles/azure-resource-manager/management/frequently-asked-questions.yml

@@ -3,7 +3,7 @@ metadata:
   title: Azure Resource Manager frequently asked questions
   description: Answers to common questions about using Azure Resource Manager to manage resources.
   ms.topic: faq
-  ms.date: 02/22/2024
+  ms.date: 05/31/2024
   content_well_notification: 
     - AI-contribution
   ai-usage: ai-assisted
@@ -35,12 +35,6 @@ sections:
           resource group location, we recommend that you select a location close to where your control operations originate. Typically, this location is the one closest to 
           your current location.
 
-      - question: Can I move a resource group to a different subscription?
-        answer: |
-          No, you can't move a resource group to a new subscription. But, you can move all of the resources in the resource group to a resource group in another 
-          subscription. Settings such as tags, role assignments, and policies aren't automatically transferred from the original resource group to the destination resource group. 
-          You need to reapply these settings to the new resource group. For more information, see [Move resources to new resource group or subscription](./move-support-resources.md).
-
   - name: Resources
     questions:
       - question: What happens if two operations update the same resource at the same time?

articles/azure-resource-manager/management/move-resource-group-and-subscription.md

@@ -1,8 +1,8 @@
 ---
 title: Move resources to a new subscription or resource group
-description: Use Azure Resource Manager to move resources to a new resource group or subscription.
+description: Describes how to move resources to a new resource group or subscription, and the steps to take to ensure a successful move operation.
 ms.topic: conceptual
-ms.date: 04/24/2023
+ms.date: 05/31/2024
 ms.custom: devx-track-azurecli, devx-track-azurepowershell, devx-track-arm-template, devx-track-python
 content_well_notification: 
   - AI-contribution
@@ -472,6 +472,10 @@ If the source or target resource group contains a virtual network, the states of
 
 When you receive this error, you have two options. Either move your resources to a resource group that doesn't have a virtual network, or [contact support](../../azure-portal/supportability/how-to-create-azure-support-request.md).
 
+**Question: Can I move a resource group to a different subscription?**
+
+No, you can't move a resource group to a new subscription. But, you can move all of the resources in the resource group to a resource group in another subscription. Settings such as tags, role assignments, and policies aren't automatically transferred from the original resource group to the destination resource group. You need to reapply these settings to the new resource group. For more information, see [Move resources to new resource group or subscription](./move-support-resources.md).
+
 ## Next steps
 
 For a list of which resources support move, see [Move operation support for resources](move-support-resources.md).

articles/azure-resource-manager/management/overview.md

@@ -2,7 +2,7 @@
 title: Azure Resource Manager overview
 description: Describes how to use Azure Resource Manager for deployment, management, and access control of resources on Azure.
 ms.topic: overview
-ms.date: 02/16/2024
+ms.date: 05/31/2024
 ms.custom: devx-track-arm-template
 ---
 
@@ -87,19 +87,7 @@ There are some important factors to consider when defining your resource group:
 
 * You can move a resource from one resource group to another group. For more information, see [Move resources to new resource group or subscription](move-resource-group-and-subscription.md).
 
-* The resources in a resource group can be located in different regions than the resource group.
-
-* When you create a resource group, you need to provide a location for that resource group. 
-
-  You may be wondering, "Why does a resource group need a location? And, if the resources can have different locations than the resource group, why does the resource group location matter at all?"
-
-  The resource group stores metadata about the resources. When you specify a location for the resource group, you're specifying where that metadata is stored. For compliance reasons, you may need to ensure that your data is stored in a particular region.
-
-  To ensure state consistency for the resource group, all [control plane operations](./control-plane-and-data-plane.md) are routed through the resource group's location. When selecting a resource group location, we recommend that you select a location close to where your control operations originate. Typically, this location is the one closest to your current location. This routing requirement only applies to control plane operations for the resource group. It doesn't affect requests that are sent to your applications.
-  
-  If a resource group's region is temporarily unavailable, you may not be able to update resources in the resource group because the metadata is unavailable. The resources in other regions still function as expected, but you may not be able to update them. This condition may also apply to global resources like Azure DNS, Azure DNS Private Zones, Azure Traffic Manager, and Azure Front Door. You can view which types have their metadata managed by Azure Resource Manager via the [list of types for the Azure Resource Graph resources table](../../governance/resource-graph/reference/supported-tables-resources.md#resources).
-   
-  For more information about building reliable applications, see [Designing reliable Azure applications](/azure/architecture/checklist/resiliency-per-service).
+* The resources in a resource group can be located in different regions than the resource group, but we recommend that you use the same location. See [What location should I use for my resource group?](#what-location-should-i-use-for-my-resource-group)
 
 * A resource group can be used to scope access control for administrative actions. To manage a resource group, you can assign [Azure Policies](../../governance/policy/overview.md), [Azure roles](../../role-based-access-control/role-assignments-portal.yml), or [resource locks](lock-resources.md).
 
@@ -115,6 +103,22 @@ There are some important factors to consider when defining your resource group:
 
 * To create a resource group, you can use the [portal](manage-resource-groups-portal.md#create-resource-groups), [PowerShell](manage-resource-groups-powershell.md#create-resource-groups), [Azure CLI](manage-resource-groups-cli.md#create-resource-groups), or an [ARM template](../templates/deploy-to-subscription.md#resource-groups).
 
+## What location should I use for my resource group?
+
+When you create a resource group, you need to provide a location for that resource group.
+
+You may be wondering, "Why does a resource group need a location? And, if the resources can have different locations than the resource group, why does the resource group location matter at all?"
+
+The resource group stores metadata about the resources. When you specify a location for the resource group, you're specifying where that metadata is stored. For compliance reasons, you may need to ensure that your data is stored in a particular region.
+
+To ensure state consistency for the resource group, all [control plane operations](./control-plane-and-data-plane.md) are routed through the resource group's location. When selecting a resource group location, we recommend that you select a location close to where your control operations originate. Typically, this location is the one closest to your current location. This routing requirement only applies to control plane operations for the resource group. It doesn't affect requests that are sent to your applications.
+  
+If a resource group's region is temporarily unavailable, you may not be able to update resources in the resource group because the metadata is unavailable. The resources in other regions still function as expected, but you may not be able to update them. This condition may also apply to global resources like Azure DNS, Azure DNS Private Zones, Azure Traffic Manager, and Azure Front Door. You can view which types have their metadata managed by Azure Resource Manager via the [list of types for the Azure Resource Graph resources table](../../governance/resource-graph/reference/supported-tables-resources.md#resources).
+
+To reduce the impact of regional outages, we recommend that you locate resources in the same region as the resource group. When the resource group's region is unavailable, Azure Resource Manager is unable to update your resource's metadata and blocks your write calls. By colocating your resource and resource group region, you reduce the risk of region unavailability because your resources and metadata exist in one region instead of multiple regions.
+
+For more information about building reliable applications, see [Designing reliable Azure applications](/azure/architecture/checklist/resiliency-per-service).
+
 ## Resiliency of Azure Resource Manager
 
 The Azure Resource Manager service is designed for resiliency and continuous availability. Resource Manager and control plane operations (requests sent to `management.azure.com`) in the REST API are:
@@ -129,14 +133,6 @@ The Azure Resource Manager service is designed for resiliency and continuous ava
 
 This resiliency applies to services that receive requests through Resource Manager. For example, Key Vault benefits from this resiliency.
 
-## Resource group location alignment
-
-To reduce the impact of regional outages, we recommend that you locate resources in the same region as the resource group.
-
-The resource group location is where Azure Resource Manager stores metadata for the resources in the resource group. Azure Resource Manager uses this location for routing and caching. For example, when you list your resources at the subscription or resource group scopes, Azure Resource Manager gets the information from the cache.
-
-When the resource group's region is unavailable, Azure Resource Manager is unable to update your resource's metadata and blocks your write calls. By colocating your resource and resource group region, you reduce the risk of region unavailability because your resources and metadata exist in one region instead of multiple regions.
-
 ## Resolve concurrent operations
 
 When two or more operations try to update the same resource at the same time, Azure Resource Manager detects the conflict and permits only one operation to complete successfully. Azure Resource Manager blocks the other operations and returns an error.