Merge pull request #264637 from MicrosoftDocs/release-asa-hub

Merge release branch to main

Author: v-dirichards

articles/spring-apps/.openpublishing.redirection.spring-apps.json

@@ -31,17 +31,17 @@ To find out if your applications meet expectations and to discover and predict i
 
 This article uses the well-known [PetClinic](https://github.com/azure-samples/spring-petclinic-microservices) sample app as the production application. For more information on how to deploy PetClinic to Azure Spring Apps and use MySQL as the persistent store, see the following articles:
 
-- [Deploy microservice applications to Azure Spring Apps](./quickstart-deploy-microservice-apps.md)
-- [Integrate Azure Spring Apps with Azure Database for MySQL](./quickstart-integrate-azure-database-mysql.md)
+- [Deploy microservice applications to Azure Spring Apps](../enterprise/quickstart-deploy-microservice-apps.md?pivots=sc-standard&toc=/azure/spring-apps/basic-standard/toc.json&bc=/azure/spring-apps/basic-standard/breadcrumb/toc.json)
+- [Integrate Azure Spring Apps with Azure Database for MySQL](quickstart-integrate-azure-database-mysql.md)
 
 Log Analytics and Application Insights are deeply integrated with Azure Spring Apps. You can use Log Analytics to diagnose your application with various log queries and use Application Insights to investigate production issues. For more information, see the following articles:
 
-- [Overview of Log Analytics in Azure Monitor](../azure-monitor/logs/log-analytics-overview.md)
-- [Azure Monitor Insights overview](../azure-monitor/insights/insights-overview.md)
+- [Overview of Log Analytics in Azure Monitor](../../azure-monitor/logs/log-analytics-overview.md)
+- [Azure Monitor Insights overview](../../azure-monitor/insights/insights-overview.md)
 
 ## Prerequisites
 
-- An Azure subscription. [!INCLUDE [quickstarts-free-trial-note](../../includes/quickstarts-free-trial-note.md)]
+- An Azure subscription. [!INCLUDE [quickstarts-free-trial-note](../../../includes/quickstarts-free-trial-note.md)]
 
 [!INCLUDE [application-observability-with-basic-standard-plan](includes/application-observability/application-observability-with-basic-standard-plan.md)]
 
@@ -51,8 +51,8 @@ If you encounter production issues, you need to do a root cause analysis. Findin
 
 This section explains how to use Log Analytics to query the application logs and use Application Insights to investigate request failures. For more information, see the following articles:
 
-- [Log Analytics tutorial](../azure-monitor/logs/log-analytics-tutorial.md)
-- [Application Map: Triage distributed applications](../azure-monitor/app/app-map.md)
+- [Log Analytics tutorial](../../azure-monitor/logs/log-analytics-tutorial.md)
+- [Application Map: Triage distributed applications](../../azure-monitor/app/app-map.md)
 
 ### Log queries
 
@@ -149,10 +149,10 @@ To use Application Insights to investigate the performance issues, use the follo
 ## Next steps
 
 > [!div class="nextstepaction"]
-> [Set up a staging environment](../spring-apps/how-to-staging-environment.md)
+> [Set up a staging environment](../enterprise/how-to-staging-environment.md)
 
 > [!div class="nextstepaction"]
-> [Map an existing custom domain to Azure Spring Apps](./how-to-custom-domain.md)
+> [Map an existing custom domain to Azure Spring Apps](../enterprise/how-to-custom-domain.md?toc=/azure/spring-apps/basic-standard/toc.json&bc=/azure/spring-apps/basic-standard/breadcrumb/toc.json)
 
 > [!div class="nextstepaction"]
-> [Use TLS/SSL certificates](./how-to-use-tls-certificate.md)
+> [Use TLS/SSL certificates](../enterprise/how-to-use-tls-certificate.md?toc=/azure/spring-apps/basic-standard/toc.json&bc=/azure/spring-apps/basic-standard/breadcrumb/toc.json)

articles/spring-apps/application-observability.md renamed to articles/spring-apps/basic-standard/application-observability.md

@@ -35,7 +35,7 @@ Assign the role to the [user | group | service-principal | managed-identity] at
 | Azure Spring Apps Service Registry Reader      | Allow read access to Azure Spring Apps Service Registry.                    |
 | Azure Spring Apps Service Registry Contributor | Allow read, write, and delete access to Azure Spring Apps Service Registry. |
 
-For detailed steps, see [Assign Azure roles using the Azure portal](../role-based-access-control/role-assignments-portal.md).
+For detailed steps, see [Assign Azure roles using the Azure portal](../../role-based-access-control/role-assignments-portal.md).
 
 ## Access Config Server and Service Registry Endpoints
 
@@ -142,4 +142,4 @@ eureka.instance.prefer-ip-address=true
 
 * [Authenticate Azure CLI](/cli/azure/authenticate-azure-cli)
 * [Production ready endpoints](https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#production-ready-endpoints)
-* [Create roles and permissions](how-to-permissions.md)
+* [Create roles and permissions](../enterprise/how-to-permissions.md?toc=/azure/spring-apps/basic-standard/toc.json&bc=/azure/spring-apps/basic-standard/breadcrumb/toc.json)

articles/spring-apps/how-to-access-data-plane-azure-ad-rbac.md renamed to articles/spring-apps/basic-standard/how-to-access-data-plane-azure-ad-rbac.md

@@ -237,12 +237,12 @@ The AppDynamics Agent will be upgraded regularly with JDK (quarterly). Agent upg
 
 ## Configure virtual network injection instance outbound traffic
 
-For virtual network injection instances of Azure Spring Apps, make sure the outbound traffic is configured correctly for AppDynamics Agent. For details, see [SaaS Domains and IP Ranges](https://docs.appdynamics.com/display/PAA/SaaS+Domains+and+IP+Ranges) and [Customer responsibilities for running Azure Spring Apps in a virtual network](vnet-customer-responsibilities.md).
+For virtual network injection instances of Azure Spring Apps, make sure the outbound traffic is configured correctly for AppDynamics Agent. For details, see [SaaS Domains and IP Ranges](https://docs.appdynamics.com/display/PAA/SaaS+Domains+and+IP+Ranges) and [Customer responsibilities for running Azure Spring Apps in a virtual network](../enterprise/vnet-customer-responsibilities.md?toc=/azure/spring-apps/basic-standard/toc.json&bc=/azure/spring-apps/basic-standard/breadcrumb/toc.json).
 
 ## Understand the limitations
 
 To understand the limitations of the AppDynamics Agent, see [Monitor Azure Spring Apps with Java Agent](https://docs.appdynamics.com/21.11/en/application-monitoring/install-app-server-agents/java-agent/monitor-azure-spring-cloud-with-java-agent).
 
 ## Next steps
 
-[Use Application Insights Java In-Process Agent in Azure Spring Apps](./how-to-application-insights.md)
+[Use Application Insights Java In-Process Agent in Azure Spring Apps](../enterprise/how-to-application-insights.md?pivots=sc-standard&toc=/azure/spring-apps/basic-standard/toc.json&bc=/azure/spring-apps/basic-standard/breadcrumb/toc.json)

articles/spring-apps/how-to-appdynamics-java-agent-monitor.md renamed to articles/spring-apps/basic-standard/how-to-appdynamics-java-agent-monitor.md

@@ -90,5 +90,5 @@ Other operations:
 
 ## Next steps
 
-- [Quotas and service plans for Azure Spring Apps](./quotas.md)
-- [Scale an application in Azure Spring Apps](./how-to-scale-manual.md)
+- [Quotas and service plans for Azure Spring Apps](../enterprise/quotas.md?toc=/azure/spring-apps/basic-standard/toc.json&bc=/azure/spring-apps/basic-standard/breadcrumb/toc.json)
+- [Scale an application in Azure Spring Apps](../enterprise/how-to-scale-manual.md?toc=/azure/spring-apps/basic-standard/toc.json&bc=/azure/spring-apps/basic-standard/breadcrumb/toc.json)

articles/spring-apps/how-to-built-in-persistent-storage.md renamed to articles/spring-apps/basic-standard/how-to-built-in-persistent-storage.md

@@ -23,12 +23,12 @@ This article shows you how to configure a managed Spring Cloud Config Server in
 Spring Cloud Config Server provides server and client-side support for an externalized configuration in a distributed system. The Config Server instance provides a central place to manage external properties for applications across all environments. For more information, see the [Spring Cloud Config documentation](https://spring.io/projects/spring-cloud-config).
 
 > [!NOTE]
-> To use config server in the Standard consumption and dedicated plan, you must enable it first. For more information, see [Enable and disable Spring Cloud Config Server in Azure Spring Apps](quickstart-standard-consumption-config-server.md).
+> To use config server in the Standard consumption and dedicated plan, you must enable it first. For more information, see [Enable and disable Spring Cloud Config Server in Azure Spring Apps](../consumption-dedicated/quickstart-standard-consumption-config-server.md).
 
 ## Prerequisites
 
 - An Azure subscription. If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
-- An already provisioned and running Azure Spring Apps service instance using the Basic or Standard plan. To set up and launch an Azure Spring Apps service, see [Quickstart: Deploy your first application to Azure Spring Apps](./quickstart.md). Spring Cloud Config Server isn't applicable to the Enterprise plan.
+- An already provisioned and running Azure Spring Apps service instance using the Basic or Standard plan. To set up and launch an Azure Spring Apps service, see [Quickstart: Deploy your first application to Azure Spring Apps](../enterprise/quickstart.md?pivots=sc-standard&toc=/azure/spring-apps/basic-standard/toc.json&bc=/azure/spring-apps/basic-standard/breadcrumb/toc.json). Spring Cloud Config Server isn't applicable to the Enterprise plan.
 - [Git](https://git-scm.com/downloads).
 
 ## Restriction
@@ -331,4 +331,4 @@ For more information, see the [config-client-polling](https://github.com/Azure-S
 
 ## Next steps
 
-In this article, you learned how to enable and configure your Spring Cloud Config Server instance. To learn more about managing your application, see [Scale an application in Azure Spring Apps](./how-to-scale-manual.md).
+In this article, you learned how to enable and configure your Spring Cloud Config Server instance. To learn more about managing your application, see [Scale an application in Azure Spring Apps](../enterprise/how-to-scale-manual.md?toc=/azure/spring-apps/basic-standard/toc.json&bc=/azure/spring-apps/basic-standard/breadcrumb/toc.json).

articles/spring-apps/how-to-config-server.md renamed to articles/spring-apps/basic-standard/how-to-config-server.md

@@ -203,12 +203,12 @@ The Dynatrace OneAgent auto-upgrade is disabled and is upgraded quarterly with t
 
 ## Virtual network injection instance outbound traffic configuration
 
-For a virtual network injection instance of Azure Spring Apps, you need to make sure the outbound traffic for Dynatrace communication endpoints is configured correctly for Dynatrace OneAgent. For information about how to get `communicationEndpoints`, see [Deployment API - GET connectivity information for OneAgent](https://www.dynatrace.com/support/help/dynatrace-api/environment-api/deployment/oneagent/get-connectivity-info/). For more information, see [Customer responsibilities for running Azure Spring Apps in a virtual network](vnet-customer-responsibilities.md).
+For a virtual network injection instance of Azure Spring Apps, you need to make sure the outbound traffic for Dynatrace communication endpoints is configured correctly for Dynatrace OneAgent. For information about how to get `communicationEndpoints`, see [Deployment API - GET connectivity information for OneAgent](https://www.dynatrace.com/support/help/dynatrace-api/environment-api/deployment/oneagent/get-connectivity-info/). For more information, see [Customer responsibilities for running Azure Spring Apps in a virtual network](../enterprise/vnet-customer-responsibilities.md?toc=/azure/spring-apps/basic-standard/toc.json&bc=/azure/spring-apps/basic-standard/breadcrumb/toc.json).
 
 ## Dynatrace support model
 
 For information about limitations when deploying Dynatrace OneAgent in application-only mode, see the [Cloud application platforms](https://www.dynatrace.com/support/help/technology-support/oneagent-platform-and-capability-support-matrix/#cloud-application-platforms) section of [OneAgent platform and capability support matrix](https://www.dynatrace.com/support/help/technology-support/oneagent-platform-and-capability-support-matrix).
 
 ## Next steps
 
-[Use Application Insights Java In-Process Agent in Azure Spring Apps](how-to-application-insights.md)
+[Use Application Insights Java In-Process Agent in Azure Spring Apps](../enterprise/how-to-application-insights.md?pivots=sc-standard&toc=/azure/spring-apps/basic-standard/toc.json&bc=/azure/spring-apps/basic-standard/breadcrumb/toc.json)

articles/spring-apps/how-to-dynatrace-one-agent-monitor.md renamed to articles/spring-apps/basic-standard/how-to-dynatrace-one-agent-monitor.md

@@ -21,7 +21,7 @@ This article explains how to use Elastic APM Agent to monitor Spring Boot applic
 With the Elastic Observability Solution, you can achieve unified observability to:
 
 * Monitor apps using the Elastic APM Java Agent and using persistent storage with Azure Spring Apps.
-* Use diagnostic settings to ship Azure Spring Apps logs to Elastic. For more information, see [Analyze logs with Elastic (ELK) using diagnostics settings](how-to-elastic-diagnostic-settings.md).
+* Use diagnostic settings to ship Azure Spring Apps logs to Elastic. For more information, see [Analyze logs with Elastic (ELK) using diagnostics settings](../enterprise/how-to-elastic-diagnostic-settings.md?toc=/azure/spring-apps/basic-standard/toc.json&bc=/azure/spring-apps/basic-standard/breadcrumb/toc.json).
 
 The following video introduces unified observability for Spring Boot applications using Elastic.
 
@@ -55,7 +55,7 @@ This article uses the Spring Petclinic sample to walk through the required steps
 
 Use the following steps to enable custom persistent storage:
 
-1. Follow the steps in [How to enable your own persistent storage in Azure Spring Apps](how-to-custom-persistent-storage.md).
+1. Follow the steps in [How to enable your own persistent storage in Azure Spring Apps](../enterprise/how-to-custom-persistent-storage.md?toc=/azure/spring-apps/basic-standard/toc.json&bc=/azure/spring-apps/basic-standard/breadcrumb/toc.json).
 
 1. Use the following Azure CLI command to add persistent storage for your Azure Spring Apps apps.
 
@@ -193,5 +193,5 @@ Using the inbuilt AI engine in the Elastic solution, you can also enable Anomaly
 
 ## Next steps
 
-* [Quickstart: Deploy your first Spring Boot app in Azure Spring Apps](./quickstart.md)
+* [Quickstart: Deploy your first Spring Boot app in Azure Spring Apps](../enterprise/quickstart.md?pivots=sc-standard&toc=/azure/spring-apps/basic-standard/toc.json&bc=/azure/spring-apps/basic-standard/breadcrumb/toc.json)
 * [Deploy Elastic on Azure](https://www.elastic.co/blog/getting-started-with-the-azure-integration-enhancement)

articles/spring-apps/how-to-elastic-apm-java-agent-monitor.md renamed to articles/spring-apps/basic-standard/how-to-elastic-apm-java-agent-monitor.md

@@ -33,7 +33,7 @@ Before you begin, ensure that your Azure subscription has the required dependenc
 5. [Sign up for an Azure subscription](https://azure.microsoft.com/free/)
 
 > [!TIP]
-> The Azure Cloud Shell is a free interactive shell that you can use to run the steps in this article.  It has common Azure tools preinstalled, including the latest versions of Git, JDK, Maven, and the Azure CLI. If you are logged in to your Azure subscription, launch your [Azure Cloud Shell](https://shell.azure.com) from shell.azure.com.  You can learn more about Azure Cloud Shell by [reading our documentation](../cloud-shell/overview.md)
+> The Azure Cloud Shell is a free interactive shell that you can use to run the steps in this article.  It has common Azure tools preinstalled, including the latest versions of Git, JDK, Maven, and the Azure CLI. If you are logged in to your Azure subscription, launch your [Azure Cloud Shell](https://shell.azure.com) from shell.azure.com.  You can learn more about Azure Cloud Shell by [reading our documentation](../../cloud-shell/overview.md)
 
 ## Install the Azure CLI extension
 
@@ -53,7 +53,7 @@ az account list -o table
 az account set --subscription <subscription-id>
 ```
 
-Create a resource group to contain your service in Azure Spring Apps. You can learn more about [Azure Resource Groups](../azure-resource-manager/management/overview.md).
+Create a resource group to contain your service in Azure Spring Apps. You can learn more about [Azure Resource Groups](../../azure-resource-manager/management/overview.md).
 
 ```azurecli
 az group create --location eastus --name <resource-group-name>

articles/spring-apps/how-to-launch-from-source.md renamed to articles/spring-apps/basic-standard/how-to-launch-from-source.md

@@ -195,4 +195,4 @@ For a vnet injection instance of Azure Spring Apps, you need to make sure the ou
 
 ## Next steps
 
-[Use Application Insights Java In-Process Agent in Azure Spring Apps](how-to-application-insights.md)
+[Use Application Insights Java In-Process Agent in Azure Spring Apps](../enterprise/how-to-application-insights.md?pivots=sc-standard&toc=/azure/spring-apps/basic-standard/toc.json&bc=/azure/spring-apps/basic-standard/breadcrumb/toc.json)