Skip to content

Commit 4b97149

Browse files
KarlEricksonKarlErickson
committed
fixed spacing; made clean-up sections consistent
1 parent 8b9b689 commit 4b97149

13 files changed

+221
-142
lines changed

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

-315 KB
Binary file not shown.

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -136,15 +136,14 @@ Access the `api gateway` and `customers service` applications from the browser u
136136

137137
## Clean up resources
138138

139-
1. Open the [Azure portal](https://ms.portal.azure.com/?AppPlatformExtension=entdf#home), then delete the service instance as in the following screenshot.
139+
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:
140140

141-
![Delete an instance image](./media/enterprise/getting-started-enterprise/service-instance-delete-instance.png)
142-
143-
1. Run the following command to remove the preview version of the Azure CLI extension.
144-
145-
```azurecli
146-
az extension remove --name spring-cloud
147-
```
141+
```azurecli
142+
echo "Enter the Resource Group name:" &&
143+
read resourceGroupName &&
144+
az group delete --name $resourceGroupName &&
145+
echo "Press [ENTER] to continue ..."
146+
```
148147

149148
## Next steps
150149

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

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -415,9 +415,18 @@ Other Spring applications included in this sample can be deployed similarly.
415415

416416
::: zone-end
417417

418-
## Next steps
418+
## Clean up resources
419+
420+
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:
421+
422+
```azurecli
423+
echo "Enter the Resource Group name:" &&
424+
read resourceGroupName &&
425+
az group delete --name $resourceGroupName &&
426+
echo "Press [ENTER] to continue ..."
427+
```
419428

420-
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:
429+
## Next steps
421430

422431
> [!div class="nextstepaction"]
423-
> [Set up Log Analytics](./quickstart-setup-log-analytics.md)
432+
> [Quickstart: Set up a Log Analytics workspace](quickstart-setup-log-analytics.md)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ You can either use the Azure portal to check the deployed resources, or use Azur
154154

155155
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:
156156

157-
```azurecli-interactive
157+
```azurecli
158158
echo "Enter the Resource Group name:" &&
159159
read resourceGroupName &&
160160
az group delete --name $resourceGroupName &&

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

Lines changed: 89 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ Pet Clinic, as deployed in the default configuration [Quickstart: Build and depl
1717

1818
## Variables preparation
1919

20-
We will use the following values. Save them in a text file or environment variables to avoid errors.
21-
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.).
20+
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.).
2221

2322
```bash
2423
export RESOURCE_GROUP=<resource-group-name> # customize this
@@ -33,103 +32,109 @@ export MYSQL_DATABASE_NAME=petclinic
3332
## Prepare an Azure Database for MySQL instance
3433

3534
1. If you didn't run the following commands in the previous quickstarts, set the CLI defaults.
36-
```azcli
37-
az configure --defaults group=<resource group name> spring-cloud=<service name>
38-
```
39-
1. Create an Azure Database for MySQL server.
40-
41-
```azcli
42-
az mysql server create --resource-group ${RESOURCE_GROUP} \
43-
--name ${MYSQL_SERVER_NAME} \
44-
--admin-user ${MYSQL_SERVER_ADMIN_NAME} \
45-
--admin-password ${MYSQL_SERVER_ADMIN_PASSWORD} \
46-
--sku-name GP_Gen5_2 \
47-
--ssl-enforcement Disabled \
48-
--version 5.7
49-
```
35+
36+
```azcli
37+
az configure --defaults group=<resource group name> spring-cloud=<service name>
38+
```
39+
40+
1. Create an Azure Database for MySQL server.
41+
42+
```azcli
43+
az mysql server create --resource-group ${RESOURCE_GROUP} \
44+
--name ${MYSQL_SERVER_NAME} \
45+
--admin-user ${MYSQL_SERVER_ADMIN_NAME} \
46+
--admin-password ${MYSQL_SERVER_ADMIN_PASSWORD} \
47+
--sku-name GP_Gen5_2 \
48+
--ssl-enforcement Disabled \
49+
--version 5.7
50+
```
5051

5152
1. Allow access from Azure resources.
5253

53-
```azcli
54-
az mysql server firewall-rule create --name allAzureIPs \
55-
--server ${MYSQL_SERVER_NAME} \
56-
--resource-group ${RESOURCE_GROUP} \
57-
--start-ip-address 0.0.0.0 --end-ip-address 0.0.0.0
58-
```
54+
```azcli
55+
az mysql server firewall-rule create --name allAzureIPs \
56+
--server ${MYSQL_SERVER_NAME} \
57+
--resource-group ${RESOURCE_GROUP} \
58+
--start-ip-address 0.0.0.0 --end-ip-address 0.0.0.0
59+
```
5960

6061
1. Allow access from your dev machine for testing.
6162

62-
```azcli
63-
az mysql server firewall-rule create --name devMachine \
64-
--server ${MYSQL_SERVER_NAME} \
65-
--resource-group ${RESOURCE_GROUP} \
66-
--start-ip-address <ip-address-of-your-dev-machine> \
67-
--end-ip-address <ip-address-of-your-dev-machine>
68-
```
63+
```azcli
64+
az mysql server firewall-rule create --name devMachine \
65+
--server ${MYSQL_SERVER_NAME} \
66+
--resource-group ${RESOURCE_GROUP} \
67+
--start-ip-address <ip-address-of-your-dev-machine> \
68+
--end-ip-address <ip-address-of-your-dev-machine>
69+
```
6970

7071
1. Increase connection timeout.
7172

72-
```azcli
73-
az mysql server configuration set --name wait_timeout \
74-
--resource-group ${RESOURCE_GROUP} \
75-
--server ${MYSQL_SERVER_NAME} --value 2147483
76-
```
73+
```azcli
74+
az mysql server configuration set --name wait_timeout \
75+
--resource-group ${RESOURCE_GROUP} \
76+
--server ${MYSQL_SERVER_NAME} --value 2147483
77+
```
7778

7879
1. Create database in the MySQL server and set corresponding settings.
7980

80-
```sql
81-
// SUBSTITUTE values
82-
mysql -u ${MYSQL_SERVER_ADMIN_LOGIN_NAME} \
83-
-h ${MYSQL_SERVER_FULL_NAME} -P 3306 -p
81+
```sql
82+
// SUBSTITUTE values
83+
mysql -u ${MYSQL_SERVER_ADMIN_LOGIN_NAME} \
84+
-h ${MYSQL_SERVER_FULL_NAME} -P 3306 -p
8485

85-
Enter password:
86-
Welcome to the MySQL monitor. Commands end with ; or \g.
87-
Your MySQL connection id is 64379
88-
Server version: 5.6.39.0 MySQL Community Server (GPL)
86+
Enter password:
87+
Welcome to the MySQL monitor. Commands end with ; or \g.
88+
Your MySQL connection id is 64379
89+
Server version: 5.6.39.0 MySQL Community Server (GPL)
8990

90-
Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
91+
Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
9192

92-
Oracle is a registered trademark of Oracle Corporation and/or its
93-
affiliates. Other names may be trademarks of their respective
94-
owners.
93+
Oracle is a registered trademark of Oracle Corporation and/or its
94+
affiliates. Other names may be trademarks of their respective
95+
owners.
9596

96-
Type 'help;' or '\h' for help. Type '\c' to clear the current input statement.
97+
Type 'help;' or '\h' for help. Type '\c' to clear the current input statement.
9798

98-
mysql> CREATE DATABASE petclinic;
99-
Query OK, 1 row affected (0.10 sec)
99+
mysql> CREATE DATABASE petclinic;
100+
Query OK, 1 row affected (0.10 sec)
100101

101-
mysql> CREATE USER 'root' IDENTIFIED BY 'petclinic';
102-
Query OK, 0 rows affected (0.11 sec)
102+
mysql> CREATE USER 'root' IDENTIFIED BY 'petclinic';
103+
Query OK, 0 rows affected (0.11 sec)
103104

104-
mysql> GRANT ALL PRIVILEGES ON petclinic.* TO 'root';
105-
Query OK, 0 rows affected (1.29 sec)
105+
mysql> GRANT ALL PRIVILEGES ON petclinic.* TO 'root';
106+
Query OK, 0 rows affected (1.29 sec)
106107

107-
mysql> CALL mysql.az_load_timezone();
108-
Query OK, 3179 rows affected, 1 warning (6.34 sec)
108+
mysql> CALL mysql.az_load_timezone();
109+
Query OK, 3179 rows affected, 1 warning (6.34 sec)
109110

110-
mysql> SELECT name FROM mysql.time_zone_name;
111-
...
111+
mysql> SELECT name FROM mysql.time_zone_name;
112+
...
112113

113-
mysql> quit
114-
Bye
115-
```
114+
mysql> quit
115+
Bye
116+
```
116117

117118
1. Set timezone.
118119

119-
```azcli
120-
az mysql server configuration set --name time_zone \
121-
--resource-group ${RESOURCE_GROUP} \
122-
--server ${MYSQL_SERVER_NAME} --value "US/Pacific"
123-
```
120+
```azcli
121+
az mysql server configuration set \
122+
--resource-group ${RESOURCE_GROUP} \
123+
--name time_zone \
124+
--server ${MYSQL_SERVER_NAME} \
125+
--value "US/Pacific"
126+
```
124127

125128
## Update Apps to use MySQL database
126129

127130
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.
128131

129132
```azcli
130-
az spring-cloud app update --name customers-service \
133+
az spring-cloud app update \
134+
--name customers-service \
131135
--jvm-options="-Xms2048m -Xmx2048m -Dspring.profiles.active=mysql" \
132-
--env MYSQL_SERVER_FULL_NAME=${MYSQL_SERVER_FULL_NAME} \
136+
--env \
137+
MYSQL_SERVER_FULL_NAME=${MYSQL_SERVER_FULL_NAME} \
133138
MYSQL_DATABASE_NAME=${MYSQL_DATABASE_NAME} \
134139
MYSQL_SERVER_ADMIN_LOGIN_NAME=${MYSQL_SERVER_ADMIN_LOGIN_NAME} \
135140
MYSQL_SERVER_ADMIN_PASSWORD=${MYSQL_SERVER_ADMIN_PASSWORD}
@@ -144,24 +149,38 @@ az spring-cloud app update --name admin-server \
144149
--jvm-options="-Xms2048m -Xmx2048m -Dspring.profiles.active=mysql"
145150
az spring-cloud app update --name customers-service \
146151
--jvm-options="-Xms2048m -Xmx2048m -Dspring.profiles.active=mysql" \
147-
--env MYSQL_SERVER_FULL_NAME=${MYSQL_SERVER_FULL_NAME} \
152+
--env \
153+
MYSQL_SERVER_FULL_NAME=${MYSQL_SERVER_FULL_NAME} \
148154
MYSQL_DATABASE_NAME=${MYSQL_DATABASE_NAME} \
149155
MYSQL_SERVER_ADMIN_LOGIN_NAME=${MYSQL_SERVER_ADMIN_LOGIN_NAME} \
150156
MYSQL_SERVER_ADMIN_PASSWORD=${MYSQL_SERVER_ADMIN_PASSWORD}
151157
az spring-cloud app update --name vets-service \
152158
--jvm-options="-Xms2048m -Xmx2048m -Dspring.profiles.active=mysql" \
153-
--env MYSQL_SERVER_FULL_NAME=${MYSQL_SERVER_FULL_NAME} \
159+
--env \
160+
MYSQL_SERVER_FULL_NAME=${MYSQL_SERVER_FULL_NAME} \
154161
MYSQL_DATABASE_NAME=${MYSQL_DATABASE_NAME} \
155162
MYSQL_SERVER_ADMIN_LOGIN_NAME=${MYSQL_SERVER_ADMIN_LOGIN_NAME} \
156163
MYSQL_SERVER_ADMIN_PASSWORD=${MYSQL_SERVER_ADMIN_PASSWORD}
157164
az spring-cloud app update --name visits-service \
158165
--jvm-options="-Xms2048m -Xmx2048m -Dspring.profiles.active=mysql" \
159-
--env MYSQL_SERVER_FULL_NAME=${MYSQL_SERVER_FULL_NAME} \
166+
--env \
167+
MYSQL_SERVER_FULL_NAME=${MYSQL_SERVER_FULL_NAME} \
160168
MYSQL_DATABASE_NAME=${MYSQL_DATABASE_NAME} \
161169
MYSQL_SERVER_ADMIN_LOGIN_NAME=${MYSQL_SERVER_ADMIN_LOGIN_NAME} \
162170
MYSQL_SERVER_ADMIN_PASSWORD=${MYSQL_SERVER_ADMIN_PASSWORD}
163171
```
164172

173+
## Clean up resources
174+
175+
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:
176+
177+
```azurecli
178+
echo "Enter the Resource Group name:" &&
179+
read resourceGroupName &&
180+
az group delete --name $resourceGroupName &&
181+
echo "Press [ENTER] to continue ..."
182+
```
183+
165184
## Next steps
166185

167186
* [Bind an Azure Database for MySQL instance to your application in Azure Spring Cloud](how-to-bind-mysql.md)

‎articles/spring-cloud/quickstart-logs-metrics-tracing.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -232,10 +232,13 @@ Select an exception to see the end-to-end transaction and stacktrace in context:
232232

233233
## Clean up resources
234234

235-
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:
235+
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:
236236

237237
```azurecli
238-
az group delete --name <your resource group name; for example: helloworld-1558400876966-rg> --yes
238+
echo "Enter the Resource Group name:" &&
239+
read resourceGroupName &&
240+
az group delete --name $resourceGroupName &&
241+
echo "Press [ENTER] to continue ..."
239242
```
240243

241244
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=
249252
To explore more monitoring capabilities of Azure Spring Cloud, see:
250253

251254
> [!div class="nextstepaction"]
252-
> [Diagnostic services](diagnostic-services.md)
253-
>
254-
> [Distributed tracing](./how-to-distributed-tracing.md)
255-
>
256-
> [Stream logs in real time](./how-to-log-streaming.md)
255+
> [Analyze logs and metrics with diagnostics settings](diagnostic-services.md)>
256+
> [Stream Azure Spring Cloud app logs in real-time](./how-to-log-streaming.md)

‎articles/spring-cloud/quickstart-provision-service-instance-enterprise.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,17 @@ It takes about 5 minutes to finish the resource provisioning.
108108

109109
---
110110

111+
## Clean up resources
112+
113+
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:
114+
115+
```azurecli
116+
echo "Enter the Resource Group name:" &&
117+
read resourceGroupName &&
118+
az group delete --name $resourceGroupName &&
119+
echo "Press [ENTER] to continue ..."
120+
```
121+
111122
## Next steps
112123

113124
> [!div class="nextstepaction"]

0 commit comments

Comments
 (0)