Merge pull request #250343 from KarlErickson/karler-enterprise-toc

moved Enterprise sections up

Author: v-ccolin

articles/spring-apps/how-to-prepare-app-deployment.md

@@ -149,13 +149,6 @@ Azure Spring Apps will support the latest Spring Boot or Spring Cloud major vers
 
 The following table lists the supported Spring Boot and Spring Cloud combinations:
 
-### [Basic/Standard plan](#tab/basic-standard-plan)
-
-| Spring Boot version | Spring Cloud version  |
-|---------------------|-----------------------|
-| 3.0.x               | 2022.0.x          |
-| 2.7.x               | 2021.0.3+ aka Jubilee |
-
 ### [Enterprise plan](#tab/enterprise-plan)
 
 | Spring Boot version | Spring Cloud version       |
@@ -165,6 +158,13 @@ The following table lists the supported Spring Boot and Spring Cloud combination
 | 2.6.x               | 2021.0.0+ aka Jubilee      |
 | 2.5.x               | 2020.3+ aka Ilford+        |
 
+### [Basic/Standard plan](#tab/basic-standard-plan)
+
+| Spring Boot version | Spring Cloud version  |
+|---------------------|-----------------------|
+| 3.0.x               | 2022.0.x          |
+| 2.7.x               | 2021.0.3+ aka Jubilee |
+
 ---
 
 For more information, see the following pages:
@@ -278,24 +278,6 @@ public class GatewayApplication {
 
 ### Distributed configuration
 
-#### [Basic/Standard plan](#tab/basic-standard-plan)
-
-To enable distributed configuration, include the following `spring-cloud-config-client` dependency in the dependencies section of your *pom.xml* file:
-
-```xml
-<dependency>
-    <groupId>org.springframework.cloud</groupId>
-    <artifactId>spring-cloud-config-client</artifactId>
-</dependency>
-<dependency>
-    <groupId>org.springframework.cloud</groupId>
-    <artifactId>spring-cloud-starter-bootstrap</artifactId>
-</dependency>
-```
-
-> [!WARNING]
-> Don't specify `spring.cloud.config.enabled=false` in your bootstrap configuration. Otherwise, your application stops working with Config Server.
-
 #### [Enterprise plan](#tab/enterprise-plan)
 
 To enable distributed configuration in the Enterprise plan, use [Application Configuration Service for VMware Tanzu®](https://docs.pivotal.io/tcs-k8s/0-1/), which is one of the proprietary VMware Tanzu components. Application Configuration Service for Tanzu is Kubernetes-native, and totally different from Spring Cloud Config Server. Application Configuration Service for Tanzu enables the management of Kubernetes-native ConfigMap resources that are populated from properties defined in one or more Git repositories.
@@ -320,6 +302,24 @@ To use Application Configuration Service for Tanzu, do the following steps for e
           --config-file-pattern <config-file-pattern>
    ```
 
+#### [Basic/Standard plan](#tab/basic-standard-plan)
+
+To enable distributed configuration, include the following `spring-cloud-config-client` dependency in the dependencies section of your *pom.xml* file:
+
+```xml
+<dependency>
+    <groupId>org.springframework.cloud</groupId>
+    <artifactId>spring-cloud-config-client</artifactId>
+</dependency>
+<dependency>
+    <groupId>org.springframework.cloud</groupId>
+    <artifactId>spring-cloud-starter-bootstrap</artifactId>
+</dependency>
+```
+
+> [!WARNING]
+> Don't specify `spring.cloud.config.enabled=false` in your bootstrap configuration. Otherwise, your application stops working with Config Server.
+
 ---
 
 ### Metrics

articles/spring-apps/index.yml

@@ -39,21 +39,39 @@ landingContent:
   - title: Use the Enterprise plan
     linkLists:
     - linkListType: quickstart
+      links:
+      - text: Launch your first app
+        url: quickstart.md?pivots=sc-enterprise
+      - text: Launch your first web app
+        url: quickstart-deploy-web-app.md?pivots=sc-enterprise
+      - text: Launch your first event-driven app
+        url: quickstart-deploy-event-driven-app.md?pivots=sc-enterprise
+    - linkListType: tutorial
       links:
       - text: Introduction to Fitness Store sample
         url: quickstart-sample-app-acme-fitness-store-introduction.md
-      - text: Build and deploy applications
+      - text: Build and deploy apps
         url: quickstart-deploy-apps-enterprise.md
-      - text: Configure Single Sign-On
+      - text: Configure single sign-on
         url: quickstart-configure-single-sign-on-enterprise.md
+      - text: Integrate Azure Database for PostgreSQL and Azure Cache for Redis
+        url: quickstart-integrate-azure-database-and-redis-enterprise.md
+      - text: Load application secrets using Key Vault
+        url: quickstart-key-vault-enterprise.md
       - text: Monitor applications end-to-end
         url: quickstart-monitor-end-to-end-enterprise.md
+      - text: Set request rate limits
+        url: quickstart-set-request-rate-limits-enterprise.md
+      - text: Automate deployments
+        url: quickstart-automate-deployments-github-actions-enterprise.md
     - linkListType: how-to-guide
       links:
       - text: Use Application Configuration Service
         url: how-to-enterprise-application-configuration-service.md
       - text: Use Build Service
         url: how-to-enterprise-build-service.md
+      - text: Configure APM integration and CA certificates
+        url: how-to-enterprise-configure-apm-integration-and-ca-certificates.md
       - text: Use Service Registry
         url: how-to-enterprise-service-registry.md
       - text: Use API portal

articles/spring-apps/overview.md

@@ -15,7 +15,7 @@ ms.custom: devx-track-java, devx-track-extended-java, contperf-fy21q2, event-tie
 > [!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 and dedicated (Preview) ✔️ Basic/Standard ✔️ Enterprise
+**This article applies to:** ✔️ Enterprise ✔️ Standard consumption and dedicated (Preview) ✔️ Basic/Standard
 
 Azure Spring Apps makes it easy to deploy Spring Boot applications to Azure without any code changes. The service manages the infrastructure of Spring applications so developers can focus on their code. Azure Spring Apps provides lifecycle management using comprehensive monitoring and diagnostics, configuration management, service discovery, CI/CD integration, blue-green deployments, and more.
 
@@ -73,36 +73,6 @@ The following quickstarts apply to the Basic/Standard plan only. For Enterprise
 * [Set up Spring Cloud Config Server for Azure Spring Apps](quickstart-setup-config-server.md)
 * [Build and deploy apps to Azure Spring Apps](quickstart-deploy-apps.md)
 
-## Standard consumption and dedicated plan
-
-The Standard consumption and dedicated plan provides a hybrid pricing solution that combines the best of pay-as-you-go and resource-based pricing. With this comprehensive package, you have the flexibility to pay only for compute time as you get started, while enjoying enhanced cost predictability and significant savings when your resources scale up.
-
-When you create a Standard consumption and dedicated plan, a consumption workload profile is always created by default. You can additionally add dedicated workload profiles to the same plan to fit the requirements of your workload.
-
-Workload profiles determine the amount of compute and memory resources available to Spring apps deployed in the Standard consumption and dedicated plan. There are different machine sizes and characteristics with different workload profiles. For more information, see [Workload profiles in Consumption + Dedicated plan structure environments in Azure Container Apps (preview)](../container-apps/workload-profiles-overview.md).
-
-You can run your apps in any combination of consumption or dedicated workload profiles. Consider using the consumption workload profile when your applications need to start from and scale to zero. Use the dedicated workload profile when you need dedicated hardware for single tenancy, and for customizable compute as with a memory optimized machine. You can also use the dedicated workload profile to optimize for cost savings when resources are running at scale.
-
-The Standard consumption and dedicated plan simplifies the virtual network experience for running polyglot applications. In the Standard consumption and dedicated plan, when you deploy frontend applications as containers in Azure Container Apps, all your applications share the same virtual network in the same Azure Container Apps environment. There's no need to create disparate subnets and Network Security Groups for frontend apps, Spring apps, and the Spring service runtime.
-
-The following diagram shows the architecture of a virtual network in Azure Spring Apps:
-
-:::image type="content" source="media/overview/standard-consumption-plan.png" alt-text="Diagram showing app architecture with Azure Spring Apps standard consumption and dedicated plan." lightbox="media/overview/standard-consumption-plan.png" border="false":::
-
-### Get started with the Standard consumption and dedicated plan
-
-The following articles help you get started using the Standard consumption and dedicated plan:
-
-* [Provision an Azure Spring Standard consumption and dedicated plan service instance](quickstart-provision-standard-consumption-service-instance.md)
-* [Create an Azure Spring Apps Standard consumption and dedicated plan instance in an Azure Container Apps environment with a virtual network](quickstart-provision-standard-consumption-app-environment-with-virtual-network.md)
-* [Access applications using Azure Spring Apps Standard consumption and dedicated plan in a virtual network](quickstart-access-standard-consumption-within-virtual-network.md)
-* [Deploy an event-driven application to Azure Spring Apps](quickstart-deploy-event-driven-app.md)
-* [Set up autoscale for applications in Azure Spring Apps Standard consumption and dedicated plan](quickstart-apps-autoscale-standard-consumption.md)
-* [Map a custom domain to Azure Spring Apps with the Standard consumption and dedicated plan](quickstart-standard-consumption-custom-domain.md)
-* [Analyze logs and metrics in the Azure Spring Apps Standard consumption and dedicated plan](quickstart-analyze-logs-and-metrics-standard-consumption.md)
-* [Enable your own persistent storage in Azure Spring Apps with the Standard consumption and dedicated plan](how-to-custom-persistent-storage-with-standard-consumption.md)
-* [Customer responsibilities for Azure Spring Apps Standard consumption and dedicated plan in a virtual network](standard-consumption-customer-responsibilities.md)
-
 ## Enterprise plan
 
 The Enterprise plan provides commercially supported Tanzu components with SLA assurance. For more information, see the [SLA for Azure Spring Apps](https://azure.microsoft.com/support/legal/sla/spring-apps). This support helps enterprise customers ship faster for mission-critical workloads with peace of mind. The Enterprise plan helps unlock Spring’s full potential while including feature parity and region parity with the Standard plan.
@@ -202,6 +172,36 @@ As a quick reference, the articles listed previously and the articles in the fol
 * [Enable system-assigned managed identity for an application in Azure Spring Apps](how-to-enable-system-assigned-managed-identity.md?pivots=sc-enterprise-tier)
 * [Use Application Insights Java In-Process Agent in Azure Spring Apps](how-to-application-insights.md?pivots=sc-enterprise-tier)
 
+## Standard consumption and dedicated plan
+
+The Standard consumption and dedicated plan provides a hybrid pricing solution that combines the best of pay-as-you-go and resource-based pricing. With this comprehensive package, you have the flexibility to pay only for compute time as you get started, while enjoying enhanced cost predictability and significant savings when your resources scale up.
+
+When you create a Standard consumption and dedicated plan, a consumption workload profile is always created by default. You can additionally add dedicated workload profiles to the same plan to fit the requirements of your workload.
+
+Workload profiles determine the amount of compute and memory resources available to Spring apps deployed in the Standard consumption and dedicated plan. There are different machine sizes and characteristics with different workload profiles. For more information, see [Workload profiles in Consumption + Dedicated plan structure environments in Azure Container Apps (preview)](../container-apps/workload-profiles-overview.md).
+
+You can run your apps in any combination of consumption or dedicated workload profiles. Consider using the consumption workload profile when your applications need to start from and scale to zero. Use the dedicated workload profile when you need dedicated hardware for single tenancy, and for customizable compute as with a memory optimized machine. You can also use the dedicated workload profile to optimize for cost savings when resources are running at scale.
+
+The Standard consumption and dedicated plan simplifies the virtual network experience for running polyglot applications. In the Standard consumption and dedicated plan, when you deploy frontend applications as containers in Azure Container Apps, all your applications share the same virtual network in the same Azure Container Apps environment. There's no need to create disparate subnets and Network Security Groups for frontend apps, Spring apps, and the Spring service runtime.
+
+The following diagram shows the architecture of a virtual network in Azure Spring Apps:
+
+:::image type="content" source="media/overview/standard-consumption-plan.png" alt-text="Diagram showing app architecture with Azure Spring Apps standard consumption and dedicated plan." lightbox="media/overview/standard-consumption-plan.png" border="false":::
+
+### Get started with the Standard consumption and dedicated plan
+
+The following articles help you get started using the Standard consumption and dedicated plan:
+
+* [Provision an Azure Spring Standard consumption and dedicated plan service instance](quickstart-provision-standard-consumption-service-instance.md)
+* [Create an Azure Spring Apps Standard consumption and dedicated plan instance in an Azure Container Apps environment with a virtual network](quickstart-provision-standard-consumption-app-environment-with-virtual-network.md)
+* [Access applications using Azure Spring Apps Standard consumption and dedicated plan in a virtual network](quickstart-access-standard-consumption-within-virtual-network.md)
+* [Deploy an event-driven application to Azure Spring Apps](quickstart-deploy-event-driven-app.md)
+* [Set up autoscale for applications in Azure Spring Apps Standard consumption and dedicated plan](quickstart-apps-autoscale-standard-consumption.md)
+* [Map a custom domain to Azure Spring Apps with the Standard consumption and dedicated plan](quickstart-standard-consumption-custom-domain.md)
+* [Analyze logs and metrics in the Azure Spring Apps Standard consumption and dedicated plan](quickstart-analyze-logs-and-metrics-standard-consumption.md)
+* [Enable your own persistent storage in Azure Spring Apps with the Standard consumption and dedicated plan](how-to-custom-persistent-storage-with-standard-consumption.md)
+* [Customer responsibilities for Azure Spring Apps Standard consumption and dedicated plan in a virtual network](standard-consumption-customer-responsibilities.md)
+
 ## Next steps
 
 > [!div class="nextstepaction"]

articles/spring-apps/quickstart-deploy-infrastructure-vnet-azure-cli.md

@@ -46,14 +46,14 @@ The Enterprise deployment plan includes the following Tanzu components:
 
 The deployment script used in this quickstart is from the [Azure Spring Apps reference architecture](/previous-versions/azure/spring-apps/reference-architecture).
 
-### [Standard plan](#tab/azure-spring-apps-standard)
-
-:::code language="azurecli" source="~/azure-spring-apps-reference-architecture/CLI/brownfield-deployment/azuredeploySpringStandard.sh":::
-
 ### [Enterprise plan](#tab/azure-spring-apps-enterprise)
 
 :::code language="azurecli" source="~/azure-spring-apps-reference-architecture/CLI/brownfield-deployment/azuredeploySpringEnterprise.sh":::
 
+### [Standard plan](#tab/azure-spring-apps-standard)
+
+:::code language="azurecli" source="~/azure-spring-apps-reference-architecture/CLI/brownfield-deployment/azuredeploySpringStandard.sh":::
+
 ---
 
 ## Deploy the cluster

articles/spring-apps/quickstart-deploy-infrastructure-vnet-bicep.md

@@ -47,14 +47,14 @@ To deploy the cluster, use the following steps.
 
 First, create an *azuredeploy.bicep* file with the following contents:
 
-### [Standard plan](#tab/azure-spring-apps-standard)
-
-:::code language="bicep" source="~/azure-spring-apps-reference-architecture/Bicep/brownfield-deployment/azuredeploySpringStandard.bicep":::
-
 ### [Enterprise plan](#tab/azure-spring-apps-enterprise)
 
 :::code language="bicep" source="~/azure-spring-apps-reference-architecture/Bicep/brownfield-deployment/azuredeploySpringEnterprise.bicep":::
 
+### [Standard plan](#tab/azure-spring-apps-standard)
+
+:::code language="bicep" source="~/azure-spring-apps-reference-architecture/Bicep/brownfield-deployment/azuredeploySpringStandard.bicep":::
+
 ---
 
 Next, open a Bash window and run the following Azure CLI command, replacing the *\<value>* placeholders with the following values:

articles/spring-apps/quickstart-deploy-infrastructure-vnet-terraform.md

@@ -49,14 +49,14 @@ For more customization including custom domain support, see the [Azure Spring Ap
 
 The configuration file used in this quickstart is from the [Azure Spring Apps reference architecture](/previous-versions/azure/spring-apps/reference-architecture).
 
-### [Standard plan](#tab/azure-spring-apps-standard)
-
-:::code language="hcl" source="~/azure-spring-apps-reference-architecture/terraform/brownfield-deployment/Standard/main.tf":::
-
 ### [Enterprise plan](#tab/azure-spring-apps-enterprise)
 
 :::code language="hcl" source="~/azure-spring-apps-reference-architecture/terraform/brownfield-deployment/Enterprise/main.tf":::
 
+### [Standard plan](#tab/azure-spring-apps-standard)
+
+:::code language="hcl" source="~/azure-spring-apps-reference-architecture/terraform/brownfield-deployment/Standard/main.tf":::
+
 ---
 
 ## Apply the Terraform plan