Merge pull request #231706 from hangwan97/consumption_cli

Added pivot zone to distinguish consumption plan

Author: v-dirichards

articles/spring-apps/how-to-application-insights.md

@@ -43,7 +43,7 @@ Application Insights can provide many observable perspectives, including:
 
 When the **Application Insights** feature is enabled, you can:
 
-* In the left navigation pane, select **Application Insights** to view the **Overview** page of Application Insights. The **Overview** page will show you an overview of all running applications.
+* In the left navigation pane, select **Application Insights** to view the **Overview** page of Application Insights. The **Overview** page shows you an overview of all running applications.
 * Select **Application Map** to see the status of calls between applications.
 
    :::image type="content" source="media/how-to-application-insights/insights-process-agent-map.png" alt-text="Screenshot of Azure portal Application Insights with Application map page showing." lightbox="media/how-to-application-insights/insights-process-agent-map.png":::
@@ -59,7 +59,7 @@ When the **Application Insights** feature is enabled, you can:
 
    :::image type="content" source="media/how-to-application-insights/insights-process-agent-failures.png" alt-text="Screenshot of Azure portal Application Insights with Failures page showing." lightbox="media/how-to-application-insights/insights-process-agent-failures.png":::
 
-* In the left navigation pane, select **Metrics** and select the namespace, you'll see both Spring Boot metrics and custom metrics, if any.
+* In the left navigation pane, select **Metrics** and select the namespace to see both Spring Boot metrics and custom metrics, if any.
 
    :::image type="content" source="media/how-to-application-insights/insights-process-agent-metrics.png" alt-text="Screenshot of Azure portal Application Insights with Metrics page showing." lightbox="media/how-to-application-insights/insights-process-agent-metrics.png":::
 
@@ -77,7 +77,7 @@ When the **Application Insights** feature is enabled, you can:
 
 ## Manage Application Insights using the Azure portal
 
-::: zone pivot="sc-standard-tier"
+::: zone pivot="sc-standard"
 
 Enable the Java In-Process Agent by using the following procedure.
 
@@ -91,11 +91,11 @@ Enable the Java In-Process Agent by using the following procedure.
 1. Select **Save** to save the change.
 
 > [!NOTE]
-> Do not use the same Application Insights instance in different Azure Spring Apps instances, or you'll see mixed data.
+> Don't use the same Application Insights instance in different Azure Spring Apps instances, or you'll see mixed data.
 
 ::: zone-end
 
-::: zone pivot="sc-enterprise-tier"
+::: zone pivot="sc-enterprise"
 
 You can use the Portal to check or update the current settings in Application Insights.
 
@@ -149,7 +149,7 @@ You can manage Application Insights using Azure CLI commands. In the following c
 
 To configure Application Insights when creating an Azure Spring Apps instance, use the following command. For the `app-insights` argument, you can specify an Application Insights name or resource ID.
 
-::: zone pivot="sc-standard-tier"
+::: zone pivot="sc-standard"
 
 ```azurecli
 az spring create \
@@ -161,7 +161,7 @@ az spring create \
 
 ::: zone-end
 
-::: zone pivot="sc-enterprise-tier"
+::: zone pivot="sc-enterprise"
 
 ```azurecli
 az spring create \
@@ -176,7 +176,7 @@ az spring create \
 
 You can also use an Application Insights connection string (preferred) or instrumentation key, as shown in the following example.
 
-::: zone pivot="sc-standard-tier"
+::: zone pivot="sc-standard"
 
 ```azurecli
 az spring create \
@@ -188,7 +188,7 @@ az spring create \
 
 ::: zone-end
 
-::: zone pivot="sc-enterprise-tier"
+::: zone pivot="sc-enterprise"
 
 ```azurecli
 az spring create \
@@ -205,7 +205,7 @@ az spring create \
 
 To disable Application Insights when creating an Azure Spring Apps instance, use the following command:
 
-::: zone pivot="sc-standard-tier"
+::: zone pivot="sc-standard"
 
 ```azurecli
 az spring create \
@@ -216,7 +216,7 @@ az spring create \
 
 ::: zone-end
 
-::: zone pivot="sc-enterprise-tier"
+::: zone pivot="sc-enterprise"
 
 ```azurecli
 az spring create \
@@ -228,7 +228,7 @@ az spring create \
 
 ::: zone-end
 
-::: zone pivot="sc-standard-tier"
+::: zone pivot="sc-standard"
 
 ### Check Application Insights settings
 
@@ -275,7 +275,7 @@ az spring app-insights update \
 
 ::: zone-end
 
-::: zone pivot="sc-enterprise-tier"
+::: zone pivot="sc-enterprise"
 
 ### Manage Application Insights buildpack bindings
 
@@ -342,7 +342,7 @@ az spring build-service builder buildpack-binding delete \
 
 ## Automation
 
-::: zone pivot="sc-standard-tier"
+::: zone pivot="sc-standard"
 
 The following sections describe how to automate your deployment using Bicep, Azure Resource Manager templates (ARM templates) or Terraform.
 
@@ -457,34 +457,34 @@ resource "azurerm_spring_cloud_service" "example" {
 
 ::: zone-end
 
-::: zone pivot="sc-enterprise-tier"
+::: zone pivot="sc-enterprise"
 
 Automation in Enterprise tier is pending support. Documentation will be added as soon as it's available.
 
 ::: zone-end
 
 ## Java agent update/upgrade
 
-::: zone pivot="sc-standard-tier"
+::: zone pivot="sc-standard"
 
-The Java agent will be updated/upgraded regularly with the JDK, which may affect the following scenarios.
+The Java agent is updated/upgraded regularly with the JDK, which may affect the following scenarios.
 
 > [!NOTE]
-> The JDK version will be updated/upgraded quarterly per year.
+> The JDK version is updated/upgraded quarterly per year.
 
-* Existing applications that use the Java agent before updating/upgrading won't be affected.
-* Applications created after updating/upgrading will use the new version of the Java agent.
-* Existing applications that didn't previously use the Java agent will require restart or redeployment to use the new version of the Java agent.
+* Existing applications that use the Java agent before updating/upgrading aren't affected.
+* Applications created after updating/upgrading use the new version of the Java agent.
+* Existing applications that didn't previously use the Java agent require restart or redeployment to use the new version of the Java agent.
 
 ::: zone-end
 
-::: zone pivot="sc-enterprise-tier"
+::: zone pivot="sc-enterprise"
 
-The Java agent will be updated/upgraded when the buildpack is updated.
+The Java agent is updated/upgraded when the buildpack is updated.
 
 ::: zone-end
 
-::: zone pivot="sc-standard-tier"
+::: zone pivot="sc-standard"
 
 ## Java agent configuration hot-loading
 
@@ -495,7 +495,7 @@ Azure Spring Apps has enabled a hot-loading mechanism to adjust the settings of
 
 * When the Java agent has been previously enabled, changes to the Application Insights instance and/or SamplingRate do NOT require applications to be restarted.
 * If you enable the Java agent, then you must restart applications.
-* When you disable the Java agent, applications will stop to send all monitoring data after a delay in minutes. You can restart applications to remove the agent from the Java runtime environment.
+* When you disable the Java agent, applications stop sending all monitoring data after a delay in minutes. You can restart applications to remove the agent from the Java runtime environment.
 
 ::: zone-end
 
@@ -506,7 +506,7 @@ Azure Spring Apps has enabled a hot-loading mechanism to adjust the settings of
 | `App`              | * __Application Map__/Role<br />* __Live Metrics__/Role<br />* __Failures__/Roles/Cloud Role<br />* __Performance__/Roles/Could Role |
 | `App Instance`     | * __Application Map__/Role Instance<br />* __Live Metrics__/Service Name<br />* __Failures__/Roles/Cloud Instance<br />* __Performance__/Roles/Could Instance |
 
-The name `App Instance` from Azure Spring Apps will be changed or generated in the following scenarios:
+The name `App Instance` from Azure Spring Apps is changed or generated in the following scenarios:
 
 * You create a new application.
 * You deploy a JAR file or source code to an existing application.
@@ -516,11 +516,11 @@ The name `App Instance` from Azure Spring Apps will be changed or generated in t
 
 When data is stored in Application Insights, it contains the history of Azure Spring Apps app instances created or deployed since the Java agent was enabled. For example, in the Application Insights portal, you can see application data created yesterday, but then deleted within a specific time range, like the last 24 hours. The following scenarios show how this works:
 
-* You created an application around 8:00 AM today from Azure Spring Apps with the Java agent enabled, and then you deployed a JAR file to this application around 8:10 AM today. After some testing, you change the code and deploy a new JAR file to this application at 8:30 AM today. Then, you take a break, and when you come back around 11:00 AM, you check some data from Application Insights. You'll see:
+* You created an application around 8:00 AM today from Azure Spring Apps with the Java agent enabled, and then you deployed a JAR file to this application around 8:10 AM today. After some testing, you change the code and deploy a new JAR file to this application at 8:30 AM today. Then, you take a break, and when you come back around 11:00 AM, you check some data from Application Insights. You see:
   * Three instances in Application Map with time ranges in the last 24 hours, and Failures, Performance, and Metrics.
   * One instance in Application Map with a time range in the last hour, and Failures, Performance, and Metrics.
   * One instance in Live Metrics.
-* You created an application around 8:00 AM today from Azure Spring Apps with the Java agent enabled, and then you deployed a JAR file to this application around 8:10 AM today. Around 8:30 AM today, you try a blue/green deployment with another JAR file. Currently, you have two deployments for this application. After a break around 11:00 AM today, you want to check some data from Application Insights. You'll see:
+* You created an application around 8:00 AM today from Azure Spring Apps with the Java agent enabled, and then you deployed a JAR file to this application around 8:10 AM today. Around 8:30 AM today, you try a blue/green deployment with another JAR file. Currently, you have two deployments for this application. After a break around 11:00 AM today, you want to check some data from Application Insights. You see:
   * Three instances in Application Map with time ranges in the last 24 hours, and Failures, Performance, and Metrics.
   * Two instances in Application Map with time ranges in last hour, and Failures, Performance, and Metrics.
   * Two instances in Live Metrics.

articles/spring-apps/how-to-enable-system-assigned-managed-identity.md

@@ -26,15 +26,15 @@ Managed identities for Azure resources provide an automatically managed identity
 
 If you're unfamiliar with managed identities for Azure resources, see the [Managed identities for Azure resources overview section](../active-directory/managed-identities-azure-resources/overview.md).
 
-::: zone pivot="sc-enterprise-tier"
+::: zone pivot="sc-enterprise"
 
 - An already provisioned Azure Spring Apps Enterprise tier instance. For more information, see [Quickstart: Build and deploy apps to Azure Spring Apps using the Enterprise tier](quickstart-deploy-apps-enterprise.md).
 - [Azure CLI version 2.30.0 or higher](/cli/azure/install-azure-cli).
 - [!INCLUDE [install-app-user-identity-extension](includes/install-app-user-identity-extension.md)]
 
 ::: zone-end
 
-::: zone pivot="sc-standard-tier"
+::: zone pivot="sc-standard"
 
 - An already provisioned Azure Spring Apps instance. For more information, see [Quickstart: Deploy your first application to Azure Spring Apps](./quickstart.md).
 - [Azure CLI version 2.30.0 or higher](/cli/azure/install-azure-cli).
@@ -44,7 +44,7 @@ If you're unfamiliar with managed identities for Azure resources, see the [Manag
 
 ## Add a system-assigned identity
 
-Creating an app with a system-assigned identity requires setting an additional property on the application.
+Creating an app with a system-assigned identity requires setting another property on the application.
 
 ### [Portal](#tab/azure-portal)
 
@@ -91,17 +91,17 @@ az spring app identity assign \
 
 An app can use its managed identity to get tokens to access other resources protected by Azure Active Directory, such as Azure Key Vault. These tokens represent the application accessing the resource, not any specific user of the application.
 
-You may need to [configure the target resource to allow access from your application](../active-directory/managed-identities-azure-resources/howto-assign-access-portal.md). For example, if you request a token to access Key Vault, make sure you have added an access policy that includes your application's identity. Otherwise, your calls to Key Vault will be rejected, even if they include the token. To learn more about which resources support Azure Active Directory tokens, see [Azure services that support Azure AD authentication](../active-directory/managed-identities-azure-resources/services-support-managed-identities.md#azure-services-that-support-azure-ad-authentication).
+You may need to [configure the target resource to allow access from your application](../active-directory/managed-identities-azure-resources/howto-assign-access-portal.md). For example, if you request a token to access Key Vault, make sure you have added an access policy that includes your application's identity. Otherwise, your calls to Key Vault are rejected, even if they include the token. To learn more about which resources support Azure Active Directory tokens, see [Azure services that support Azure AD authentication](../active-directory/managed-identities-azure-resources/services-support-managed-identities.md#azure-services-that-support-azure-ad-authentication).
 
 Azure Spring Apps shares the same endpoint for token acquisition with Azure Virtual Machine. We recommend using Java SDK or spring boot starters to acquire a token.  See [How to use VM token](../active-directory/managed-identities-azure-resources/how-to-use-vm-token.md) for various code and script examples and guidance on important topics such as handling token expiration and HTTP errors.
 
 ## Disable system-assigned identity from an app
 
-Removing a system-assigned identity will also delete it from Azure AD. Deleting the app resource automatically removes system-assigned identities from Azure AD.
+Removing a system-assigned identity also deletes it from Azure AD. Deleting the app resource automatically removes system-assigned identities from Azure AD.
 
 ### [Portal](#tab/azure-portal)
 
-To remove system-assigned managed identity from an app that no longer needs it:
+Use the following steps to remove system-assigned managed identity from an app that no longer needs it:
 
 1. Sign in to the portal using an account associated with the Azure subscription that contains the Azure Spring Apps instance.
 1. Navigate to the desired application and select **Identity**.

articles/spring-apps/how-to-manage-user-assigned-managed-identities.md

@@ -25,7 +25,7 @@ Managed identities for Azure resources provide an automatically managed identity
 
 - If you're unfamiliar with managed identities for Azure resources, see the [Managed identities for Azure resources overview section](../active-directory/managed-identities-azure-resources/overview.md).
 
-::: zone pivot="sc-enterprise-tier"
+::: zone pivot="sc-enterprise"
 
 - An already provisioned Azure Spring Apps Enterprise tier instance. For more information, see [Quickstart: Build and deploy apps to Azure Spring Apps using the Enterprise tier](quickstart-deploy-apps-enterprise.md).
 - [Azure CLI version 2.30.0 or higher](/cli/azure/install-azure-cli).
@@ -34,7 +34,7 @@ Managed identities for Azure resources provide an automatically managed identity
 
 ::: zone-end
 
-::: zone pivot="sc-standard-tier"
+::: zone pivot="sc-standard"
 
 - An already provisioned Azure Spring Apps instance. For more information, see [Quickstart: Deploy your first application to Azure Spring Apps](./quickstart.md).
 - [Azure CLI version 2.30.0 or higher](/cli/azure/install-azure-cli).
@@ -57,7 +57,7 @@ az spring app create \
 
 ## Assign user-assigned managed identities to an existing application
 
-Assigning user-assigned managed identity requires setting an additional property on the application.
+Assigning user-assigned managed identity requires setting another property on the application.
 
 ### [Azure portal](#tab/azure-portal)
 
@@ -87,13 +87,13 @@ az spring app identity assign \
 
 An application can use its managed identity to get tokens to access other resources protected by Azure AD, such as Azure Key Vault. These tokens represent the application accessing the resource, not any specific user of the application.
 
-You may need to configure the target resource to allow access from your application. For more information, see [Assign a managed identity access to a resource by using the Azure portal](../active-directory/managed-identities-azure-resources/howto-assign-access-portal.md). For example, if you request a token to access Key Vault, be sure you have added an access policy that includes your application's identity. Otherwise, your calls to Key Vault will be rejected, even if they include the token. To learn more about which resources support Azure Active Directory tokens, see [Azure services that support Azure AD authentication](../active-directory/managed-identities-azure-resources/services-azure-active-directory-support.md)
+You may need to configure the target resource to allow access from your application. For more information, see [Assign a managed identity access to a resource by using the Azure portal](../active-directory/managed-identities-azure-resources/howto-assign-access-portal.md). For example, if you request a token to access Key Vault, be sure you've added an access policy that includes your application's identity. Otherwise, your calls to Key Vault are rejected, even if they include the token. To learn more about which resources support Azure Active Directory tokens, see [Azure services that support Azure AD authentication](../active-directory/managed-identities-azure-resources/services-azure-active-directory-support.md)
 
-Azure Spring Apps shares the same endpoint for token acquisition with Azure Virtual Machines. We recommend using Java SDK or Spring Boot starters to acquire a token. For various code and script examples and guidance on important topics such as handling token expiration and HTTP errors, see [How to use managed identities for Azure resources on an Azure VM to acquire an access token](../active-directory/managed-identities-azure-resources/how-to-use-vm-token.md).
+Azure Spring Apps shares the same endpoint for token acquisition with Azure Virtual Machines. We recommend using Java SDK or Spring Boot starters to acquire a token. For various code and script examples, and guidance on important topics such as handling token expiration and HTTP errors, see [How to use managed identities for Azure resources on an Azure VM to acquire an access token](../active-directory/managed-identities-azure-resources/how-to-use-vm-token.md).
 
 ## Remove user-assigned managed identities from an existing app
 
-Removing user-assigned managed identities will remove the assignment between the identities and the application, and will not delete the identities themselves.
+Removing user-assigned managed identities removes the assignment between the identities and the application, and doesn't delete the identities themselves.
 
 ### [Azure portal](#tab/azure-portal)