Merge pull request #296110 from MicrosoftDocs/repo_sync_working_branch

Taojunshen · web-flow · commit 4259a7e20190 · 2025-03-12T05:58:24.000+08:00
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
diff --git a/articles/azure-cache-for-redis/cache-how-to-encryption.md b/articles/azure-cache-for-redis/cache-how-to-encryption.md
@@ -87,7 +87,7 @@ In the **Basic, Standard, and Premium** tiers, the OS disk is encrypted by defau
 
 1. Select your chosen user assigned managed identity, and then choose the key input method to use.
 
-1. If using the **Select Azure key vault and key** input method, choose the Key Vault instance that holds your customer managed key. This instance must be in the same region as your cache.
+1. If using the **Select Azure Key Vault and key** input method, choose the Key Vault instance that holds your customer managed key. This instance must be in the same region as your cache.
 
     > [!NOTE]
     > For instructions on how to set up an Azure Key Vault instance, see the [Azure Key Vault quickstart guide](/azure/key-vault/secrets/quick-create-portal). You can also select the _Create a key vault_ link beneath the Key Vault selection to create a new Key Vault instance. Remember that both purge protection and soft delete must be enabled in your Key Vault instance.
@@ -113,7 +113,7 @@ In the **Basic, Standard, and Premium** tiers, the OS disk is encrypted by defau
 
 1. Select your chosen user assigned managed identity, and then choose which key input method to use.
 
-1. If using the **Select Azure key vault and key** input method, choose the Key Vault instance that holds your customer managed key. This instance must be in the same region as your cache.
+1. If using the **Select Azure Key Vault and key** input method, choose the Key Vault instance that holds your customer managed key. This instance must be in the same region as your cache.
 
     > [!NOTE]
     > For instructions on how to set up an Azure Key Vault instance, see the [Azure Key Vault quickstart guide](/azure/key-vault/secrets/quick-create-portal). You can also select the _Create a key vault_ link beneath the Key Vault selection to create a new Key Vault instance.  
diff --git a/articles/azure-maps/how-to-secure-sas-app.md b/articles/azure-maps/how-to-secure-sas-app.md
@@ -41,7 +41,7 @@ The following example scenario uses two Azure Resource Manager (ARM) template de
 1. Create a user-assigned managed identity.
 1. Assign Azure role-based access control (RBAC) **Azure Maps Data Reader** role to the user-assigned managed identity.
 1. Create an Azure Maps account with a [Cross Origin Resource Sharing (CORS) configuration](azure-maps-authentication.md#cross-origin-resource-sharing-cors), and attach the user-assigned managed identity.
-1. Create and save a SAS token in the Azure key vault.
+1. Create and save a SAS token in the Azure Key Vault.
 1. Retrieve the SAS token secret from the key vault.
 1. Create an Azure Maps REST API request that uses the SAS token.
 
diff --git a/articles/container-apps/workload-profiles-overview.md b/articles/container-apps/workload-profiles-overview.md
@@ -30,23 +30,27 @@ Profiles are configured to fit the different needs of your applications.
 > [!NOTE]
 > When using GPU-enabled workload profiles, make sure your application is running the latest version of [CUDA](https://catalog.ngc.nvidia.com/orgs/nvidia/containers/cuda).
 
-The Consumption workload profile is the default profile added to every Workload profiles [environment](environment.md) type. You can add Dedicated workload profiles to your environment when you create it or after you create it. Workload profiles environments are deployed separately from Consumption only environments.
+The Consumption workload profile is the default profile added to every Workload profiles [environment](environment.md) type. You can add Consumption GPU workload profiles for each type of GPU. All Consuption workload profiles:
 
-For each Dedicated workload profile in your environment, you can:
+- Automatically scale as needed
+- Can deploy multiple apps
 
-- Select the type and size
-- Deploy multiple apps into the profile
-- Use autoscaling to add and remove instances based on the needs of the apps
+You can add Dedicated workload profiles to your environment. These enable you to:
+
+- Use reserved VMs for your apps
+- Select the type and size of the VM
+- Deploy multiple apps in each profile
+- Use autoscaling to add and remove VM instances based on the needs of the apps
 - Limit scaling of the profile to better control costs
 
 You can configure each of your apps to run on any of the workload profiles defined in your Container Apps environment. This configuration is ideal for deploying microservices where each app can run on the appropriate compute infrastructure.
 
 > [!NOTE]
-> You can only apply a GPU workload profile to an environment as the environment is created.
+> You can only add a Dedicated GPU workload profile when initially creating an environment. Consumption GPU and other types of workload profiles may be added later.
 
 ## Profile types
 
-There are different types and sizes of workload profiles available by region. By default, each Dedicated plan includes a consumption profile, but you can also add any of the following profiles:
+There are different types and sizes of workload profiles available by region. By default, each workload profile enabled environment includes a Consumption profile, but you can also add any of the following profiles:
 
 | Display name | Name | vCPU | Memory (GiB) | GPU | Category | Allocation | Quota name |
 |---|---|---|---|---|---|---|
@@ -61,9 +65,9 @@ There are different types and sizes of workload profiles available by region. By
 | Dedicated-E8 | E8 | 8 | 64 | - | Memory optimized | per node | Managed Environment Memory Optimized Cores |
 | Dedicated-E16 | E16 | 16 | 128 | - | Memory optimized | per node | Managed Environment Memory Optimized Cores |
 | Dedicated-E32 | E32 | 32 | 256 | - | Memory optimized | per node | Managed Environment Memory Optimized Cores |
-| Dedicated-NC24-A100 (preview) | NC24-A100 | 24 | 220 | 1 | GPU enabled | per node<sup>\*</sup> | Managed Environment Compute Optimized Cores |
-| Dedicated-NC48-A100 (preview) | NC48-A100 | 48 | 440 | 2 | GPU enabled | per node<sup>\*</sup> | Managed Environment Compute Optimized Cores |
-| Dedicated-NC96-A100 (preview) | NC96-A100 | 96 | 880 | 4 | GPU enabled | per node<sup>\*</sup> | Managed Environment Compute Optimized Cores |
+| Dedicated-NC24-A100 (preview) | NC24-A100 | 24 | 220 | 1 | GPU enabled | per node<sup>\*</sup> | Subscription NCA 100 Gpus |
+| Dedicated-NC48-A100 (preview) | NC48-A100 | 48 | 440 | 2 | GPU enabled | per node<sup>\*</sup> | Subscription NCA 100 Gpus |
+| Dedicated-NC96-A100 (preview) | NC96-A100 | 96 | 880 | 4 | GPU enabled | per node<sup>\*</sup> | Subscription NCA 100 Gpus |
 
 <sup>\*</sup> Capacity is allocated on a per-case basis. Submit a [support ticket](https://azure.microsoft.com/support/create-ticket/) to request the capacity amount required for your application.
 
diff --git a/articles/devtest-labs/devtest-lab-store-secrets-in-key-vault.md b/articles/devtest-labs/devtest-lab-store-secrets-in-key-vault.md
@@ -11,7 +11,7 @@ ms.date: 06/26/2020
 # Store secrets in a key vault in Azure DevTest Labs
 You might need to enter a complex secret when you use Azure DevTest Labs. Secrets include passwords for your Windows VMs, public SSH keys for your Linux VMs, or personal access token to clone your Git repo through an artifact. Secrets are often long and have random characters. Entering them can be tricky and inconvenient, especially if you use the same secret multiple times.
 
-To solve this problem and keep your secrets in a safe place, DevTest Labs supports storing secrets in an [Azure key vault](/azure/key-vault/general/overview). The first time a user saves a secret, DevTest Labs automatically creates a key vault in the same resource group as the lab, and stores the secret. DevTest Labs creates a separate key vault for each user. 
+To solve this problem and keep your secrets in a safe place, DevTest Labs supports storing secrets in an [Azure Key Vault](/azure/key-vault/general/overview). The first time a user saves a secret, DevTest Labs automatically creates a key vault in the same resource group as the lab, and stores the secret. DevTest Labs creates a separate key vault for each user. 
 
 Lab users need to create a lab virtual machine before they can create a secret in the key vault. This requirement is because DevTest Labs must associate lab users with valid user documents. DevTest Labs then allows users to create and store secrets in their key vaults.
 
diff --git a/articles/logic-apps/authenticate-with-managed-identity.md b/articles/logic-apps/authenticate-with-managed-identity.md
@@ -520,7 +520,7 @@ Before you can use your logic app's managed identity for authentication, you hav
 > suppose you have a managed identity for a logic app that needs access to update the application 
 > settings for that same logic app from a workflow. You must give that identity access to the associated logic app.
 
-For example, to access an Azure Blob storage account or an Azure key vault with your managed identity, you need to set up Azure role-based access control (Azure RBAC) and assign the appropriate role for that identity to the storage account or key vault, respectively.
+For example, to use a managed identity for authenticating access to a Blob storage account or key vault in Azure, you need to set up Azure role-based access control (Azure RBAC) and assign the appropriate role for that identity to the storage account or key vault, respectively.
 
 The steps in this section describe how to assign role-based access using the [Azure portal](#azure-portal-assign-role) and [Azure Resource Manager template (ARM template)](../role-based-access-control/role-assignments-template.md). For Azure PowerShell, Azure CLI, and Azure REST API, see the following documentation:
 
@@ -530,7 +530,7 @@ The steps in this section describe how to assign role-based access using the [Az
 | Azure CLI | [Add role assignment](/entra/identity/managed-identities-azure-resources/how-to-assign-app-role-managed-identity-cli) |
 | Azure REST API | [Add role assignment](../role-based-access-control/role-assignments-rest.md) |
 
-For an Azure key vault, you also have the option to create an access policy for your managed identity on your key vault and assign the appropriate permissions for that identity on that key vault. The later steps in this section describe how to complete this task by using the [Azure portal](#azure-portal-access-policy). For Resource Manager templates, PowerShell, and Azure CLI, see the following documentation:
+For Azure Key Vault, you also have the option to create an access policy for your managed identity on your key vault and assign the appropriate permissions for that identity on that key vault. The later steps in this section describe how to complete this task by using the [Azure portal](#azure-portal-access-policy). For Resource Manager templates, PowerShell, and Azure CLI, see the following documentation:
 
 | Tool | Documentation |
 |------|---------------|
@@ -542,7 +542,7 @@ For an Azure key vault, you also have the option to create an access policy for
 
 ### Assign role-based access to a managed identity using the Azure portal
 
-To use a managed identity for authentication, some Azure resources, such as Azure storage accounts, require that you assign that identity to a role that has the appropriate permissions on the target resource. Other Azure resources, such as Azure key vaults, support multiple options, so you can choose either role-based access or an [access policy that has the appropriate permissions on the target resource for that identity](#azure-portal-access-policy).
+To use a managed identity for authentication, some Azure resources, such as Azure storage accounts, require that you assign that identity to a role that has the appropriate permissions on the target resource. Other Azure resources, such as key vaults, support multiple options. You can choose either role-based access or an [access policy that has the appropriate permissions on the target resource for that identity](#azure-portal-access-policy).
 
 1. In the [Azure portal](https://portal.azure.com), open the resource where you want to use the identity.
 
@@ -578,7 +578,9 @@ For more general information about this task, see [Assign a managed identity acc
 
 To use a managed identity for authentication, other Azure resources also support or require that you create an access policy that has the appropriate permissions on the target resource for that identity. Other Azure resources, such as Azure storage accounts, instead require that you [assign that identity to a role that has the appropriate permissions on the target resource](#azure-portal-assign-role).
 
-1. In the [Azure portal](https://portal.azure.com), open the target resource where you want to use the identity. This example uses an Azure key vault as the target resource.
+1. In the [Azure portal](https://portal.azure.com), open the target resource where you want to use the identity.
+
+   This example uses a key vault as the target Azure resource.
 
 1. On the resource menu, select **Access policies** > **Create**, which opens the **Create an access policy** pane.
 
diff --git a/articles/managed-grafana/how-to-grafana-enterprise.md b/articles/managed-grafana/how-to-grafana-enterprise.md
@@ -17,21 +17,34 @@ The Grafana Enterprise plans offered through Azure Managed Grafana enable users
 >[!NOTE]
 > To activate the Grafana Enterprise option, your Azure Managed Grafana workspace must be using the Standard plan. For more information about plans, go to [pricing plans](overview.md#service-tiers).
 
-Grafana Enterprise plugins, as of October 2023:
+Grafana Enterprise plugins, as of March 2025:
 
+- Adobe Analytics
+- Amazon Aurora
 - AppDynamics
+- Atlassian Statuspage
+- Azure Cosmos DB
 - Azure DevOps
+- Catchpoint
+- Cloudflare
+- CockroachDB
 - Databricks
 - Datadog
+- Drone
+- DynamoDB
 - Dynatrace
 - GitLab
+- Grafana Enterprise Logs
+- Grafana Enterprise Metrics
+- Grafana Enterprise Traces
 - Honeycomb
 - Jira
-- k6 Cloud App
 - Looker
 - MongoDB
+- Netlify
 - New Relic
 - Oracle Database
+- PagerDuty
 - Salesforce
 - SAP HANA®
 - ServiceNow
@@ -40,7 +53,9 @@ Grafana Enterprise plugins, as of October 2023:
 - Splunk Infrastructure Monitoring
 - Sqlyze Datasource
 - Sumo Logic
+- Vercel
 - Wavefront
+- Zendesk
 
 > [!NOTE]
 > Grafana Enterprise plugins are directly supported by Grafana Labs. For more information and an updated list, go to [Grafana Enterprise plugins](https://grafana.com/docs/plugins/).
diff --git a/articles/sap/automation/configure-system.md b/articles/sap/automation/configure-system.md
@@ -319,7 +319,7 @@ This section defines the parameters used for defining the key vault information.
 > | ------------------------------------ | ------------------------------------------------------------------------------ | ------------ | ----------------------------------- |
 > | `user_keyvault_id`	                 | Azure resource identifier for existing system credentials key vault            | Optional	   |                                     |
 > | `spn_keyvault_id`                    | Azure resource identifier for existing deployment credentials (SPNs) key vault | Optional	   |                                     |
-> | `enable_purge_control_for_keyvaults` | Disables the purge protection for Azure key vaults                             | Optional     | Only use for test environments.     |
+> | `enable_purge_control_for_keyvaults` | Disables the purge protection for Azure Key Vaults                             | Optional     | Only use for test environments.     |
 
 ### Anchor virtual machine parameters
 
diff --git a/articles/sap/automation/tutorial.md b/articles/sap/automation/tutorial.md
@@ -873,7 +873,7 @@ For this example configuration, the resource group is `LAB-SECE-DEP05-INFRASTRUC
     vi sap-parameters.yaml
     ```
 
-1. Update the `bom_base_name` with the name BOM. Replace `<Deployer KeyVault Name>` with the name of the Azure key vault for the deployer resource group.
+1. Update the `bom_base_name` with the name BOM. Replace `<Deployer KeyVault Name>` with the name of the Azure Key Vault for the deployer resource group.
 
     Your file should look similar to the following example configuration:
 
@@ -918,7 +918,7 @@ For this example configuration, the resource group is `LAB-SECE-DEP05-INFRASTRUC
             "${@}"
     )
     
-    # Run the playbook to retrieve the ssh key from the Azure key vault
+    # Run the playbook to retrieve the ssh key from the Azure Key Vault
     ansible-playbook "${playbook_options[@]}" ~/Azure_SAP_Automated_Deployment/sap-automation/deploy/ansible/pb_get-sshkey.yaml
     
     # Run the playbook to perform the Operating System configuration
@@ -949,7 +949,7 @@ For this example configuration, the resource group is `LAB-SECE-DEP05-INFRASTRUC
             "${@}"
     )
     
-    # Run the playbook to retrieve the ssh key from the Azure key vault
+    # Run the playbook to retrieve the ssh key from the Azure Key Vault
     ansible-playbook "${playbook_options[@]}" ~/Azure_SAP_Automated_Deployment/sap-automation/deploy/ansible/pb_get-sshkey.yaml
     
     # Run the playbook to perform the Operating System configuration
@@ -1003,7 +1003,7 @@ playbook_options=(
         "${@}"
 )
 
-# Run the playbook to retrieve the ssh key from the Azure key vault
+# Run the playbook to retrieve the ssh key from the Azure Key Vault
 ansible-playbook "${playbook_options[@]}" ~/Azure_SAP_Automated_Deployment/sap-automation/deploy/ansible/pb_get-sshkey.yaml
 
 # Run the playbook to perform the Operating System configuration
@@ -1032,7 +1032,7 @@ playbook_options=(
         "${@}"
 )
 
-# Run the playbook to retrieve the ssh key from the Azure key vault
+# Run the playbook to retrieve the ssh key from the Azure Key Vault
 ansible-playbook "${playbook_options[@]}" ~/Azure_SAP_Automated_Deployment/sap-automation/deploy/ansible/pb_get-sshkey.yaml
 
 # Run the playbook to perform the SAP Specific Operating System configuration
@@ -1062,7 +1062,7 @@ playbook_options=(
         "${@}"
 )
 
-# Run the playbook to retrieve the ssh key from the Azure key vault
+# Run the playbook to retrieve the ssh key from the Azure Key Vault
 ansible-playbook "${playbook_options[@]}" ~/Azure_SAP_Automated_Deployment/sap-automation/deploy/ansible/pb_get-sshkey.yaml
 
 # Run the playbook to download the software from the SAP Library
@@ -1092,7 +1092,7 @@ playbook_options=(
         "${@}"
 )
 
-# Run the playbook to retrieve the ssh key from the Azure key vault
+# Run the playbook to retrieve the ssh key from the Azure Key Vault
 ansible-playbook "${playbook_options[@]}" ~/Azure_SAP_Automated_Deployment/sap-automation/deploy/ansible/pb_get-sshkey.yaml
 
 # Run the playbook to download the software from the SAP Library
@@ -1122,7 +1122,7 @@ playbook_options=(
         "${@}"
 )
 
-# Run the playbook to retrieve the ssh key from the Azure key vault
+# Run the playbook to retrieve the ssh key from the Azure Key Vault
 ansible-playbook "${playbook_options[@]}" ~/Azure_SAP_Automated_Deployment/sap-automation/deploy/ansible/pb_get-sshkey.yaml
 
 # Run the playbook to download the software from the SAP Library
@@ -1152,7 +1152,7 @@ playbook_options=(
         "${@}"
 )
 
-# Run the playbook to retrieve the ssh key from the Azure key vault
+# Run the playbook to retrieve the ssh key from the Azure Key Vault
 ansible-playbook "${playbook_options[@]}" ~/Azure_SAP_Automated_Deployment/sap-automation/deploy/ansible/pb_get-sshkey.yaml
 
 # Run the playbook to download the software from the SAP Library
@@ -1182,7 +1182,7 @@ playbook_options=(
         "${@}"
 )
 
-# Run the playbook to retrieve the ssh key from the Azure key vault
+# Run the playbook to retrieve the ssh key from the Azure Key Vault
 ansible-playbook "${playbook_options[@]}" ~/Azure_SAP_Automated_Deployment/sap-automation/deploy/ansible/pb_get-sshkey.yaml
 
 # Run the playbook to download the software from the SAP Library
@@ -1211,7 +1211,7 @@ playbook_options=(
         "${@}"
 )
 
-# Run the playbook to retrieve the ssh key from the Azure key vault
+# Run the playbook to retrieve the ssh key from the Azure Key Vault
 ansible-playbook "${playbook_options[@]}" ~/Azure_SAP_Automated_Deployment/sap-automation/deploy/ansible/pb_get-sshkey.yaml
 
 # Run the playbook to download the software from the SAP Library
@@ -1240,7 +1240,7 @@ playbook_options=(
         "${@}"
 )
 
-# Run the playbook to retrieve the ssh key from the Azure key vault
+# Run the playbook to retrieve the ssh key from the Azure Key Vault
 ansible-playbook "${playbook_options[@]}" ~/Azure_SAP_Automated_Deployment/sap-automation/deploy/ansible/pb_get-sshkey.yaml
 
 # Run the playbook to download the software from the SAP Library
@@ -1271,7 +1271,7 @@ playbook_options=(
         "${@}"
 )
 
-# Run the playbook to retrieve the ssh key from the Azure key vault
+# Run the playbook to retrieve the ssh key from the Azure Key Vault
 ansible-playbook "${playbook_options[@]}" ~/Azure_SAP_Automated_Deployment/sap-automation/deploy/ansible/pb_get-sshkey.yaml
 
 # Run the playbook to download the software from the SAP Library
diff --git a/articles/sentinel/sap/sap-deploy-troubleshoot.md b/articles/sentinel/sap/sap-deploy-troubleshoot.md
