Merge pull request #189556 from KarlErickson/karler-quickstarts

update AzSC quickstarts

Author: jborsecnik

.openpublishing.publish.config.json

@@ -885,6 +885,7 @@
     "articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
     "articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
     "articles/mysql/.openpublishing.redirection.mysql.json",
-    "articles/container-apps/.openpublishing.redirection.container-apps.json"
+    "articles/container-apps/.openpublishing.redirection.container-apps.json",
+    "articles/spring-cloud/.openpublishing.redirection.spring-cloud.json"
   ]
 }

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

@@ -0,0 +1,9 @@
+{
+    "redirections": [
+        {
+            "source_path": "quickstart-setup-service-registry-enterprise.md",
+            "redirect_url": "/azure/spring-cloud/quickstart-deploy-apps-enterprise",
+            "redirect_document_id": false
+        }
+    ]
+}

articles/spring-cloud/index.yml

@@ -46,8 +46,6 @@ landingContent:
         url: quickstart-setup-application-configuration-service-enterprise.md
       - text: Build and deploy applications
         url: quickstart-deploy-apps-enterprise.md
-      - text: Set up Service Registry
-        url: quickstart-setup-service-registry-enterprise.md
     - linkListType: how-to-guide
       links:
       - text: Use Application Configuration Service

articles/spring-cloud/media/enterprise/getting-started-enterprise/service-instance-delete-instance.png

@@ -126,7 +126,6 @@ The following quickstarts will help you get started using the Enterprise tier:
 * [Provision an Azure Spring Cloud instance using the Enterprise tier](quickstart-provision-service-instance-enterprise.md)
 * [Set up Application Configuration Service for Tanzu](quickstart-setup-application-configuration-service-enterprise.md)
 * [Build and deploy applications](quickstart-deploy-apps-enterprise.md)
-* [Set up Tanzu Service Registry](quickstart-setup-service-registry-enterprise.md)
 
 Most of the Azure Spring Cloud documentation applies to all tiers. Some articles apply only to Enterprise tier or only to Basic/Standard tier, as indicated at the beginning of each article.
 

articles/spring-cloud/overview.md

@@ -41,6 +41,47 @@ To create apps on Azure Spring Cloud, follow these steps:
    az spring-cloud app create --name customers-service --instance-count 1 --memory 2Gi
    ```
 
+## Bind apps to Application Configuration Service for Tanzu and Tanzu Service Registry
+
+### [Portal](#tab/azure-portal)
+
+To bind apps to Application Configuration Service for VMware Tanzu®, follow these steps.
+
+1. In the Azure portal, select **Application Configuration Service**.
+1. Select **App binding**, then select **Bind app**.
+1. Choose one app in the dropdown and select **Apply** to bind the application to Application Configuration Service for Tanzu.
+
+   ![Azure portal screenshot of Azure Spring Cloud with Application Configuration Service page and 'App binding' section with 'Bind app' dialog showing.](./media/enterprise/getting-started-enterprise/config-service-app-bind-dropdown.png)
+
+A list under **App name** shows the apps bound with Application Configuration Service for Tanzu, as shown in the following screenshot:
+
+![Azure portal screenshot of Azure Spring Cloud with Application Configuration Service page and 'App binding' section with app list showing.](./media/enterprise/getting-started-enterprise/config-service-app-bind.png)
+
+To bind apps to VMware Tanzu® Service Registry, follow these steps.
+
+1. Select **Service Registry**.
+1. Select **App binding**, then select **Bind app**.
+1. Choose one app in the dropdown, and then select **Apply** to bind the application to Tanzu Service Registry.
+
+   :::image type="content" source="media/enterprise/getting-started-enterprise/service-reg-app-bind-dropdown.png" alt-text="Azure portal screenshot of Azure Spring Cloud with Service Registry page and 'Bind app' dialog showing.":::
+
+A list under **App name** shows the apps bound with Tanzu Service Registry, as shown in the following screenshot:
+
+:::image type="content" source="media/enterprise/getting-started-enterprise/service-reg-app-bind.png" alt-text="Azure portal screenshot of Azure Spring Cloud with Service Registry page and 'App binding' section showing.":::
+
+### [Azure CLI](#tab/azure-cli)
+
+To bind apps to Application Configuration Service for VMware Tanzu® and VMware Tanzu® Service Registry, use the following commands.
+
+```azurecli
+az spring-cloud application-configuration-service bind --app api-gateway
+az spring-cloud application-configuration-service bind --app customers-service
+az spring-cloud service-registry bind --app api-gateway
+az spring-cloud service-registry bind --app customers-service
+```
+
+---
+
 ## Build and deploy applications
 
 The following sections show how to build and deploy applications.
@@ -95,17 +136,16 @@ Access the `api gateway` and `customers service` applications from the browser u
 
 ## Clean up resources
 
-1. Open the [Azure portal](https://ms.portal.azure.com/?AppPlatformExtension=entdf#home), then delete the service instance as in the following screenshot.
-
-   ![Delete an instance image](./media/enterprise/getting-started-enterprise/service-instance-delete-instance.png)
-
-1. Run the following command to remove the preview version of the Azure CLI extension.
+If you plan to continue working with subsequent quickstarts and tutorials, you might want to leave these resources in place. When no longer needed, delete the resource group, which deletes the resources in the resource group. To delete the resource group by using Azure CLI, use the following commands:
 
-   ```azurecli
-   az extension remove --name spring-cloud
-   ```
+```azurecli
+echo "Enter the Resource Group name:" &&
+read resourceGroupName &&
+az group delete --name $resourceGroupName &&
+echo "Press [ENTER] to continue ..."
+```
 
 ## Next steps
 
 > [!div class="nextstepaction"]
-> [Quickstart: Set up Tanzu Service Registry](quickstart-setup-service-registry-enterprise.md)
+> [Quickstart: Set up a Log Analytics workspace](quickstart-setup-log-analytics.md)

articles/spring-cloud/quickstart-deploy-apps-enterprise.md

@@ -415,9 +415,18 @@ Other Spring applications included in this sample can be deployed similarly.
 
 ::: zone-end
 
-## Next steps
+## Clean up resources
+
+If you plan to continue working with subsequent quickstarts and tutorials, you might want to leave these resources in place. When no longer needed, delete the resource group, which deletes the resources in the resource group. To delete the resource group by using Azure CLI, use the following commands:
+
+```azurecli
+echo "Enter the Resource Group name:" &&
+read resourceGroupName &&
+az group delete --name $resourceGroupName &&
+echo "Press [ENTER] to continue ..."
+```
 
-In this quickstart, you created Azure resources that will continue to accrue charges if they remain in your subscription. If you don't intend to continue on to the next quickstart, see [Clean up resources](./quickstart-logs-metrics-tracing.md#clean-up-resources). Otherwise, advance to the next quickstart:
+## Next steps
 
 > [!div class="nextstepaction"]
-> [Set up Log Analytics](./quickstart-setup-log-analytics.md)
+> [Quickstart: Set up a Log Analytics workspace](quickstart-setup-log-analytics.md)

articles/spring-cloud/quickstart-deploy-apps.md

@@ -154,7 +154,7 @@ You can either use the Azure portal to check the deployed resources, or use Azur
 
 If you plan to continue working with subsequent quickstarts and tutorials, you might want to leave these resources in place. When no longer needed, delete the resource group, which deletes the resources in the resource group. To delete the resource group by using Azure CLI, use the following commands:
 
-```azurecli-interactive
+```azurecli
 echo "Enter the Resource Group name:" &&
 read resourceGroupName &&
 az group delete --name $resourceGroupName &&

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

@@ -17,8 +17,7 @@ Pet Clinic, as deployed in the default configuration [Quickstart: Build and depl
 
 ## Variables preparation
 
-We will use the following values. Save them in a text file or environment variables to avoid errors. 
-The password should be at least 8 characters long and contain at least one English uppercase letter, one English lowercase letter, one number, and one non-alphanumeric character (!, $, #, %, and so on.).
+We will use the following values. Save them in a text file or environment variables to avoid errors. The password should be at least 8 characters long and contain at least one English uppercase letter, one English lowercase letter, one number, and one non-alphanumeric character (!, $, #, %, and so on.).
 
 ```bash
 export RESOURCE_GROUP=<resource-group-name> # customize this
@@ -33,103 +32,109 @@ export MYSQL_DATABASE_NAME=petclinic
 ## Prepare an Azure Database for MySQL instance
 
 1. If you didn't run the following commands in the previous quickstarts, set the CLI defaults.
-    ```azcli
-    az configure --defaults group=<resource group name> spring-cloud=<service name>
-    ```
-1. Create an Azure Database for MySQL server. 
-
-    ```azcli
-    az mysql server create --resource-group ${RESOURCE_GROUP} \
-        --name ${MYSQL_SERVER_NAME} \
-        --admin-user ${MYSQL_SERVER_ADMIN_NAME} \
-        --admin-password ${MYSQL_SERVER_ADMIN_PASSWORD} \
-        --sku-name GP_Gen5_2 \
-        --ssl-enforcement Disabled \
-        --version 5.7
-    ```
+
+   ```azcli
+   az configure --defaults group=<resource group name> spring-cloud=<service name>
+   ```
+
+1. Create an Azure Database for MySQL server.
+
+   ```azcli
+   az mysql server create --resource-group ${RESOURCE_GROUP} \
+       --name ${MYSQL_SERVER_NAME} \
+       --admin-user ${MYSQL_SERVER_ADMIN_NAME} \
+       --admin-password ${MYSQL_SERVER_ADMIN_PASSWORD} \
+       --sku-name GP_Gen5_2 \
+       --ssl-enforcement Disabled \
+       --version 5.7
+   ```
 
 1. Allow access from Azure resources.
 
-    ```azcli
-    az mysql server firewall-rule create --name allAzureIPs \
-     --server ${MYSQL_SERVER_NAME} \
-     --resource-group ${RESOURCE_GROUP} \
-     --start-ip-address 0.0.0.0 --end-ip-address 0.0.0.0
-    ```
+   ```azcli
+   az mysql server firewall-rule create --name allAzureIPs \
+    --server ${MYSQL_SERVER_NAME} \
+    --resource-group ${RESOURCE_GROUP} \
+    --start-ip-address 0.0.0.0 --end-ip-address 0.0.0.0
+   ```
 
 1. Allow access from your dev machine for testing.
 
-    ```azcli
-    az mysql server firewall-rule create --name devMachine \
-     --server ${MYSQL_SERVER_NAME} \
-     --resource-group ${RESOURCE_GROUP} \
-     --start-ip-address <ip-address-of-your-dev-machine> \
-     --end-ip-address <ip-address-of-your-dev-machine>
-    ```
+   ```azcli
+   az mysql server firewall-rule create --name devMachine \
+    --server ${MYSQL_SERVER_NAME} \
+    --resource-group ${RESOURCE_GROUP} \
+    --start-ip-address <ip-address-of-your-dev-machine> \
+    --end-ip-address <ip-address-of-your-dev-machine>
+   ```
 
 1. Increase connection timeout.
 
-    ```azcli
-    az mysql server configuration set --name wait_timeout \
-     --resource-group ${RESOURCE_GROUP} \
-     --server ${MYSQL_SERVER_NAME} --value 2147483
-    ```
+   ```azcli
+   az mysql server configuration set --name wait_timeout \
+    --resource-group ${RESOURCE_GROUP} \
+    --server ${MYSQL_SERVER_NAME} --value 2147483
+   ```
 
 1. Create database in the MySQL server and set corresponding settings.
 
-    ```sql
-    // SUBSTITUTE values
-    mysql -u ${MYSQL_SERVER_ADMIN_LOGIN_NAME} \
-     -h ${MYSQL_SERVER_FULL_NAME} -P 3306 -p
+   ```sql
+   // SUBSTITUTE values
+   mysql -u ${MYSQL_SERVER_ADMIN_LOGIN_NAME} \
+    -h ${MYSQL_SERVER_FULL_NAME} -P 3306 -p
 
-    Enter password:
-    Welcome to the MySQL monitor.  Commands end with ; or \g.
-    Your MySQL connection id is 64379
-    Server version: 5.6.39.0 MySQL Community Server (GPL)
+   Enter password:
+   Welcome to the MySQL monitor.  Commands end with ; or \g.
+   Your MySQL connection id is 64379
+   Server version: 5.6.39.0 MySQL Community Server (GPL)
 
-    Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
 
-    Oracle is a registered trademark of Oracle Corporation and/or its
-    affiliates. Other names may be trademarks of their respective
-    owners.
+   Oracle is a registered trademark of Oracle Corporation and/or its
+   affiliates. Other names may be trademarks of their respective
+   owners.
 
-    Type 'help;' or '\h' for help. Type '\c' to clear the current input statement.
+   Type 'help;' or '\h' for help. Type '\c' to clear the current input statement.
 
-    mysql> CREATE DATABASE petclinic;
-    Query OK, 1 row affected (0.10 sec)
+   mysql> CREATE DATABASE petclinic;
+   Query OK, 1 row affected (0.10 sec)
 
-    mysql> CREATE USER 'root' IDENTIFIED BY 'petclinic';
-    Query OK, 0 rows affected (0.11 sec)
+   mysql> CREATE USER 'root' IDENTIFIED BY 'petclinic';
+   Query OK, 0 rows affected (0.11 sec)
 
-    mysql> GRANT ALL PRIVILEGES ON petclinic.* TO 'root';
-    Query OK, 0 rows affected (1.29 sec)
+   mysql> GRANT ALL PRIVILEGES ON petclinic.* TO 'root';
+   Query OK, 0 rows affected (1.29 sec)
 
-    mysql> CALL mysql.az_load_timezone();
-    Query OK, 3179 rows affected, 1 warning (6.34 sec)
+   mysql> CALL mysql.az_load_timezone();
+   Query OK, 3179 rows affected, 1 warning (6.34 sec)
 
-    mysql> SELECT name FROM mysql.time_zone_name;
-    ...
+   mysql> SELECT name FROM mysql.time_zone_name;
+   ...
 
-    mysql> quit
-    Bye
-    ```
+   mysql> quit
+   Bye
+   ```
 
 1. Set timezone.
 
-    ```azcli
-    az mysql server configuration set --name time_zone \
-     --resource-group ${RESOURCE_GROUP} \
-     --server ${MYSQL_SERVER_NAME} --value "US/Pacific"
-    ```
+   ```azcli
+   az mysql server configuration set \
+       --resource-group ${RESOURCE_GROUP} \
+       --name time_zone \
+       --server ${MYSQL_SERVER_NAME} \
+       --value "US/Pacific"
+   ```
 
 ## Update Apps to use MySQL database
 
 To enable MySQL as database for the sample app, simply update the *customer-service* app with active profile MySQL and database credentials as environment variables.
 
 ```azcli
-az spring-cloud app update --name customers-service \
+az spring-cloud app update \
+    --name customers-service \
     --jvm-options="-Xms2048m -Xmx2048m -Dspring.profiles.active=mysql" \
-    --env MYSQL_SERVER_FULL_NAME=${MYSQL_SERVER_FULL_NAME} \
+    --env \
+        MYSQL_SERVER_FULL_NAME=${MYSQL_SERVER_FULL_NAME} \
         MYSQL_DATABASE_NAME=${MYSQL_DATABASE_NAME} \
         MYSQL_SERVER_ADMIN_LOGIN_NAME=${MYSQL_SERVER_ADMIN_LOGIN_NAME} \
         MYSQL_SERVER_ADMIN_PASSWORD=${MYSQL_SERVER_ADMIN_PASSWORD}
@@ -144,24 +149,38 @@ az spring-cloud app update --name admin-server \
     --jvm-options="-Xms2048m -Xmx2048m -Dspring.profiles.active=mysql"
 az spring-cloud app update --name customers-service \
     --jvm-options="-Xms2048m -Xmx2048m -Dspring.profiles.active=mysql" \
-    --env MYSQL_SERVER_FULL_NAME=${MYSQL_SERVER_FULL_NAME} \
+    --env \
+        MYSQL_SERVER_FULL_NAME=${MYSQL_SERVER_FULL_NAME} \
         MYSQL_DATABASE_NAME=${MYSQL_DATABASE_NAME} \
         MYSQL_SERVER_ADMIN_LOGIN_NAME=${MYSQL_SERVER_ADMIN_LOGIN_NAME} \
         MYSQL_SERVER_ADMIN_PASSWORD=${MYSQL_SERVER_ADMIN_PASSWORD}
 az spring-cloud app update --name vets-service \
     --jvm-options="-Xms2048m -Xmx2048m -Dspring.profiles.active=mysql" \
-    --env MYSQL_SERVER_FULL_NAME=${MYSQL_SERVER_FULL_NAME} \
+    --env \
+        MYSQL_SERVER_FULL_NAME=${MYSQL_SERVER_FULL_NAME} \
         MYSQL_DATABASE_NAME=${MYSQL_DATABASE_NAME} \
         MYSQL_SERVER_ADMIN_LOGIN_NAME=${MYSQL_SERVER_ADMIN_LOGIN_NAME} \
         MYSQL_SERVER_ADMIN_PASSWORD=${MYSQL_SERVER_ADMIN_PASSWORD}
 az spring-cloud app update --name visits-service \
     --jvm-options="-Xms2048m -Xmx2048m -Dspring.profiles.active=mysql" \
-    --env MYSQL_SERVER_FULL_NAME=${MYSQL_SERVER_FULL_NAME} \
+    --env \
+        MYSQL_SERVER_FULL_NAME=${MYSQL_SERVER_FULL_NAME} \
         MYSQL_DATABASE_NAME=${MYSQL_DATABASE_NAME} \
         MYSQL_SERVER_ADMIN_LOGIN_NAME=${MYSQL_SERVER_ADMIN_LOGIN_NAME} \
         MYSQL_SERVER_ADMIN_PASSWORD=${MYSQL_SERVER_ADMIN_PASSWORD}
 ```
 
+## Clean up resources
+
+If you plan to continue working with subsequent quickstarts and tutorials, you might want to leave these resources in place. When no longer needed, delete the resource group, which deletes the resources in the resource group. To delete the resource group by using Azure CLI, use the following commands:
+
+```azurecli
+echo "Enter the Resource Group name:" &&
+read resourceGroupName &&
+az group delete --name $resourceGroupName &&
+echo "Press [ENTER] to continue ..."
+```
+
 ## Next steps
 
 * [Bind an Azure Database for MySQL instance to your application in Azure Spring Cloud](how-to-bind-mysql.md)

articles/spring-cloud/quickstart-integrate-azure-database-mysql.md

@@ -232,10 +232,13 @@ Select an exception to see the end-to-end transaction and stacktrace in context:
 
 ## Clean up resources
 
-In these quickstarts, you created Azure resources that will continue to accrue charges if they remain in your subscription. If you don't expect to need these resources in the future, delete the resource group by using the portal or by running the following command in the Cloud Shell:
+If you plan to continue working with subsequent quickstarts and tutorials, you might want to leave these resources in place. When no longer needed, delete the resource group, which deletes the resources in the resource group. To delete the resource group by using Azure CLI, use the following commands:
 
 ```azurecli
-az group delete --name <your resource group name; for example: helloworld-1558400876966-rg> --yes
+echo "Enter the Resource Group name:" &&
+read resourceGroupName &&
+az group delete --name $resourceGroupName &&
+echo "Press [ENTER] to continue ..."
 ```
 
 In an earlier quickstart, you also set the default resource group name. If you don't intend to continue to the next quickstart, clear out that default by running the following CLI command:
@@ -249,8 +252,5 @@ az config set defaults.group=
 To explore more monitoring capabilities of Azure Spring Cloud, see:
 
 > [!div class="nextstepaction"]
-> [Diagnostic services](diagnostic-services.md)
->
-> [Distributed tracing](./how-to-distributed-tracing.md)
->
-> [Stream logs in real time](./how-to-log-streaming.md)
+> [Analyze logs and metrics with diagnostics settings](diagnostic-services.md)>
+> [Stream Azure Spring Cloud app logs in real-time](./how-to-log-streaming.md)