Skip to content

Commit 16e5150

Browse files
authored
Merge pull request #270787 from MicrosoftDocs/main
Publish to live, Monday 4 AM PST, 4/1
2 parents fd0e2bc + 0d2732b commit 16e5150

File tree

57 files changed

+763
-657
lines changed

Some content is hidden

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

57 files changed

+763
-657
lines changed

.openpublishing.redirection.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3918,6 +3918,11 @@
39183918
"source_path_from_root": "/articles/storage/common/storage-account-move.md",
39193919
"redirect_url": "/azure/operational-excellence/relocation-storage-account",
39203920
"redirect_document_id": false
3921+
},
3922+
{
3923+
"source_path_from_root": "/articles/defender-for-iot/organizations/update-legacy-ot-software.md",
3924+
"redirect_url": "/azure/defender-for-iot/organizations/update-ot-software?tabs=portal",
3925+
"redirect_document_id": false
39213926
}
39223927
]
3923-
}
3928+
}

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

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

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,11 @@ There are two ways to enable monitoring for applications hosted on App Service:
2828
- [.NET](./azure-web-apps-net.md)
2929
- [Java](./azure-web-apps-java.md)
3030
- [Node.js](./azure-web-apps-nodejs.md)
31+
- [Python](./azure-web-apps-python.md)
3132

3233
* **Manually instrumenting the application through code** by installing the Application Insights SDK.
3334

34-
This approach is much more customizable, but it requires the following approaches: SDK for [.NET Core](./asp-net-core.md), [.NET](./asp-net.md), [Node.js](./nodejs.md), [Python](/previous-versions/azure/azure-monitor/app/opencensus-python), and a standalone agent for [Java](./opentelemetry-enable.md?tabs=java). This method also means you must manage the updates to the latest version of the packages yourself.
35+
This approach is much more customizable, but it requires the following approaches: SDK for [.NET Core](./asp-net-core.md), [.NET](./asp-net.md), [Node.js](./nodejs.md), [Python](./opentelemetry-enable.md?tabs=python), and a standalone agent for [Java](./opentelemetry-enable.md?tabs=java). This method also means you must manage the updates to the latest version of the packages yourself.
3536

3637
If you need to make custom API calls to track events/dependencies not captured by default with autoinstrumentation monitoring, you need to use this method. To learn more, see [Application Insights API for custom events and metrics](./api-custom-events-metrics.md).
3738

@@ -165,4 +166,4 @@ The details depend on the type of project. For a web application:
165166

166167
## Next steps
167168

168-
Learn how to enable autoinstrumentation application monitoring for your [.NET Core](./azure-web-apps-net-core.md), [.NET](./azure-web-apps-net.md), [Java](./azure-web-apps-java.md), or [Nodejs](./azure-web-apps-nodejs.md) application running on App Service.
169+
Learn how to enable autoinstrumentation application monitoring for your [.NET Core](./azure-web-apps-net-core.md), [.NET](./azure-web-apps-net.md), [Java](./azure-web-apps-java.md), [Nodejs](./azure-web-apps-nodejs.md), or [Python](./azure-web-apps-python.md) application running on App Service.

articles/azure-monitor/app/codeless-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Links are provided to more information for each supported scenario.
3434
|-------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------|
3535
|Azure App Service on Windows - Publish as Code | [ :white_check_mark: :link: ](azure-web-apps-net.md) ¹ | [ :white_check_mark: :link: ](azure-web-apps-net-core.md) ¹ | [ :white_check_mark: :link: ](azure-web-apps-java.md) ¹ | [ :white_check_mark: :link: ](azure-web-apps-nodejs.md) ¹ | :x: |
3636
|Azure App Service on Windows - Publish as Docker | [ :white_check_mark: :link: ](https://azure.github.io/AppService/2022/04/11/windows-containers-app-insights-preview.html) ² | [ :white_check_mark: :link: ](https://azure.github.io/AppService/2022/04/11/windows-containers-app-insights-preview.html) ² | [ :white_check_mark: :link: ](https://azure.github.io/AppService/2022/04/11/windows-containers-app-insights-preview.html) ² | [ :white_check_mark: :link: ](https://techcommunity.microsoft.com/t5/apps-on-azure-blog/public-preview-application-insights-auto-instrumentation-for/ba-p/3947971) ² | :x: |
37-
|Azure App Service on Linux - Publish as Code | :x: | [ :white_check_mark: :link: ](azure-web-apps-net-core.md?tabs=linux) ¹ | [ :white_check_mark: :link: ](azure-web-apps-java.md) ¹ | [ :white_check_mark: :link: ](azure-web-apps-nodejs.md?tabs=linux) | :x: |
37+
|Azure App Service on Linux - Publish as Code | :x: | [ :white_check_mark: :link: ](azure-web-apps-net-core.md?tabs=linux) ¹ | [ :white_check_mark: :link: ](azure-web-apps-java.md) ¹ | [ :white_check_mark: :link: ](azure-web-apps-nodejs.md?tabs=linux) | [ :white_check_mark: :link: ](azure-web-apps-python.md?tabs=linux) ² |
3838
|Azure App Service on Linux - Publish as Docker | :x: | [ :white_check_mark: :link: ](azure-web-apps-net-core.md?tabs=linux) | [ :white_check_mark: :link: ](azure-web-apps-java.md) | [ :white_check_mark: :link: ](azure-web-apps-nodejs.md?tabs=linux) | :x: |
3939
|Azure Functions - basic | [ :white_check_mark: :link: ](monitor-functions.md) ¹ | [ :white_check_mark: :link: ](monitor-functions.md) ¹ | [ :white_check_mark: :link: ](monitor-functions.md) ¹ | [ :white_check_mark: :link: ](monitor-functions.md) ¹ | [ :white_check_mark: :link: ](monitor-functions.md) ¹ |
4040
|Azure Functions - dependencies | :x: | :x: | [ :white_check_mark: :link: ](monitor-functions.md) | :x: | [ :white_check_mark: :link: ](monitor-functions.md#distributed-tracing-for-python-function-apps) |
@@ -54,7 +54,7 @@ Links are provided to more information for each supported scenario.
5454
5555
## JavaScript (Web) SDK Loader Script injection by configuration
5656

57-
When using supported SDKs, you can enable SDK injection in configuration to automatically inject JavaScript (Web) SDK Loader Script onto each page.
57+
When using supported Software Development Kits (SDKs), you can enable SDK injection in configuration to automatically inject JavaScript (Web) SDK Loader Script onto each page.
5858

5959

6060
| Language
10.2 KB
Loading
42.7 KB
Loading
-22.4 KB
Loading

articles/azure-monitor/toc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ items:
6767
href: app/azure-web-apps-java.md
6868
- name: Node.js
6969
href: app/azure-web-apps-nodejs.md
70+
- name: Python
71+
href: app/azure-web-apps-python.md
7072
- name: Azure Functions
7173
displayName: functions, monitor functions, automation
7274
href: app/monitor-functions.md

articles/backup/backup-azure-vms-enhanced-policy.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Back up Azure VMs with Enhanced policy
33
description: Learn how to configure Enhanced policy to back up VMs.
44
ms.topic: how-to
5-
ms.date: 02/19/2024
5+
ms.date: 04/01/2024
66
ms.reviewer: sharrai
77
ms.service: backup
88
ms.custom: devx-track-azurecli, devx-track-azurepowershell
@@ -19,6 +19,11 @@ Azure Backup now supports _Enhanced policy_ that's needed to support new Azure o
1919
>- [Default policy](./backup-during-vm-creation.md#create-a-vm-with-backup-configured) will not support protecting newer Azure offerings, such as [Trusted Launch VM](backup-support-matrix-iaas.md#tvm-backup), [Ultra SSD](backup-support-matrix-iaas.md#vm-storage-support), [Premium SSD v2](backup-support-matrix-iaas.md#vm-storage-support), [Shared disk](backup-support-matrix-iaas.md#vm-storage-support), and Confidential Azure VMs.
2020
>- Enhanced policy now supports protecting both Ultra SSD and Premium SSD v2.
2121
>- Backups for VMs having [data access authentication enabled disks](../virtual-machines/windows/download-vhd.md?tabs=azure-portal#secure-downloads-and-uploads-with-azure-ad) will fail.
22+
>- If you're protecting a VM with an enhanced policy, it incurs additional snapshot costs. [Learn more](backup-instant-restore-capability.md#cost-impact).
23+
>- Once you enable a VM backup with Enhanced policy, Azure Backup doesn't allow to change the policy type to *Standard*.
24+
25+
26+
2227

2328
You must enable backup of Trusted Launch VM through enhanced policy only. Enhanced policy provides the following features:
2429

@@ -57,7 +62,7 @@ Follow these steps:
5762

5863
5. On **Create policy**, perform the following actions:
5964

60-
- **Policy sub-type**: Select **Enhanced** type. By default, the policy type is set to **Standard**.
65+
- **Policy sub-type**: Select **Enhanced** type.
6166

6267
:::image type="content" source="./media/backup-azure-vms-enhanced-policy/select-enhanced-backup-policy-sub-type.png" alt-text="Screenshot showing to select backup policies subtype as enhanced.":::
6368

@@ -256,7 +261,6 @@ Trusted Launch VMs can only be backed up using Enhanced policies.
256261

257262
>[!Note]
258263
>- The support for Enhanced policy is available in all Azure Public and US Government regions.
259-
>- We support Enhanced policy configuration through [Recovery Services vault](./backup-azure-arm-vms-prepare.md) and [VM Manage blade](./backup-during-vm-creation.md#start-a-backup-after-creating-the-vm) only. Configuration through Backup center is currently not supported.
260264
>- For hourly backups, the last backup of the day is transferred to vault. If backup fails, the first backup of the next day is transferred to vault.
261265
>- Enhanced policy is only available to unprotected VMs that are new to Azure Backup. Note that Azure VMs that are protected with existing policy can't be moved to Enhanced policy.
262266
>- Back up an Azure VM with disks that has public network access disabled is not supported.
34.7 KB
Loading

0 commit comments

Comments
 (0)