Skip to content

Commit 9689044

Browse files
committed
edits, added redir
1 parent 1080a9c commit 9689044

10 files changed

+133
-62
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@
1919
"source_path": "how-to-enterprise-deploy-non-java-apps.md",
2020
"redirect_url": "/azure/spring-apps/how-to-enterprise-deploy-polyglot-apps",
2121
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "how-to-distributed-tracing.md",
25+
"redirect_url": "/azure/spring-apps/how-to-application-insights",
26+
"redirect_document_id": false
2227
}
2328
]
2429
}

articles/spring-apps/faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ zone_pivot_groups: programming-languages-spring-apps
1515
> [!NOTE]
1616
> 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.
1717
18-
**This article applies to:** ✔️ Basic/Standard tier ✔️ Enterprise tier
18+
**This article applies to:** ✔️ Basic/Standard ✔️ Enterprise
1919

2020
This article answers frequently asked questions about Azure Spring Apps.
2121

articles/spring-apps/how-to-application-insights.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ zone_pivot_groups: spring-apps-tier-selection
1515
> [!NOTE]
1616
> 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.
1717
18-
**This article applies to:** ✔️ Standard consumption (Preview) ✔️ Basic/Standard tier ❌️ Enterprise tier
18+
**This article applies to:** ✔️ Standard consumption (Preview) ✔️ Basic/Standard ❌️ Enterprise
1919

2020
This article explains how to monitor applications by using the Application Insights Java agent in Azure Spring Apps.
2121

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.custom: devx-track-java, devx-track-azurecli, event-tier1-build-2022, engagem
1616
1717
**This article applies to:** ✔️ Java ✔️ C#
1818

19-
**This article applies to:** ✔️ Basic/Standard tier ❌ Enterprise tier
19+
**This article applies to:** ✔️ Basic/Standard ❌ Enterprise
2020

2121
Azure Spring Apps provides two types of built-in storage for your application: persistent and temporary.
2222

@@ -67,26 +67,26 @@ Other operations:
6767

6868
- To create an app with built-in persistent storage enabled:
6969

70-
```azurecli
71-
az spring app create -n <app> -g <resource-group> -s <service-name> --enable-persistent-storage true
72-
```
70+
```azurecli
71+
az spring app create -n <app> -g <resource-group> -s <service-name> --enable-persistent-storage true
72+
```
7373

7474
- To enable built-in persistent storage for an existing app:
7575

76-
```azurecli
77-
az spring app update -n <app> -g <resource-group> -s <service-name> --enable-persistent-storage true
78-
```
76+
```azurecli
77+
az spring app update -n <app> -g <resource-group> -s <service-name> --enable-persistent-storage true
78+
```
7979

8080
- To disable built-in persistent storage in an existing app:
8181

82-
```azurecli
83-
az spring app update -n <app> -g <resource-group> -s <service-name> --enable-persistent-storage false
84-
```
82+
```azurecli
83+
az spring app update -n <app> -g <resource-group> -s <service-name> --enable-persistent-storage false
84+
```
8585

8686
---
8787

8888
> [!WARNING]
89-
> If you disable an applications' persistent storage, all of that storage is deallocated and all of the stored data is permanently lost.
89+
> If you disable an application's persistent storage, all of that storage is deallocated and all of the stored data is permanently lost.
9090
9191
## Next steps
9292

articles/spring-apps/how-to-circuit-breaker-metrics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.custom: devx-track-java, devx-track-azurecli, event-tier1-build-2022
1414
> [!NOTE]
1515
> 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.
1616
17-
**This article applies to:** ✔️ Basic/Standard tier ✔️ Enterprise tier
17+
**This article applies to:** ✔️ Basic/Standard ✔️ Enterprise
1818

1919
This article shows you how to collect Spring Cloud Resilience4j Circuit Breaker Metrics with Application Insights Java in-process agent. With this feature, you can monitor the metrics of Resilience4j circuit breaker from Application Insights with Micrometer.
2020

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.devlang: azurecli
1515
> [!NOTE]
1616
> 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.
1717
18-
**This article applies to:** ✔️ Standard consumption (Preview) ✔️ Basic/Standard tier ❌️ Enterprise tier
18+
**This article applies to:** ✔️ Standard consumption (Preview) ✔️ Basic/Standard ❌️ Enterprise
1919

2020
This article shows you how to use Dynatrace OneAgent to monitor Spring Boot applications in Azure Spring Apps.
2121

articles/spring-apps/how-to-new-relic-monitor.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.devlang: azurecli
1616
> [!NOTE]
1717
> 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.
1818
19-
**This article applies to:** ✔️ Standard consumption (Preview) ✔️ Basic/Standard tier ✔️ Enterprise tier
19+
**This article applies to:** ✔️ Standard consumption (Preview) ✔️ Basic/Standard ✔️ Enterprise
2020

2121
This article shows you how to monitor of Spring Boot applications in Azure Spring Apps with the New Relic Java agent.
2222

articles/spring-apps/how-to-staging-environment.md

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.custom: devx-track-java, devx-track-azurecli, event-tier1-build-2022
1616
1717
**This article applies to:** ✔️ Java ❌ C#
1818

19-
**This article applies to:** ✔️ Basic/Standard tier ✔️ Enterprise tier
19+
**This article applies to:** ✔️ Basic/Standard ✔️ Enterprise
2020

2121
This article explains how to set up a staging deployment by using the blue-green deployment pattern in Azure Spring Apps. Blue-green deployment is an Azure DevOps continuous delivery pattern that relies on keeping an existing (blue) version live while a new (green) one is deployed. This article shows you how to put that staging deployment into production without changing the production deployment.
2222

@@ -76,13 +76,22 @@ To build the application, follow these steps:
7676
1. Create the app in your Azure Spring Apps instance:
7777

7878
```azurecli
79-
az spring app create -n demo -g <resourceGroup> -s <Azure Spring Apps instance> --runtime-version Java_17 --assign-endpoint
79+
az spring app create \
80+
--resource-group <resource-group-name> \
81+
--service <Azure-Spring-Apps-instance-name> \
82+
--name demo \
83+
--runtime-version Java_17 \
84+
--assign-endpoint
8085
```
8186

8287
1. Deploy the app to Azure Spring Apps:
8388

8489
```azurecli
85-
az spring app deploy -n demo -g <resourceGroup> -s <Azure Spring Apps instance> --artifact-path target\hellospring-0.0.1-SNAPSHOT.jar
90+
az spring app deploy \
91+
--resource-group <resource-group-name> \
92+
--service <Azure-Spring-Apps-instance-name> \
93+
--name demo \
94+
--artifact-path target\hellospring-0.0.1-SNAPSHOT.jar
8695
```
8796

8897
1. Modify the code for your staging deployment:
@@ -114,7 +123,13 @@ To build the application, follow these steps:
114123
1. Create the green deployment:
115124

116125
```azurecli
117-
az spring app deployment create -n green --app demo -g <resourceGroup> -s <Azure Spring Apps instance> --runtime-version Java_17 --artifact-path target\hellospring-0.0.1-SNAPSHOT.jar
126+
az spring app deployment create \
127+
--resource-group <resource-group-name> \
128+
--service <Azure-Spring-Apps-instance-name> \
129+
--app demo \
130+
--name green \
131+
--runtime-version Java_17 \
132+
--artifact-path target\hellospring-0.0.1-SNAPSHOT.jar
118133
```
119134

120135
## View apps and deployments
@@ -175,7 +190,12 @@ If you visit your public-facing app gateway at this point, you should see the ol
175190
If you're not satisfied with your change, you can modify your application code, build a new .jar package, and upload it to your green deployment by using the Azure CLI:
176191

177192
```azurecli
178-
az spring app deploy -g <resource-group-name> -s <service-instance-name> -n gateway -d green --jar-path gateway.jar
193+
az spring app deploy \
194+
--resource-group <resource-group-name> \
195+
--service <service-instance-name> \
196+
--name gateway \
197+
--deployment green \
198+
--jar-path gateway.jar
179199
```
180200

181201
## Delete the staging deployment
@@ -185,7 +205,11 @@ To delete your staging deployment from the Azure portal, go to the page for your
185205
Alternatively, delete your staging deployment from the Azure CLI by running the following command:
186206

187207
```azurecli
188-
az spring app deployment delete -n <staging-deployment-name> -g <resource-group-name> -s <service-instance-name> --app gateway
208+
az spring app deployment delete \
209+
--resource-group <resource-group-name> \
210+
--service <service-instance-name> \
211+
--name <staging-deployment-name> \
212+
--app gateway
189213
```
190214

191215
## Next steps

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

Lines changed: 60 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ zone_pivot_groups: programming-languages-spring-apps
1515
> [!NOTE]
1616
> 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.
1717
18-
**This article applies to:** ✔️ Basic/Standard tier ❌ Enterprise tier
18+
**This article applies to:** ✔️ Basic/Standard ❌ Enterprise
1919

2020
::: zone pivot="programming-language-csharp"
2121

@@ -99,7 +99,11 @@ Use the following steps to deploy the PlanetWeatherProvider project.
9999
Make sure that the command prompt is in the project folder before running the following command.
100100
101101
```azurecli
102-
az spring app deploy -n planet-weather-provider --runtime-version NetCore_31 --main-entry Microsoft.Azure.SpringCloud.Sample.PlanetWeatherProvider.dll --artifact-path ./publish-deploy-planet.zip
102+
az spring app deploy \
103+
--name planet-weather-provider \
104+
--runtime-version NetCore_31 \
105+
--main-entry Microsoft.Azure.SpringCloud.Sample.PlanetWeatherProvider.dll \
106+
--artifact-path ./publish-deploy-planet.zip
103107
```
104108
105109
The `--main-entry` option specifies the relative path from the *.zip* file's root folder to the *.dll* file that contains the application's entry point. After the service uploads the *.zip* file, it extracts all the files and folders, and then tries to execute the entry point in the specified *.dll* file.
@@ -135,7 +139,11 @@ Use the following steps to deploy the SolarSystemWeather project.
135139
1. Deploy the project to Azure.
136140

137141
```azurecli
138-
az spring app deploy -n solar-system-weather --runtime-version NetCore_31 --main-entry Microsoft.Azure.SpringCloud.Sample.SolarSystemWeather.dll --artifact-path ./publish-deploy-solar.zip
142+
az spring app deploy \
143+
--name solar-system-weather \
144+
--runtime-version NetCore_31 \
145+
--main-entry Microsoft.Azure.SpringCloud.Sample.SolarSystemWeather.dll \
146+
--artifact-path ./publish-deploy-solar.zip
139147
```
140148

141149
This command may take several minutes to run.
@@ -147,15 +155,15 @@ Before testing the application, get a public endpoint for an HTTP GET request to
147155
1. Run the following command to assign the endpoint.
148156

149157
```azurecli
150-
az spring app update -n solar-system-weather --assign-endpoint true
158+
az spring app update --name solar-system-weather --assign-endpoint true
151159
```
152160

153161
1. Run the following command to get the URL of the endpoint.
154162

155163
Windows:
156164

157165
```azurecli
158-
az spring app show -n solar-system-weather -o table
166+
az spring app show --name solar-system-weather --output table
159167
```
160168

161169
Linux:
@@ -198,7 +206,7 @@ This article explains how to build and deploy Spring applications to Azure Sprin
198206

199207
Use the following commands to clone the sample repository, navigate to the sample folder, and then build the project.
200208

201-
```azurecli
209+
```bash
202210
git clone https://github.com/azure-samples/spring-petclinic-microservices
203211
cd spring-petclinic-microservices
204212
mvn clean package -DskipTests -Denv=cloud
@@ -219,8 +227,17 @@ Use the following steps to create and deploys apps on Azure Spring Apps using th
219227
1. Create the two core Spring applications for PetClinic: API gateway and customers-service.
220228

221229
```azurecli
222-
az spring app create --name api-gateway --runtime-version Java_17 --instance-count 1 --memory 2Gi --assign-endpoint
223-
az spring app create --name customers-service --runtime-version Java_17 --instance-count 1 --memory 2Gi
230+
az spring app create \
231+
--name api-gateway \
232+
--runtime-version Java_17 \
233+
--instance-count 1 \
234+
--memory 2Gi \
235+
--assign-endpoint
236+
az spring app create \
237+
--name customers-service \
238+
--runtime-version Java_17 \
239+
--instance-count 1 \
240+
--memory 2Gi
224241
```
225242

226243
1. Deploy the JAR files built in the previous step.
@@ -265,12 +282,37 @@ Access the app gateway and customers service from browser with the **Public Url*
265282
To get the PetClinic app functioning with all features like Admin Server, Visits, and Veterinarians, deploy the other apps with following commands:
266283

267284
```azurecli
268-
az spring app create --name admin-server --runtime-version Java_17 --instance-count 1 --memory 2Gi --assign-endpoint
269-
az spring app create --name vets-service --runtime-version Java_17 --instance-count 1 --memory 2Gi
270-
az spring app create --name visits-service --runtime-version Java_17 --instance-count 1 --memory 2Gi
271-
az spring app deploy --name admin-server --runtime-version Java_17 --jar-path spring-petclinic-admin-server/target/spring-petclinic-admin-server-3.0.1.jar --jvm-options="-Xms1536m -Xmx1536m"
272-
az spring app deploy --name vets-service --runtime-version Java_17 --jar-path spring-petclinic-vets-service/target/spring-petclinic-vets-service-3.0.1.jar --jvm-options="-Xms1536m -Xmx1536m"
273-
az spring app deploy --name visits-service --runtime-version Java_17 --jar-path spring-petclinic-visits-service/target/spring-petclinic-visits-service-3.0.1.jar --jvm-options="-Xms1536m -Xmx1536m"
285+
az spring app create \
286+
--name admin-server \
287+
--runtime-version Java_17 \
288+
--instance-count 1 \
289+
--memory 2Gi \
290+
--assign-endpoint
291+
az spring app create \
292+
--name vets-service \
293+
--runtime-version Java_17 \
294+
--instance-count 1 \
295+
--memory 2Gi
296+
az spring app create \
297+
--name visits-service \
298+
--runtime-version Java_17 \
299+
--instance-count 1 \
300+
--memory 2Gi
301+
az spring app deploy \
302+
--name admin-server \
303+
--runtime-version Java_17 \
304+
--jar-path spring-petclinic-admin-server/target/spring-petclinic-admin-server-3.0.1.jar \
305+
--jvm-options="-Xms1536m -Xmx1536m"
306+
az spring app deploy \
307+
--name vets-service \
308+
--runtime-version Java_17 \
309+
--jar-path spring-petclinic-vets-service/target/spring-petclinic-vets-service-3.0.1.jar \
310+
--jvm-options="-Xms1536m -Xmx1536m"
311+
az spring app deploy \
312+
--name visits-service \
313+
--runtime-version Java_17 \
314+
--jar-path spring-petclinic-visits-service/target/spring-petclinic-visits-service-3.0.1.jar \
315+
--jvm-options="-Xms1536m -Xmx1536m"
274316
```
275317

276318
#### [Maven](#tab/Maven)
@@ -279,7 +321,7 @@ az spring app deploy --name visits-service --runtime-version Java_17 --jar-path
279321

280322
Use the following commands to clone the sample repository, navigate to the sample folder, and then build the project.
281323

282-
```azurecli
324+
```bash
283325
git clone https://github.com/azure-samples/spring-petclinic-microservices
284326
cd spring-petclinic-microservices
285327
mvn clean package -DskipTests -Denv=cloud
@@ -293,7 +335,7 @@ The following steps show you how to generate configurations and deploy to Azure
293335

294336
1. Generate configurations by running the following command in the root folder of Pet Clinic containing the parent POM. If you've already signed-in with Azure CLI, the command automatically picks up the credentials. Otherwise, it signs you in with prompt instructions. For more information, see our [wiki page](https://github.com/microsoft/azure-maven-plugins/wiki/Authentication).
295337

296-
```azurecli
338+
```bash
297339
mvn com.microsoft.azure:azure-spring-apps-maven-plugin:1.10.0:config
298340
```
299341

@@ -323,12 +365,12 @@ The following steps show you how to generate configurations and deploy to Azure
323365

324366
- api-gateway
325367
- customers-service
326-
368+
327369
Remove any prefix if needed, and save the file.
328370

329371
1. The POM now contains the plugin dependencies and configurations. Deploy the apps using the following command.
330372

331-
```azurecli
373+
```bash
332374
mvn azure-spring-apps:deploy
333375
```
334376

articles/spring-apps/quickstart-sample-app-introduction.md

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ zone_pivot_groups: programming-languages-spring-apps
1818
> [!NOTE]
1919
> 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.
2020
21-
**This article applies to:** ✔️ Basic/Standard tier ❌️ Enterprise tier
21+
**This article applies to:** ✔️ Basic/Standard ❌️ Enterprise
2222

2323
::: zone pivot="programming-language-csharp"
2424

@@ -30,30 +30,30 @@ The sample app is composed of two Spring apps:
3030

3131
* The `planet-weather-provider` service returns weather text in response to an HTTP request that specifies the planet name. For example, it may return "very warm" for planet Mercury. It gets the weather data from the Config server. The Config server gets the weather data from a YAML file in a Git repository, for example:
3232

33-
```yaml
34-
MercuryWeather: very warm
35-
VenusWeather: quite unpleasant
36-
MarsWeather: very cool
37-
SaturnWeather: a little bit sandy
38-
```
33+
```yaml
34+
MercuryWeather: very warm
35+
VenusWeather: quite unpleasant
36+
MarsWeather: very cool
37+
SaturnWeather: a little bit sandy
38+
```
3939
4040
* The `solar-system-weather` service returns data for four planets in response to an HTTP request. It gets the data by making four HTTP requests to `planet-weather-provider`. It uses the Eureka server discovery service to call `planet-weather-provider`. It returns JSON, for example:
4141

42-
```json
43-
[{
44-
"Key": "Mercury",
45-
"Value": "very warm"
46-
}, {
47-
"Key": "Venus",
48-
"Value": "quite unpleasant"
49-
}, {
50-
"Key": "Mars",
51-
"Value": "very cool"
52-
}, {
53-
"Key": "Saturn",
54-
"Value": "a little bit sandy"
55-
}]
56-
```
42+
```json
43+
[{
44+
"Key": "Mercury",
45+
"Value": "very warm"
46+
}, {
47+
"Key": "Venus",
48+
"Value": "quite unpleasant"
49+
}, {
50+
"Key": "Mars",
51+
"Value": "very cool"
52+
}, {
53+
"Key": "Saturn",
54+
"Value": "a little bit sandy"
55+
}]
56+
```
5757

5858
The following diagram illustrates the sample app architecture:
5959

0 commit comments

Comments
 (0)