Skip to content

Commit 4e0bc88

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into ingress-controller-annotations
2 parents 119bb28 + 5e2bc6c commit 4e0bc88

File tree

394 files changed

+1385
-2465
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

394 files changed

+1385
-2465
lines changed

.openpublishing.redirection.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3125,6 +3125,11 @@
31253125
"redirect_url": "/azure/openshift/howto-byok",
31263126
"redirect_document_id": false
31273127
},
3128+
{
3129+
"source_path_from_root": "/articles/openshift/howto-deploy-java-jboss-enterprise-application-platform-with-auto-redeploy.md",
3130+
"redirect_url": "/azure/openshift/index",
3131+
"redirect_document_id": false
3132+
},
31283133
{
31293134
"source_path_from_root": "/articles/openshift/quickstart-portal.md",
31303135
"redirect_url": "/azure/openshift/create-cluster",
@@ -4761,4 +4766,4 @@
47614766
"redirect_document_id": false
47624767
}
47634768
]
4764-
}
4769+
}

CODEOWNERS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,8 @@
2525
/articles/genomics @jasonwhowell @thomps23
2626
/articles/open-datasets @jasonwhowell @thomps23
2727
/articles/search @jasonwhowell @thomps23
28+
/articles/azure-monitor @jasonwhowell @thomps23
29+
/articles/advisor @jasonwhowell @thomps23
30+
/articles/chaos-studio @jasonwhowell @thomps23
31+
/articles/service-health @jasonwhowell @thomps23
2832

articles/app-service/troubleshoot-diagnostic-logs.md

Lines changed: 23 additions & 23 deletions
Large diffs are not rendered by default.

articles/app-service/tutorial-dotnetcore-sqldb-app.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ In this tutorial, you learn how to:
5454
You can quickly deploy the sample app in this tutorial and see it running in Azure. Just run the following commands in the [Azure Cloud Shell](https://shell.azure.com), and follow the prompt:
5555

5656
```bash
57+
dotnet tool install --global dotnet-ef
5758
mkdir msdocs-app-service-sqldb-dotnetcore
5859
cd msdocs-app-service-sqldb-dotnetcore
5960
azd init --template msdocs-app-service-sqldb-dotnetcore
@@ -80,7 +81,7 @@ First, you set up a sample data-driven app as a starting point. For your conveni
8081
:::column span="2":::
8182
**Step 2:** In the GitHub fork:
8283
1. Select **main** > **starter-no-infra** for the starter branch. This branch contains just the sample project and no Azure-related files or configuration.
83-
1. Select **Code** > **Create codespace on main**.
84+
1. Select **Code** > **Create codespace on starter-no-infra**.
8485
The codespace takes a few minutes to set up.
8586
:::column-end:::
8687
:::column:::
@@ -141,9 +142,9 @@ Sign in to the [Azure portal](https://portal.azure.com/) and follow these steps
141142
1. *Region*: Any Azure region near you.
142143
1. *Name*: **msdocs-core-sql-XYZ** where *XYZ* is any three random characters. This name must be unique across Azure.
143144
1. *Runtime stack*: **.NET 8 (LTS)**.
145+
1. *Engine*: **SQLAzure**. Azure SQL Database is a fully managed platform as a service (PaaS) database engine that's always running on the latest stable version of the SQL Server.
144146
1. *Add Azure Cache for Redis?*: **Yes**.
145147
1. *Hosting plan*: **Basic**. When you're ready, you can [scale up](manage-scale-up.md) to a production pricing tier later.
146-
1. Select **SQLAzure** as the database engine. Azure SQL Database is a fully managed platform as a service (PaaS) database engine that's always running on the latest stable version of the SQL Server.
147148
1. Select **Review + create**.
148149
1. After validation completes, select **Create**.
149150
:::column-end:::
@@ -276,7 +277,7 @@ The creation wizard generated the connectivity string for you already as [.NET c
276277
:::row-end:::
277278
:::row:::
278279
:::column span="2":::
279-
**Step 8:** To verify that you secured the secrets:
280+
**Step 8:** To verify that your changes:
280281
1. From the left menu, select **Environment variables > Connection strings** again.
281282
1. Next to **AZURE_SQL_CONNECTIONSTRING**, select **Show value**. The value should be `@Microsoft.KeyValut(...)`, which means that it's a [key vault reference](app-service-key-vault-references.md) because the secret is now managed in the key vault.
282283
1. To verify the Redis connection string, select the **App setting** tab. Next to **AZURE_REDIS_CONNECTIONSTRING**, select **Show value**. The value should be `@Microsoft.KeyValut(...)` too.
@@ -389,7 +390,7 @@ In this step, you configure GitHub deployment using GitHub Actions. It's just on
389390
:::column span="2":::
390391
**Step 7:**
391392
Back in the Deployment Center page in the Azure portal:
392-
1. Select **Logs**. A new deployment run is already started from your committed changes. You might need to select **Refresh** to see it.
393+
1. Select the **Logs** tab, then select **Refresh** to see the new deployment run.
393394
1. In the log item for the deployment run, select the **Build/Deploy Logs** entry with the latest timestamp.
394395
:::column-end:::
395396
:::column:::

articles/automation/shared-resources/modules.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@ title: Manage modules in Azure Automation
33
description: This article tells how to use PowerShell modules to enable cmdlets in runbooks and DSC resources in DSC configurations.
44
services: automation
55
ms.subservice: shared-capabilities
6-
ms.date: 08/09/2024
6+
ms.date: 09/08/2024
77
ms.topic: conceptual
88
ms.custom: devx-track-azurepowershell, devx-track-python
99
ms.service: azure-automation
1010
---
1111

1212
# Manage modules in Azure Automation
1313

14+
>[!NOTE]
15+
> The AzureRM PowerShell module has been officially deprecated as of **February 29, 2024**. We recommend that you migrate from AzureRM module to the Az PowerShell module to ensure continued support and updates. While the AzureRM module may still work, it is no longer maintained or supported and continued use of AzureRM is at the user's own risk. For more information, see [migration resources](https://aka.ms/azpsmigrate) for guidance on transitioning to the Az module.
16+
1417
Azure Automation uses a number of PowerShell modules to enable cmdlets in runbooks and DSC resources in DSC configurations. Supported modules include:
1518

1619
* [Azure PowerShell Az.Automation](/powershell/azure/new-azureps-module-az).

0 commit comments

Comments
 (0)