Skip to content

Commit ae609ad

Browse files
authored
Merge pull request #264270 from KarlErickson/karler-text-fixes
miscellaneous fixes
2 parents 74793d3 + 2d064b5 commit ae609ad

15 files changed

+34
-38
lines changed

articles/spring-apps/concept-app-customer-responsibilities.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Version support for Java, Spring Boot, and more
33
titleSuffix: Azure Spring Apps
4-
description: This article describes customer responsibilities developing Azure Spring Apps.
4+
description: This article describes the version support for Java, Spring Boot, and Spring Cloud, and the customer responsibilities when developing Azure Spring Apps.
55
author: KarlErickson
66
ms.author: zhiyongli
77
ms.service: spring-apps

articles/spring-apps/how-to-configure-health-probes-graceful-termination.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ Use the following steps to customize your application using Azure CLI.
200200

201201
Use the following best practices when adding health probes to Azure Spring Apps:
202202

203-
- Use liveness and readiness probes together. Azure Spring Apps provides two approaches for service discovery at the same time. When the readiness probe fails, the app instance is removed only from Kubernetes service discovery. A properly configured liveness probe can remove the issued app instance from Eureka service discovery to avoid unexpected cases. For more information about service discovery, see [Discover and register your Spring Boot applications](how-to-service-registration.md).
203+
- Use liveness and readiness probes together. Azure Spring Apps provides two approaches for service discovery at the same time. When the readiness probe fails, the app instance is removed only from Kubernetes service discovery. A properly configured liveness probe can remove the issued app instance from Eureka service discovery to avoid unexpected cases. For more information about service discovery, see [Discover and register your Spring Boot applications](how-to-service-registration.md). For more information about service discovery with the Enterprise plan, see [Use Tanzu Service Registry](how-to-enterprise-service-registry.md).
204204

205205
- When an app instance starts, the first check occurs after the delay specified by `initialDelaySeconds`. Subsequent checks occur periodically, according to the period length specified by `periodSeconds`. If the app fails to respond to the requests for several times as specified by `failureThreshold`, the app instance is restarted. Make sure your application can start fast enough, or update these parameters, so that the total timeout `initialDelaySeconds + periodSeconds * failureThreshold` is longer than the start time of your application.
206206

articles/spring-apps/how-to-custom-persistent-storage-with-standard-consumption.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ You can also mount your own persistent storage not only to Azure Spring Apps but
3131
- An Azure subscription. If you don't have a subscription, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
3232
- [Azure CLI](/cli/azure/install-azure-cli) version 2.45.0 or higher.
3333
- An Azure Spring Apps Standard consumption and dedicated plan service instance. For more information, see [Quickstart: Provision an Azure Spring Apps Standard consumption and dedicated plan service instance](quickstart-provision-standard-consumption-service-instance.md).
34-
- A Spring app deployed to Azure Spring Apps. For more information, see [Quickstart: Build and deploy apps to Azure Spring Apps](quickstart-deploy-apps.md).
34+
- A Spring app deployed to Azure Spring Apps.
3535

3636
## Set up the environment
3737

articles/spring-apps/how-to-deploy-with-custom-container-image.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ The following matrix shows what features are supported in each application type.
107107
| Custom domain | ✔️ | ✔️ | |
108108
| Scaling - auto scaling | ✔️ | ✔️ | |
109109
| Scaling - manual scaling (in/out, up/down) | ✔️ | ✔️ | |
110-
| Managed Identity | ✔️ | ✔️ | |
110+
| Managed identity | ✔️ | ✔️ | |
111111
| Spring Cloud Eureka & Config Server | ✔️ || |
112112
| API portal for VMware Tanzu | ✔️ | ✔️ | Enterprise plan only. |
113113
| Spring Cloud Gateway for VMware Tanzu | ✔️ | ✔️ | Enterprise plan only. |

articles/spring-apps/how-to-enterprise-configure-apm-integration-and-ca-certificates.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ For information about using Web servers, see [Deploy web static files](how-to-en
5555

5656
Tanzu Build Service is enabled by default in Azure Spring Apps Enterprise. If you choose to disable the build service, you can deploy applications but only by using a custom container image. This section provides guidance for both build service enabled and disabled scenarios.
5757

58-
#### Supported APM types
58+
### Supported APM types
5959

6060
This section lists the supported languages and required environment variables for the APMs that you can use for your integrations.
6161

@@ -183,7 +183,7 @@ Use the following steps to show, add, edit, or delete an APM configuration:
183183

184184
:::image type="content" source="media/how-to-enterprise-configure-apm-integration-and-ca-certificates/add-apm.png" alt-text="Screenshot of the Azure portal showing the APM configuration page with the Add button highlighted." lightbox="media/how-to-enterprise-configure-apm-integration-and-ca-certificates/add-apm.png":::
185185

186-
1. To view or edit an APM configuration, select the ellipsis (**...**) button for the configuration, then select **Edit APM**.
186+
1. To view or edit an APM configuration, select the ellipsis (**...**) button for the configuration, then select **Edit APM**.
187187

188188
:::image type="content" source="media/how-to-enterprise-configure-apm-integration-and-ca-certificates/show-apm.png" alt-text="Screenshot of the Azure portal showing the APM configuration page with the Edit APM option selected." lightbox="media/how-to-enterprise-configure-apm-integration-and-ca-certificates/show-apm.png":::
189189

@@ -196,19 +196,19 @@ Use the following steps to view the APM configurations bound to the build:
196196
1. Navigate to the **Build Service** page for your Azure Spring Apps instance.
197197

198198
:::image type="content" source="media/how-to-enterprise-configure-apm-integration-and-ca-certificates/build-service-build.png" alt-text="Screenshot of the Azure portal showing the build service page with the current build in the list." lightbox="media/how-to-enterprise-configure-apm-integration-and-ca-certificates/build-service-build.png":::
199-
199+
200200
1. On the navigation pane, in the **Settings** section, select **APM bindings**.
201-
201+
202202
1. On the **APM bindings** page, view the APM configurations bound to the build.
203203

204204
:::image type="content" source="media/how-to-enterprise-configure-apm-integration-and-ca-certificates/build-apm-bindings.png" alt-text="Screenshot of the APM bindings page showing the APM configurations bound to the build." lightbox="media/how-to-enterprise-configure-apm-integration-and-ca-certificates/build-apm-bindings.png":::
205205

206206
Use the following steps to view the APM configurations bound to the deployment:
207207

208208
1. Navigate to your application page.
209-
209+
210210
1. On the navigation pane, in the **Settings** section, select **APM bindings**.
211-
211+
212212
1. On the **APM bindings** page, view the APM configurations bound to the deployment.
213213

214214
:::image type="content" source="media/how-to-enterprise-configure-apm-integration-and-ca-certificates/deployment-apm-bindings.png" alt-text="Screenshot of the APM bindings page showing the APM configurations bound to the deployment." lightbox="media/how-to-enterprise-configure-apm-integration-and-ca-certificates/deployment-apm-bindings.png":::
@@ -222,7 +222,7 @@ The following list shows you the Azure CLI commands you can use to manage APM co
222222
```azurecli
223223
az spring apm list \
224224
--resource-group <resource-group-name> \
225-
--service <Azure-Spring-Apps-instance-name>
225+
--service <Azure-Spring-Apps-instance-name>
226226
```
227227

228228
- Use the following command to list all the supported APM types:
@@ -289,7 +289,7 @@ The following list shows you the Azure CLI commands you can use to manage APM co
289289
```azurecli
290290
az spring apm list-enabled-globally \
291291
--resource-group <resource-group-name> \
292-
--service <Azure-Spring-Apps-instance-name>
292+
--service <Azure-Spring-Apps-instance-name>
293293
```
294294

295295
- Use the following command to delete an APM configuration.
@@ -300,7 +300,7 @@ The following list shows you the Azure CLI commands you can use to manage APM co
300300
--service <Azure-Spring-Apps-instance-name> \
301301
--name <your-APM-name> \
302302
```
303-
303+
304304
---
305305

306306
For more information on the `properties` and `secrets` parameters for your buildpack, see the [Supported Scenarios - APM and CA Certificates Integration](#supported-scenarios---apm-and-ca-certificates-integration) section.
@@ -331,7 +331,7 @@ Use the following command to build an image and configure APM:
331331
az spring build-service build <create|update> \
332332
--resource-group <resource-group-name> \
333333
--service <Azure-Spring-Apps-instance-name> \
334-
--name <app-name> \
334+
--name <app-name> \
335335
--builder <builder-name> \
336336
--apms <APM-name> \
337337
--artifact-path <path-to-your-JAR-file>
@@ -439,7 +439,7 @@ When you use your own container registry for the build service or disable the bu
439439
az spring build-service build <create|update> \
440440
--resource-group <resource-group-name> \
441441
--service <Azure-Spring-Apps-instance-name> \
442-
--name <app-name> \
442+
--name <app-name> \
443443
--builder <builder-name> \
444444
--certificates <CA certificate-name> \
445445
--artifact-path <path-to-your-JAR-file>
@@ -452,9 +452,9 @@ Use the following steps to view the CA certificates bound to the build:
452452
1. Navigate to your build page.
453453

454454
:::image type="content" source="media/how-to-enterprise-configure-apm-integration-and-ca-certificates/build-service-build.png" alt-text="Screenshot of the Azure portal showing the build service page with the current build in the list." lightbox="media/how-to-enterprise-configure-apm-integration-and-ca-certificates/build-service-build.png":::
455-
455+
456456
1. On the navigation pane, in the **Settings** section, select **Certificate bindings**.
457-
457+
458458
1. On the **Certificate bindings** page, view the CA certificates bound to the build.
459459

460460
:::image type="content" source="media/how-to-enterprise-configure-apm-integration-and-ca-certificates/build-certificate-bindings.png" alt-text="Screenshot of the certificate bindings page showing CA certificates bound to the build." lightbox="media/how-to-enterprise-configure-apm-integration-and-ca-certificates/build-certificate-bindings.png":::

articles/spring-apps/how-to-enterprise-deploy-app-at-scale.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,4 @@ Spring Cloud Gateway supports rolling restarts to ensure zero downtime and disru
6161

6262
## Next steps
6363

64-
- [Build and deploy apps to Azure Spring Apps](quickstart-deploy-apps.md)
6564
- [Scale an application in Azure Spring Apps](how-to-scale-manual.md)

0 commit comments

Comments
 (0)