Skip to content

Commit d27486a

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-constrained-delegation-ga-release
2 parents 05e592f + fc6e631 commit d27486a

11 files changed

+23
-19
lines changed

articles/azure-monitor/agents/azure-monitor-agent-migration.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@ ms.custom:
1414

1515
[Azure Monitor Agent (AMA)](./agents-overview.md) replaces the Log Analytics agent (also known as MMA and OMS) for Windows and Linux machines, in Azure and non-Azure environments, including on-premises and third-party clouds. The agent introduces a simplified, flexible method of configuring data collection using [data collection rules (DCRs)](../essentials/data-collection-rule-overview.md). This article provides guidance on how to implement a successful migration from the Log Analytics agent to Azure Monitor Agent.
1616

17-
> [!IMPORTANT]
18-
> The Log Analytics agent will be [retired on **August 31, 2024**](https://azure.microsoft.com/updates/were-retiring-the-log-analytics-agent-in-azure-monitor-on-31-august-2024/). After this date, Microsoft will no longer provide any support for the Log Analytics agent. If you're currently using the Log Analytics agent with Azure Monitor or [other supported features and services](#migrate-additional-services-and-features), start planning your migration to Azure Monitor Agent by using the information in this article. If you are using the Log Analytics Agent for SCOM you will need to [migrate to the SCOM Agent](../vm/scom-managed-instance-overview.md)
17+
If you're currently using the Log Analytics agent with Azure Monitor or [other supported features and services](#migrate-additional-services-and-features), start planning your migration to Azure Monitor Agent by using the information in this article. If you are using the Log Analytics Agent for SCOM you will need to [migrate to the SCOM Agent](../vm/scom-managed-instance-overview.md)
18+
19+
The Log Analytics agent will be [retired on **August 31, 2024**](https://azure.microsoft.com/updates/were-retiring-the-log-analytics-agent-in-azure-monitor-on-31-august-2024/). You can expect the following when you use the MMA or OMS agent after this date.
20+
> - **Data upload**: You can still upload data. At some point when major customer have finished migrating and data volumes significantly drop, upload will be suspended. You can expect this to take at least 6 to 9 months. You will not receive a breaking change notification of the suspension.
21+
> - **Install or reinstall**: You can still install and reinstall the legacy agents. You will not be able to get support for installing or reinstalling issues.
22+
> - **Customer Support**: You can expect support for MMA/OMS for security issues.
1923
2024
## Benefits
2125

articles/spring-apps/how-to-enable-ingress-to-app-tls.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ To enable ingress-to-app TLS in the [Azure portal](https://portal.azure.com/), f
7878
3. Select **Ingress-to-app TLS**.
7979
4. Switch **Ingress-to-app TLS** to *Yes*.
8080

81-
:::image type="content" source="media/how-to-enable-ingress-to-app-tls/enable-i2a-tls.png" alt-text="Screenshot of the Azure portal that shows the Ingress-to-app TLS page." lightbox="media/how-to-enable-ingress-to-app-tls/enable-i2a-tls.png":::
81+
:::image type="content" source="media/how-to-enable-ingress-to-app-tls/enable-i2a-tls.png" alt-text="Screenshot of the Azure portal that shows the app Ingress-to-app TLS page." lightbox="media/how-to-enable-ingress-to-app-tls/enable-i2a-tls.png":::
8282

8383
### Verify ingress-to-app TLS status
8484

articles/spring-apps/how-to-permissions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ The Developer role includes permissions to restart apps and see their log stream
6767

6868
1. In the search box, search for **Microsoft.app**. Select **Microsoft Azure Spring Apps**:
6969

70-
:::image type="content" source="media/how-to-permissions/spring-cloud-permissions.png" alt-text="Screenshot that shows the results of searching for Microsoft.app." lightbox="media/how-to-permissions/spring-cloud-permissions.png":::
70+
:::image type="content" source="media/how-to-permissions/permissions.png" alt-text="Screenshot that shows the results of searching for Microsoft.app." lightbox="media/how-to-permissions/permissions.png":::
7171

7272
1. Select the permissions for the Developer role.
7373

articles/spring-apps/how-to-use-tls-certificate.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ You need to grant Azure Spring Apps access to your key vault before you import y
3939
1. In the left navigation pane, select **Access policies**, then select **Create**.
4040
1. Select **Certificate permissions**, then select **Get** and **List**.
4141

42-
:::image type="content" source="media/how-to-use-tls-certificates/grant-key-vault-permission.png" alt-text="Screenshot of the Azure portal that shows the Create an access policy page with Permission pane showing and Get and List permissions highlighted." lightbox="media/how-to-use-tls-certificates/grant-key-vault-permission.png":::
42+
:::image type="content" source="media/how-to-use-tls-certificate/grant-key-vault-permission.png" alt-text="Screenshot of the Azure portal that shows the Create an access policy page with Permission pane showing and Get and List permissions highlighted." lightbox="media/how-to-use-tls-certificate/grant-key-vault-permission.png":::
4343

4444
1. Under **Principal**, select your **Azure Spring Cloud Resource Provider**.
4545

46-
:::image type="content" source="media/how-to-use-tls-certificates/select-service-principal.png" alt-text="Screenshot of the Azure portal that shows the Create an access policy page with Principal pane showing and Azure Spring Apps Resource Provider highlighted." lightbox="media/how-to-use-tls-certificates/select-service-principal.png":::
46+
:::image type="content" source="media/how-to-use-tls-certificate/select-service-principal.png" alt-text="Screenshot of the Azure portal that shows the Create an access policy page with Principal pane showing and Azure Spring Apps Resource Provider highlighted." lightbox="media/how-to-use-tls-certificate/select-service-principal.png":::
4747

4848
1. Select **Review + Create**, then select **Create**.
4949

@@ -82,7 +82,7 @@ To load a certificate into your application in Azure Spring Apps, start with the
8282
1. From the left navigation pane of your app, select **Certificate management**.
8383
1. Select **Add certificate** to choose certificates accessible for the app.
8484

85-
:::image type="content" source="media/how-to-use-tls-certificates/load-certificate.png" alt-text="Screenshot of the Azure portal that shows the Certificate management page with the Add certificate button highlighted." lightbox="media/how-to-use-tls-certificates/load-certificate.png":::
85+
:::image type="content" source="media/how-to-use-tls-certificate/load-certificate.png" alt-text="Screenshot of the Azure portal that shows the Certificate management page with the Add certificate button highlighted." lightbox="media/how-to-use-tls-certificate/load-certificate.png":::
8686

8787
### Load a certificate from code
8888

articles/spring-apps/quickstart-deploy-restful-api-app.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ The following diagram shows the architecture of the system:
4949
- A custom directory role that includes the [permission to grant permissions to applications](/entra/identity/role-based-access-control/custom-consent-permissions), for the permissions required by the application.
5050

5151
For more information, see [Grant tenant-wide admin consent to an application](/entra/identity/enterprise-apps/grant-admin-consent?pivots=portal).
52-
- If you're deploying an Azure Spring Apps Enterprise plan instance for the first time in the target subscription, see the [Requirements](./how-to-enterprise-marketplace-offer.md#requirements) section of [Enterprise plan in Azure Marketplace](./how-to-enterprise-marketplace-offer.md).
52+
- If you're deploying an Azure Spring Apps Enterprise plan instance for the first time in the target subscription, see the [Requirements](how-to-enterprise-marketplace-offer.md#requirements) section of [Enterprise plan in Azure Marketplace](how-to-enterprise-marketplace-offer.md).
5353
- [Git](https://git-scm.com/downloads).
5454
- [Java Development Kit (JDK)](/java/azure/jdk/), version 17.
5555
- A Microsoft Entra tenant. For instructions on creating one, see [Quickstart: Create a new tenant in Microsoft Entra ID](/entra/fundamentals/create-new-tenant).
@@ -63,7 +63,7 @@ The following diagram shows the architecture of the system:
6363
- A custom directory role that includes the [permission to grant permissions to applications](/entra/identity/role-based-access-control/custom-consent-permissions), for the permissions required by the application.
6464

6565
For more information, see [Grant tenant-wide admin consent to an application](/entra/identity/enterprise-apps/grant-admin-consent?pivots=portal).
66-
- If you're deploying an Azure Spring Apps Enterprise plan instance for the first time in the target subscription, see the [Requirements](./how-to-enterprise-marketplace-offer.md#requirements) section of [Enterprise plan in Azure Marketplace](./how-to-enterprise-marketplace-offer.md).
66+
- If you're deploying an Azure Spring Apps Enterprise plan instance for the first time in the target subscription, see the [Requirements](how-to-enterprise-marketplace-offer.md#requirements) section of [Enterprise plan in Azure Marketplace](how-to-enterprise-marketplace-offer.md).
6767
- [Git](https://git-scm.com/downloads).
6868
- [Java Development Kit (JDK)](/java/azure/jdk/), version 17.
6969
- A Microsoft Entra tenant. For instructions on creating one, see [Quickstart: Create a new tenant in Microsoft Entra ID](/entra/fundamentals/create-new-tenant).
@@ -240,22 +240,22 @@ Use the following steps to access the RESTful APIs of the `ToDo` app in the Swag
240240
## 7. Next steps
241241

242242
> [!div class="nextstepaction"]
243-
> [Quickstart: Deploy an event-driven application to Azure Spring Apps](./quickstart-deploy-event-driven-app.md)
243+
> [Quickstart: Deploy an event-driven application to Azure Spring Apps](quickstart-deploy-event-driven-app.md)
244244
245245
> [!div class="nextstepaction"]
246-
> [Quickstart: Deploy microservice applications to Azure Spring Apps](./quickstart-deploy-microservice-apps.md)
246+
> [Quickstart: Deploy microservice applications to Azure Spring Apps](quickstart-deploy-microservice-apps.md)
247247
248248
> [!div class="nextstepaction"]
249-
> [Structured application log for Azure Spring Apps](./structured-app-log.md)
249+
> [Structured application log for Azure Spring Apps](structured-app-log.md)
250250
251251
> [!div class="nextstepaction"]
252-
> [Map an existing custom domain to Azure Spring Apps](./how-to-custom-domain.md)
252+
> [Map an existing custom domain to Azure Spring Apps](how-to-custom-domain.md)
253253
254254
> [!div class="nextstepaction"]
255-
> [Use Azure Spring Apps CI/CD with GitHub Actions](./how-to-github-actions.md)
255+
> [Use Azure Spring Apps CI/CD with GitHub Actions](how-to-github-actions.md)
256256
257257
> [!div class="nextstepaction"]
258-
> [Automate application deployments to Azure Spring Apps](./how-to-cicd.md)
258+
> [Automate application deployments to Azure Spring Apps](how-to-cicd.md)
259259
260260
For more information, see the following articles:
261261

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ Use [Service Connector](../service-connector/overview.md) to connect the app hos
9191
1. Under **Settings**, select **Apps**, and then select the `customers-service` application from the list.
9292
1. Select **Service Connector** from the left table of contents and select **Create**.
9393

94-
:::image type="content" source="./media/quickstart-integrate-azure-database-mysql/create-service-connection.png" alt-text="Screenshot of the Azure portal, in the Azure Spring Apps instance, create a connection with Service Connector.":::
94+
:::image type="content" source="media/quickstart-integrate-azure-database-mysql/create-service-connection.png" alt-text="Screenshot of the Azure portal, in the Azure Spring Apps instance, create a connection with Service Connector.":::
9595

9696
1. Select or enter the following settings in the table.
9797

@@ -104,7 +104,7 @@ Use [Service Connector](../service-connector/overview.md) to connect the app hos
104104
| **MySQL database** | *petclinic* | Select the database you created earlier. |
105105
| **Client type** | *SpringBoot* | Select the application stack that works with the target service you selected. |
106106

107-
:::image type="content" source="./media/quickstart-integrate-azure-database-mysql/basics-tab.png" alt-text="Screenshot of the Azure portal, filling out the basics tab in Service Connector.":::
107+
:::image type="content" source="media/quickstart-integrate-azure-database-mysql/basics-tab.png" alt-text="Screenshot of the Azure portal, filling out the basics tab in Service Connector.":::
108108

109109
1. Select **Next: Authentication** to select the authentication type. Then select **Connection string > Database credentials** and enter your database username and password.
110110

@@ -148,7 +148,7 @@ Username and password validated. success
148148

149149
Azure Spring Apps connections are displayed under **Settings > Service Connector**. Select **Validate** to check your connection status, and select **Learn more** to review the connection validation details.
150150

151-
:::image type="content" source="./media/quickstart-integrate-azure-database-mysql/check-connection.png" alt-text="Screenshot of the Azure portal, in the Azure Spring Apps instance, check connection to MySQL database.":::
151+
:::image type="content" source="media/quickstart-integrate-azure-database-mysql/check-connection.png" alt-text="Screenshot of the Azure portal, in the Azure Spring Apps instance, check connection to MySQL database.":::
152152

153153
---
154154

0 commit comments

Comments
 (0)