Skip to content

Commit fcf5b57

Browse files
authored
Merge pull request #217300 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 6c192a5 + 7dfcde7 commit fcf5b57

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

articles/azure-monitor/app/azure-web-apps-net.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.reviewer: abinetabate
1010

1111
# Application Monitoring for Azure App Service and ASP.NET
1212

13-
Enabling monitoring on your ASP.NET based web applications running on [Azure App Services](../../app-service/index.yml) is now easier than ever. Whereas previously you needed to manually instrument your app, the latest extension/agent is now built into the App Service image by default. This article will walk you through enabling Azure Monitor application Insights monitoring as well as provide preliminary guidance for automating the process for large-scale deployments.
13+
Enabling monitoring on your ASP.NET based web applications running on [Azure App Services](../../app-service/index.yml) is now easier than ever. Whereas previously you needed to manually instrument your app, the latest extension/agent is now built into the App Service image by default. This article will walk you through enabling Azure Monitor Application Insights monitoring as well as provide preliminary guidance for automating the process for large-scale deployments.
1414

1515
> [!NOTE]
1616
> Manually adding an Application Insights site extension via **Development Tools** > **Extensions** is deprecated. This method of extension installation was dependent on manual updates for each new version. The latest stable release of the extension is now [preinstalled](https://github.com/projectkudu/kudu/wiki/Azure-Site-Extensions) as part of the App Service image. The files are located in `d:\Program Files (x86)\SiteExtensions\ApplicationInsightsAgent` and are automatically updated with each stable release. If you follow the auto-instrumentation instructions to enable monitoring below, it will automatically remove the deprecated extension for you.

articles/container-apps/observability.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ These features include:
2626
|[Azure Monitor alerts](alerts.md) | Create and manage alerts to notify you of events and conditions based on metric and log data.|
2727

2828
>[!NOTE]
29-
> While not a built-in feature, [Azure Monitor's Application Insights](../azure-monitor/app/app-insights-overview.md) is a powerful tool to monitor your web and background applications. Although Container Apps doesn't support the Application Insights auto-instrumentation agent, you can instrument your application code using Application Insights SDKs.
29+
> While not a built-in feature, [Azure Monitor Application Insights](../azure-monitor/app/app-insights-overview.md) is a powerful tool to monitor your web and background applications. Although Container Apps doesn't support the Application Insights auto-instrumentation agent, you can instrument your application code using Application Insights SDKs.
3030
3131
## Application lifecycle observability
3232

articles/iot-hub-device-update/delta-updates.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ The following table provides a list of the content needed, where to retrieve the
8080

8181
| Binary Name | Where to acquire | How to install |
8282
|--|--|--|
83-
| DiffGen | [Azure/iot-hub-device-update-delta](https://github.com/Azure/iot-hub-device-update-delta) Github repo | Select _Microsoft.Azure.DeviceUpdate.Diffs_ under the Packages section on the right side of the page. From there you can install from the cmd line or select _package.nupkg_ under the Assets section on the right side of the page to download the package. [Learn more about NuGet packages](https://learn.microsoft.com/nuget/).|
83+
| DiffGen | [Azure/iot-hub-device-update-delta](https://github.com/Azure/iot-hub-device-update-delta) GitHub repo | Select _Microsoft.Azure.DeviceUpdate.Diffs_ under the Packages section on the right side of the page. From there you can install from the cmd line or select _package.nupkg_ under the Assets section on the right side of the page to download the package. [Learn more about NuGet packages](https://learn.microsoft.com/nuget/).|
8484
| .NET (Runtime) | Via Terminal / Package Managers | [Instructions for Linux](/dotnet/core/install/linux). Only the Runtime is required. |
8585

8686
### Dependencies

articles/storage/blobs/storage-encrypt-decrypt-blobs-key-vault.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ The following example shows how to assign the **Key Vault Crypto Officer** role
5353

5454
1. In the Azure portal, locate your key vault using the main search bar or left navigation.
5555

56-
2. On the storage account overview page, select **Access control (IAM)** from the left-hand menu.
56+
2. On the key vault overview page, select **Access control (IAM)** from the left-hand menu.
5757

5858
3. On the **Access control (IAM)** page, select the **Role assignments** tab.
5959

articles/synapse-analytics/sql/query-delta-lake-format.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ If you don't have this subfolder, you are not using Delta Lake format. You can c
4949

5050
```python
5151
%%pyspark
52-
from delta.tables import *
52+
from delta.tables import DeltaTable
5353
deltaTable = DeltaTable.convertToDelta(spark, "parquet.`abfss://[email protected]/covid`")
5454
```
5555

@@ -168,7 +168,7 @@ If you don't have this subfolder, you are not using Delta Lake format. You can c
168168

169169
```python
170170
%%pyspark
171-
from delta.tables import *
171+
from delta.tables import DeltaTable
172172
deltaTable = DeltaTable.convertToDelta(spark, "parquet.`abfss://[email protected]/yellow`", "year INT, month INT")
173173
```
174174

0 commit comments

Comments
 (0)