Skip to content

Commit 5117b56

Browse files
authored
Merge pull request #272677 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents af3eb3b + 667f4ad commit 5117b56

File tree

5 files changed

+10
-4
lines changed

5 files changed

+10
-4
lines changed

articles/app-service/configure-language-java.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.author: cephalin
1515
# Configure a Java app for Azure App Service
1616

1717
> [!NOTE]
18-
> For Spring applications, we recommend using Azure Spring Apps. However, you can still use Azure App Service as a destination.
18+
> For Spring applications, we recommend using Azure Spring Apps. However, you can still use Azure App Service as a destination. See [Java Workload Destination Guidance](https://aka.ms/javadestinations) for advice.
1919
2020
Azure App Service lets Java developers to quickly build, deploy, and scale their Java SE, Tomcat, and JBoss EAP web applications on a fully managed service. Deploy applications with Maven plugins, from the command line, or in editors like IntelliJ, Eclipse, or Visual Studio Code.
2121

articles/app-service/tutorial-java-spring-cosmosdb.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.custom: mvc, devx-track-java, devx-track-azurecli, devx-track-extended-java,
1212
# Tutorial: Build a Java Spring Boot web app with Azure App Service on Linux and Azure Cosmos DB
1313

1414
> [!NOTE]
15-
> For Spring applications, we recommend using Azure Spring Apps. However, you can still use Azure App Service as a destination.
15+
> For Spring applications, we recommend using Azure Spring Apps. However, you can still use Azure App Service as a destination. See [Java Workload Destination Guidance](https://aka.ms/javadestinations) for advice.
1616
1717
This tutorial walks you through the process of building, configuring, deploying, and scaling Java web apps on Azure.
1818
When you are finished, you will have a [Spring Boot](https://spring.io/projects/spring-boot) application storing data in [Azure Cosmos DB](../cosmos-db/index.yml) running on [Azure App Service on Linux](overview.md).

articles/azure-monitor/containers/kubernetes-monitoring-enable.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,12 @@ The following table describes the workspaces that are required to support Manage
7676
## Enable Prometheus and Grafana
7777
Use one of the following methods to enable scraping of Prometheus metrics from your cluster and enable Managed Grafana to visualize the metrics. See [Link a Grafana workspace](../../managed-grafana/quickstart-managed-grafana-portal.md) for options to connect your Azure Monitor workspace and Azure Managed Grafana workspace.
7878

79+
> [!NOTE]
80+
> If you have a single Azure Monitor Resource that is private-linked, then Prometheus enablement won't work if the AKS cluster and Azure Monitor Workspace are in different regions.
81+
> The configuration needed for the Prometheus add-on isn't available cross region because of the private link constraint.
82+
> To resolve this, create a new DCE in the AKS cluster location and a new DCRA (association) in the same AKS cluster region. Associate the new DCE with the AKS cluster and name the new association (DCRA) as configurationAccessEndpoint.
83+
> For full instructions on how to configure the DCEs associated with your Azure Monitor workspace to use a Private Link for data ingestion, see [Use a private link for Managed Prometheus data ingestion](../essentials/private-link-data-ingestion.md).
84+
7985
### [CLI](#tab/cli)
8086

8187
If you don't specify an existing Azure Monitor workspace in the following commands, the default workspace for the resource group will be used. If a default workspace doesn't already exist in the cluster's region, one with a name in the format `DefaultAzureMonitorWorkspace-<mapped_region>` will be created in a resource group with the name `DefaultRG-<cluster_region>`.

articles/cosmos-db/nosql/tutorial-springboot-azure-kubernetes-service.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.custom: mode-api, devx-track-azurecli, build-2023, build-2023-dataai
1616
[!INCLUDE[NoSQL](../includes/appliesto-nosql.md)]
1717

1818
> [!NOTE]
19-
> For Spring Boot applications, we recommend using Azure Spring Apps. However, you can still use Azure Kubernetes Service as a destination.
19+
> For Spring Boot applications, we recommend using Azure Spring Apps. However, you can still use Azure Kubernetes Service as a destination. See [Java Workload Destination Guidance](https://aka.ms/javadestinations) for advice.
2020
2121
In this tutorial, you will set up and deploy a Spring Boot application that exposes REST APIs to perform CRUD operations on data in Azure Cosmos DB (API for NoSQL account). You will package the application as Docker image, push it to Azure Container Registry, deploy to Azure Kubernetes Service and test the application.
2222

articles/mysql/flexible-server/tutorial-deploy-springboot-on-aks-vnet.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ In this tutorial, you'll learn how to deploy a [Spring Boot](https://spring.io/p
1818

1919
> [!NOTE]
2020
> This tutorial assumes a basic understanding of Kubernetes concepts, Java Spring Boot and MySQL.
21-
> For Spring Boot applications, we recommend using Azure Spring Apps. However, you can still use Azure Kubernetes Services as a destination.
21+
> For Spring Boot applications, we recommend using Azure Spring Apps. However, you can still use Azure Kubernetes Services as a destination. See [Java Workload Destination Guidance](https://aka.ms/javadestinations) for advice.
2222
2323
## Prerequisites
2424

0 commit comments

Comments
 (0)