Merge pull request #231486 from KarlErickson/karler-cleanup

Miscellaneous cleanup

Author: JamesJBarnett

articles/spring-apps/how-to-custom-persistent-storage-with-standard-consumption-plan.md renamed to articles/spring-apps/how-to-custom-persistent-storage-with-standard-consumption.md

@@ -5,7 +5,7 @@ author: karlerickson
 ms.author: yitaopan
 ms.service: spring-apps
 ms.topic: how-to
-ms.date: 03/22/2023
+ms.date: 03/21/2023
 ms.custom: devx-track-java
 ---
 
@@ -91,7 +91,7 @@ Use the following steps to create a storage account and establish a file share t
 
    The storage account key is required to create the storage link in your Azure Container Apps environment.
 
-## Link the storage to the managed environment
+## Link the storage to the Azure Container Apps environment
 
 Create the storage link in the Azure Container Apps environment by using the following commands. The `az containerapp env storage set` command creates a link between the environment and the file share created with the `az storage share-rm` command.
 
@@ -138,4 +138,4 @@ echo "Press [ENTER] to continue ..."
 
 ## Next steps
 
-- [Azure Spring Apps](./index.yml)
+- [Customer responsibilities for Azure Spring Apps Standard consumption plan in a virtual network](./standard-consumption-customer-responsibilities.md)

articles/spring-apps/media/quickstart-provision-standard-consumption-plan-service-instance/azure-spring-apps-create.png renamed to articles/spring-apps/media/quickstart-provision-standard-consumption-service-instance/azure-spring-apps-create.png

@@ -4,7 +4,7 @@ description: Learn the features and benefits of Azure Spring Apps to deploy and
 author: karlerickson
 ms.service: spring-apps
 ms.topic: overview
-ms.date: 03/09/2021
+ms.date: 03/21/2023
 ms.author: karler
 ms.custom: devx-track-java, contperf-fy21q2, event-tier1-build-2022
 #Customer intent: As an Azure Cloud user, I want to deploy, run, and monitor Spring applications.
@@ -140,6 +140,20 @@ Azure Spring Apps, including Enterprise tier, runs on Azure in a fully managed e
 
 After you create your Enterprise tier service instance and deploy your applications, you can monitor with Application Insights or any other application performance management tools of your choice.
 
+### Get started with the Standard consumption plan
+
+The following quickstarts and articles will help you get started using the Standard consumption plan:
+
+* [Provision a service instance](quickstart-provision-standard-consumption-service-instance.md)
+* [Provision in an Azure Container Apps environment with VNet](quickstart-provision-standard-consumption-app-environment-with-virtual-network.md)
+* [Access apps in a VNet](quickstart-access-standard-consumption-within-virtual-network.md)
+* [Deploy an event-driven app](quickstart-deploy-event-driven-app-standard-consumption.md)
+* [Set up autoscale](quickstart-apps-autoscale-standard-consumption.md)
+* [Map a custom domain to Azure Spring Apps](quickstart-standard-consumption-custom-domain.md)
+* [Analyze logs and metrics](quickstart-analyze-logs-and-metrics-standard-consumption.md)
+* [Enable your own persistent storage](how-to-custom-persistent-storage-with-standard-consumption.md)
+* [Customer responsibilities for Standard consumption plan in a virtual network](standard-consumption-customer-responsibilities.md)
+
 ### Get started with Enterprise tier
 
 The following quickstarts will help you get started using the Enterprise tier:

articles/spring-apps/media/quickstart-provision-standard-consumption-plan-service-instance/azure-spring-apps-start.png renamed to articles/spring-apps/media/quickstart-provision-standard-consumption-service-instance/azure-spring-apps-start.png

@@ -1,5 +1,5 @@
 ---
-title: Access applications using Azure Spring Apps Standard consumption plan in a virtual network
+title: Quickstart - Access applications using Azure Spring Apps Standard consumption plan in a virtual network
 description: Learn how to access applications in a virtual network that are using the Azure Spring Apps Standard consumption plan.
 author: karlerickson
 ms.author: haojianzhong
@@ -9,15 +9,20 @@ ms.date: 03/21/2023
 ms.custom: devx-track-java
 ---
 
-# Access applications using Azure Spring Apps Standard consumption plan in a virtual network
+# Quickstart: Access applications using Azure Spring Apps Standard consumption plan in a virtual network
 
-This article describes how to access your application in a virtual network using Azure Spring Apps Standard Consumption plan.
+> [!NOTE]
+> Azure Spring Apps is the new name for the Azure Spring Cloud service. Although the service has a new name, you'll see the old name in some places for a while as we work to update assets such as screenshots, videos, and diagrams.
 
-When you create an Azure Container Apps environment in an existing virtual network, you can access all the apps inside the environment only within that virtual network. In addition, when you create an instance of Azure Spring Apps inside the Azure Container Apps environment, you can access the applications in the Azure Spring Apps instance only from the virtual network. For more information, see [Provide a virtual network to an internal Azure Container Apps environments](/azure/container-apps/vnet-custom-internal?tabs=bash&pivots=azure-portal).
+**This article applies to:** ✔️ Standard consumption (Preview) ❌ Basic/Standard ❌ Enterprise
+
+This article describes how to access your application in a virtual network using Azure Spring Apps Standard consumption plan.
+
+When you create an Azure Container Apps environment in an existing virtual network, you can access all the apps inside the environment only within that virtual network. In addition, when you create an instance of Azure Spring Apps inside the Azure Container Apps environment, you can access the applications in the Azure Spring Apps instance only from the virtual network. For more information, see [Provide a virtual network to an internal Azure Container Apps environments](../container-apps/vnet-custom-internal.md?tabs=bash&pivots=azure-portal).
 
 ## Create a private DNS zone
 
-Create a private DNS zone named as the Azure Container App environment’s default domain `<UNIQUE_IDENTIFIER>.<REGION_NAME>.azurecontainerapps.io`, with an A record.
+Create a private DNS zone named as the default domain of the Azure Container Apps environment - `<UNIQUE_IDENTIFIER>.<REGION_NAME>.azurecontainerapps.io` - with an A record.
 
 Use the following command to get the default domain of Azure Container Apps environment.
 
@@ -89,4 +94,5 @@ echo "Press [ENTER] to continue ..."
 
 ## Next steps
 
-- [Azure Spring Apps documentation](./index.yml)
+> [!div class="nextstepaction"]
+> [Deploy an event-driven application to Azure Spring Apps with the Standard consumption plan](./quickstart-deploy-event-driven-app-standard-consumption.md)

articles/spring-apps/media/quickstart-provision-standard-consumption-plan-service-instance/create-azure-container-apps-environment.png renamed to articles/spring-apps/media/quickstart-provision-standard-consumption-service-instance/create-azure-container-apps-environment.png

@@ -1,15 +1,15 @@
 ---
-title:  Analyze logs and metrics in the Azure Spring Apps Standard consumption plan
+title: Quickstart - Analyze logs and metrics in the Azure Spring Apps Standard consumption plan
 description: Learn how to analyze logs and metrics in the Azure Spring Apps Standard consumption plan.
 author: KarlErickson
 ms.author: shiqiu
 ms.service: spring-apps
-ms.topic: how-to
-ms.date: 3/14/2023
+ms.topic: quickstart
+ms.date: 3/21/2023
 ms.custom: devx-track-java
 ---
 
-# Analyze logs and metrics in the Azure Spring Apps Standard consumption plan
+# Quickstart: Analyze logs and metrics in the Azure Spring Apps Standard consumption plan
 
 > [!NOTE]
 > Azure Spring Apps is the new name for the Azure Spring Cloud service. Although the service has a new name, you'll see the old name in some places for a while as we work to update assets such as screenshots, videos, and diagrams.
@@ -21,7 +21,8 @@ This article shows you how to analyze logs and metrics in the Azure Spring Apps
 ## Prerequisites
 
 - An Azure subscription. If you don't have a subscription, create a [free account](https://azure.microsoft.com/free/) before you begin.
-- If you're deploying Azure Spring Apps Enterprise tier for the first time in the target subscription, see the [Prerequisites](./how-to-enterprise-marketplace-offer.md#prerequisites) section of [View Azure Spring Apps Enterprise tier offering in Azure Marketplace](./how-to-enterprise-marketplace-offer.md).
+- An Azure Spring Apps Standard consumption plan service instance. For more information, see [Quickstart: Provision an Azure Spring Apps Standard consumption plan service instance](quickstart-provision-standard-consumption-service-instance.md).
+- A Spring app deployed to Azure Spring Apps. For more information, see [Quickstart: Build and deploy apps to Azure Spring Apps](quickstart-deploy-apps.md).
 
 ## Analyze logs
 
@@ -136,4 +137,5 @@ Optionally, you can create filters to limit the data shown based on application
 
 ## Next steps
 
-[Azure Spring Apps documentation](./index.yml)
+> [!div class="nextstepaction"]
+> [How to enable your own persistent storage in Azure Spring Apps with the Standard consumption plan](./how-to-custom-persistent-storage-with-standard-consumption.md)

articles/spring-apps/media/quickstart-provision-standard-consumption-plan-service-instance/select-azure-container-apps-environment.png renamed to articles/spring-apps/media/quickstart-provision-standard-consumption-service-instance/select-azure-container-apps-environment.png

@@ -11,6 +11,11 @@ ms.custom: devx-track-java
 
 # Quickstart: Set up autoscale for applications in Azure Spring Apps Standard consumption plan
 
+> [!NOTE]
+> Azure Spring Apps is the new name for the Azure Spring Cloud service. Although the service has a new name, you'll see the old name in some places for a while as we work to update assets such as screenshots, videos, and diagrams.
+
+**This article applies to:** ✔️ Standard consumption (Preview) ❌ Basic/Standard ❌ Enterprise
+
 This article describes how to set up autoscale rules for your applications in Azure Spring Apps Standard consumption plan. The plan uses an Azure Container Apps environment to host your Spring applications, and provides the following management and support:
 
 - Manages automatic horizontal scaling through a set of declarative scaling rules.
@@ -21,8 +26,8 @@ For more information, see [Azure Container Apps documentation](../container-apps
 ## Prerequisites
 
 - An Azure subscription. If you don't have an Azure subscription, see [Azure free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
-- A deployed Azure Spring Apps service instance.
-- At least one application already created in your service instance.
+- An Azure Spring Apps Standard consumption plan service instance. For more information, see [Quickstart: Provision an Azure Spring Apps Standard consumption plan service instance](quickstart-provision-standard-consumption-service-instance.md).
+- A Spring app deployed to Azure Spring Apps. For more information, see [Quickstart: Build and deploy apps to Azure Spring Apps](quickstart-deploy-apps.md).
 
 ## Scale definition
 
@@ -100,4 +105,5 @@ echo "Press [ENTER] to continue ..."
 
 ## Next steps
 
-- [Azure Spring Apps documentation](./index.yml)
+> [!div class="nextstepaction"]
+> [Map a custom domain to Azure Spring Apps with the Standard consumption plan](./quickstart-standard-consumption-custom-domain.md)

articles/spring-apps/overview.md

@@ -4,7 +4,7 @@ description: Learn how to deploy an event-driven application to Azure Spring App
 author: karlerickson
 ms.service: spring-apps
 ms.topic: quickstart
-ms.date: 03/17/2023
+ms.date: 03/21/2023
 ms.author: rujche
 ms.custom: devx-track-java, devx-track-azurecli, mode-other, event-tier1-build-2022, engagement-fy23
 ---
@@ -21,7 +21,7 @@ ms.custom: devx-track-java, devx-track-azurecli, mode-other, event-tier1-build-2
 
 This article explains how to deploy a Spring Boot event-driven application to Azure Spring Apps with the Standard consumption plan.
 
-The sample project is an event-driven application that subscribes to a [Service Bus queue](/azure/service-bus-messaging/service-bus-queues-topics-subscriptions#queues) named `lower-case`, and then handles the message and sends another message to another queue named `upper-case`. To make the app simple, message processing just converts the message to uppercase. The following diagram depicts this process:
+The sample project is an event-driven application that subscribes to a [Service Bus queue](../service-bus-messaging/service-bus-queues-topics-subscriptions.md#queues) named `lower-case`, and then handles the message and sends another message to another queue named `upper-case`. To make the app simple, message processing just converts the message to uppercase. The following diagram depicts this process:
 
 :::image type="content" source="media/quickstart-deploy-event-driven-app-standard-consumption/diagram.png" alt-text="Diagram of Spring event-driven app architecture." lightbox="media/quickstart-deploy-event-driven-app-standard-consumption/diagram.png":::
 
@@ -38,13 +38,13 @@ Use the following steps to prepare the sample locally.
 
 1. The sample project is ready on GitHub. Clone sample project by using the following command:
 
-   ```shell
+   ```bash
    git clone https://github.com/Azure-Samples/ASA-Samples-Event-Driven-Application.git
    ```
 
 1. Build the sample project by using the following commands:
 
-   ```shell
+   ```bash
    cd ASA-Samples-Event-Driven-Application
    ./mvnw clean package -DskipTests
    ```
@@ -153,15 +153,13 @@ Use the following steps to create the environment:
 
 ## Create the Azure Spring Apps instance
 
-An Azure Spring Apps Consumption plan instance hosts the Spring event-driven app. Use the following steps to create the service instance and then create an app inside the instance.
+An Azure Spring Apps Standard consumption plan instance hosts the Spring event-driven app. Use the following steps to create the service instance and then create an app inside the instance.
 
-1. Install the Spring extension designed for `StandardGen2` Azure Spring Apps by using the following command:
+1. Install the Azure CLI extension designed for Azure Spring Apps Standard consumption by using the following command:
 
    ```azurecli
    az extension remove --name spring && \
-   az extension add \
-       --source https://ascprivatecli.blob.core.windows.net/cli-extension/spring-1.8.0-py3-none-any.whl \
-       --yes
+   az extension add --name spring
    ```
 
 1. Register the `Microsoft.AppPlatform` provider for the Azure Spring Apps by using the following command:
@@ -254,6 +252,11 @@ echo "Press [ENTER] to continue ..."
 
 ## Next steps
 
+> [!div class="nextstepaction"]
+> [Set up autoscale for applications in Azure Spring Apps Standard consumption plan](./quickstart-apps-autoscale-standard-consumption.md)
+
+For more information, see the following articles:
+
 - [Azure Spring Apps Samples](https://github.com/Azure-Samples/Azure-Spring-Cloud-Samples).
 - [Spring on Azure](/azure/developer/java/spring/)
 - [Spring Cloud Azure](/azure/developer/java/spring-framework/)