Merge pull request #262592 from MicrosoftDocs/main

1/5/2024 PM Publish

Author: Taojunshen

.openpublishing.publish.config.json

@@ -1204,6 +1204,7 @@
   "articles/ai-services/.openpublishing.redirection.applied-ai-old.json",
   "articles/ai-services/.openpublishing.redirection.applied-ai-services.json",
   "articles/ai-services/.openpublishing.redirection.cognitive-services.json",
+  "articles/energy-data-services/.openpublishing.redirection.energy-data-services.json",
   "articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
   "articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
   "articles/azure-relay/.openpublishing.redirection.relay.json",

articles/ai-services/openai/tutorials/fine-tune.md

@@ -258,14 +258,14 @@ for file in files:
 Processing file: training_set.jsonl
 
 #### Distribution of total tokens:
-min / max: 47, 57
-mean / median: 50.8, 50.0
-p5 / p95: 47.9, 55.2
+min / max: 47, 62
+mean / median: 52.1, 50.5
+p5 / p95: 47.9, 57.5
 
 #### Distribution of assistant tokens:
-min / max: 13, 21
-mean / median: 16.3, 15.5
-p5 / p95: 13.0, 20.1
+min / max: 13, 30
+mean / median: 17.6, 15.5
+p5 / p95: 13.0, 21.9
 **************************************************
 Processing file: validation_set.jsonl
 

articles/aks/media/supported-kubernetes-versions/kubernetes-versions-gantt.png

@@ -5,7 +5,7 @@ author: msangapu-msft
 
 ms.topic: article
 ms.custom: devx-track-azurecli
-ms.date: 11/02/2023
+ms.date: 01/05/2024
 ms.author: msangapu
 zone_pivot_groups: app-service-containers-code
 ---

articles/app-service/configure-connect-to-azure-storage.md

@@ -2,28 +2,45 @@
 author: msangapu-msft
 ms.service: app-service
 ms.topic: include
-ms.date: 08/24/2023
+ms.date: 01/05/2024
 ms.author: msangapu
 ---
 
 > [!NOTE]
-> You can also [configure Azure Storage in an ARM template](https://github.com/Azure/app-service-linux-docs/blob/master/BringYourOwnStorage/BYOS_azureFiles.json).
+> [NFS](../../../storage/files/files-nfs-protocol.md) support is now available for App Service on Linux.
 >
 
-This guide shows how to mount Azure Storage as a network share in a built-in Linux container or a custom Linux container in App Service. Azure Storage is Microsoft's cloud storage solution for modern data storage scenarios. Azure Storage offers highly available, massively scalable, durable, and secure storage for a variety of data objects in the cloud. Azure Storage is non-default storage for App Service and billed separately.
+This guide shows how to mount Azure Storage as a network share in a built-in Linux container or a custom Linux container in App Service. Azure Storage is Microsoft's cloud storage solution for modern data storage scenarios. Azure Storage offers highly available, massively scalable, durable, and secure storage for a variety of data objects in the cloud. Azure Storage is non-default storage for App Service and billed separately. You can also [configure Azure Storage in an ARM template](https://github.com/Azure/app-service-linux-docs/blob/master/BringYourOwnStorage/BYOS_azureFiles.json).
+
+
+### Benefits
 
 The benefits of custom-mounted storage include:
 - Configure persistent storage for your App Service app and manage the storage separately.
 - Make static content like video and images readily available for your App Service app. 
 - Write application log files or archive older application log to Azure File shares.  
 - Share content across multiple apps or with other Azure services.
+- Azure Files [NFS](../../../storage/files/files-nfs-protocol.md) and Azure Files [SMB](../../../storage/files/files-smb-protocol.md) are supported.
+- Azure Blobs (read-only) are supported.
+- Up to five mount points per app are supported.
+
+### Limitations
+
+The limitations of custom-mounted storage include:
+- [Storage firewall](../../../storage/common/storage-network-security.md) is supported only through [service endpoints](../../../storage/common/storage-network-security.md#grant-access-from-a-virtual-network) and [private endpoints](../../../storage/common/storage-private-endpoints.md) (when [VNET integration](../../overview-vnet-integration.md) is used).
+- FTP/FTPS access to custom-mounted storage isn't supported (use [Azure Storage Explorer](https://azure.microsoft.com/features/storage-explorer/)).
+- Azure CLI, Azure PowerShell, and Azure SDK support is in preview.
+- Mapping `/` or `/home` to custom-mounted storage isn't supported.
+- Don't map the storage mount to `/tmp` or its subdirectories as this action may cause a timeout during app startup.
+- Azure Storage isn't supported with [Docker Compose](../../configure-custom-container.md?pivots=container-linux#docker-compose-options) scenarios.
+- Storage mounts aren't included in [backups](../../manage-backup.md). Be sure to follow best practices to back up the Azure Storage accounts.
+- NFS support is only available for App Service on Linux. NFS isn't supported for Windows code and Windows containers. The web app and storage account need to be configured on the same VNET for NFS. The storage account used for file share should have "Premium" performance tier and "Filestorage" as the Account Kind.  Azure Key Vault is not applicable when using the NFS protocol.
+- With VNET integration on your app, the mounted drive uses an RFC1918 IP address and not an IP address from your VNET.
 
-The following features are supported for Linux containers:
-- Azure Files (read/write).
-- Azure Blobs (read-only).
-- Up to five mount points per app.
 
-Here are the three options to mount Azure storage to your app:
+### Mounting options
+
+You first need to mount the storage to the app. Here are three mounting options for Azure storage:
 
 | Mounting option | Usage |
 |--------------------------|-------------|
@@ -54,21 +71,8 @@ Here are the three options to mount Azure storage to your app:
 
 ---
 
-## Limitations
-
-- [Storage firewall](../../../storage/common/storage-network-security.md) is supported only through [service endpoints](../../../storage/common/storage-network-security.md#grant-access-from-a-virtual-network) and [private endpoints](../../../storage/common/storage-private-endpoints.md) (when [VNET integration](../../overview-vnet-integration.md) is used).
-- FTP/FTPS access to custom-mounted storage isn't supported (use [Azure Storage Explorer](https://azure.microsoft.com/features/storage-explorer/)).
-- Azure CLI, Azure PowerShell, and Azure SDK support is in preview.
-- Mapping `/` or `/home` to custom-mounted storage isn't supported.
-- Don't map the storage mount to `/tmp` or its subdirectories as this action may cause a timeout during app startup.
-- Azure Storage isn't supported with [Docker Compose](../../configure-custom-container.md?pivots=container-linux#docker-compose-options) scenarios.
-- Storage mounts aren't included in [backups](../../manage-backup.md). Be sure to follow best practices to back up the Azure Storage accounts.
-- Azure Files [NFS](../../../storage/files/files-nfs-protocol.md) is currently unsupported for App Service on Linux. Only Azure Files [SMB](../../../storage/files/files-smb-protocol.md) are supported.
-- With VNET integration on your app, the mounted drive uses an RFC1918 IP address and not an IP address from your VNET.
-
 ## Prepare for mounting
 
-
 ### [Basic](#tab/basic)
 
 No extra steps are required because the portal gets and stores the access key for you. 
@@ -201,32 +205,26 @@ To validate that the Azure Storage is mounted successfully for the app:
 
 ## Best practices
 
+#### Performance
 - To avoid latency issues, place the app and the Azure Storage account in the same region. If you grant access from App Service IP addresses in the [Azure Storage firewall configuration](../../../storage/common/storage-network-security.md) when the app and Azure Storage account are in the same region, then these IP restrictions aren't honored.
+- The mounted Azure Storage account can be either Standard or Premium performance tier. Based on the app capacity and throughput requirements, choose the appropriate performance tier for the storage account. See the scalability and performance targets that correspond to the storage type: [Files](../../../storage/files/storage-files-scale-targets.md) and [Blobs](../../../storage/blobs/scalability-targets.md).
 
-- The mount directory in the custom container should be empty. Any content stored at this path is deleted when the Azure Storage is mounted (if you specify a directory under `/home`, for example). If you are migrating files for an existing app, make a backup of the app and its content before you begin.
+- If your app [scales to multiple instances](../../../azure-monitor/autoscale/autoscale-get-started.md), all the instances connect to the same mounted Azure Storage account. To avoid performance bottlenecks and throughput issues, choose the appropriate performance tier for the storage account.
 
+#### Security
 - In the Azure Storage account, avoid [regenerating the access key](../../../storage/common/storage-account-keys-manage.md) that's used to mount the storage in the app. The storage account contains two different keys. Azure App Services stores Azure storage account key. Use a stepwise approach to ensure that the storage mount remains available to the app during key regeneration. For example, assuming that you used **key1** to configure storage mount in your app:
-
-    1. Regenerate **key2**. 
+    1. Regenerate **key2**.
     1. In the storage mount configuration, update the access the key to use the regenerated **key2**.
     1. Regenerate **key1**.
 
-- If you delete an Azure Storage account, container, or share, remove the corresponding storage mount configuration in the app to avoid possible error scenarios. 
-
-- The mounted Azure Storage account can be either Standard or Premium performance tier. Based on the app capacity and throughput requirements, choose the appropriate performance tier for the storage account. See the scalability and performance targets that correspond to the storage type:
-
-    - [For Files](../../../storage/files/storage-files-scale-targets.md)
-    - [For Blobs](../../../storage/blobs/scalability-targets.md)
+#### Troubleshooting
 
-- If your app [scales to multiple instances](../../../azure-monitor/autoscale/autoscale-get-started.md), all the instances connect to the same mounted Azure Storage account. To avoid performance bottlenecks and throughput issues, choose the appropriate performance tier for the storage account.  
-
-- It isn't recommended to use storage mounts for local databases (such as SQLite) or for any other applications and components that rely on file handles and locks. 
-
-- Ensure the following ports are open when using VNET integration:
-    - Azure Files: 80 and 445.
-    - Azure Blobs: 80 and 443.
+- The mount directory in the custom container should be empty. Any content stored at this path is deleted when the Azure Storage is mounted (if you specify a directory under `/home`, for example). If you are migrating files for an existing app, make a backup of the app and its content before you begin.
+- If you delete an Azure Storage account, container, or share, remove the corresponding storage mount configuration in the app to avoid possible error scenarios.
+- It isn't recommended to use storage mounts for local databases (such as SQLite) or for any other applications and components that rely on file handles and locks.
+- Ensure the following ports are open when using VNET integration: Azure Files: 80 and 445. Azure Blobs: 80 and 443.
+- If you [initiate a storage failover](../../../storage/common/storage-initiate-account-failover.md) when the storage account is mounted to the app, the mount won't connect until the app is restarted or the storage mount is removed and re-added.
 
-- If you [initiate a storage failover](../../../storage/common/storage-initiate-account-failover.md) when the storage account is mounted to the app, the mount won't connect until the app is restarted or the storage mount is removed and readded.
 ## Next steps
 
 - [Configure a custom container](../../configure-custom-container.md?pivots=platform-linux).

articles/app-service/includes/configure-azure-storage/azure-storage-linux-container-pivot.md

@@ -2,15 +2,11 @@
 author: msangapu-msft
 ms.service: app-service
 ms.topic: include
-ms.date: 08/24/2023
+ms.date: 01/05/2024
 ms.author: msangapu
 ---
 
-> [!NOTE]
-> You can also [configure Azure Storage in an ARM template](https://github.com/Azure/app-service-linux-docs/blob/master/BringYourOwnStorage/BYOS_azureFiles.json).
->
-
-Azure Storage is Microsoft's cloud storage solution for modern data storage scenarios. Azure Storage offers highly available, massively scalable, durable, and secure storage for a variety of data objects in the cloud. This guide shows how to mount Azure Storage Files as a network share in Windows code (noncontainer) in App Service. Only [Azure Files Shares](../../../storage/files/storage-how-to-use-files-portal.md) and [Premium Files Shares](../../../storage/files/storage-how-to-create-file-share.md) are supported. Azure Storage is nondefault storage for App Service and billed separately.
+Azure Storage is Microsoft's cloud storage solution for modern data storage scenarios. Azure Storage offers highly available, massively scalable, durable, and secure storage for a variety of data objects in the cloud. This guide shows how to mount Azure Storage Files as a network share in Windows code (noncontainer) in App Service. Only [Azure Files Shares](../../../storage/files/storage-how-to-use-files-portal.md) and [Premium Files Shares](../../../storage/files/storage-how-to-create-file-share.md) are supported. Azure Storage is non-default storage for App Service and billed separately. You can also [configure Azure Storage in an ARM template](https://github.com/Azure/app-service-linux-docs/blob/master/BringYourOwnStorage/BYOS_azureFiles.json).
 
 The benefits of custom-mounted storage include:
 - Configure persistent storage for your App Service app and manage the storage separately.

articles/app-service/includes/configure-azure-storage/azure-storage-windows-code-pivot.md

@@ -2,15 +2,11 @@
 author: msangapu-msft
 ms.service: app-service
 ms.topic: include
-ms.date: 08/24/2023
+ms.date: 01/05/2024
 ms.author: msangapu
 ---
 
-> [!NOTE]
-> You can also [configure Azure Storage in an ARM template](https://github.com/Azure/app-service-linux-docs/blob/master/BringYourOwnStorage/BYOS_azureFiles.json).
->
-
-Azure Storage is Microsoft's cloud storage solution for modern data storage scenarios. Azure Storage offers highly available, massively scalable, durable, and secure storage for a variety of data objects in the cloud. This guide shows how to mount Azure Storage Files as a network share in a Windows container in App Service. Only [Azure Files Shares](../../../storage/files/storage-how-to-use-files-portal.md) and [Premium Files Shares](../../../storage/files/storage-how-to-create-file-share.md) are supported. Azure Storage is nondefault storage for App Service and billed separately.
+Azure Storage is Microsoft's cloud storage solution for modern data storage scenarios. Azure Storage offers highly available, massively scalable, durable, and secure storage for a variety of data objects in the cloud. This guide shows how to mount Azure Storage Files as a network share in a Windows container in App Service. Only [Azure Files Shares](../../../storage/files/storage-how-to-use-files-portal.md) and [Premium Files Shares](../../../storage/files/storage-how-to-create-file-share.md) are supported. Azure Storage is non-default storage for App Service and billed separately. You can also [configure Azure Storage in an ARM template](https://github.com/Azure/app-service-linux-docs/blob/master/BringYourOwnStorage/BYOS_azureFiles.json).
 
 The benefits of custom-mounted storage include:
 - Configure persistent storage for your App Service app and manage the storage separately.

articles/app-service/includes/configure-azure-storage/azure-storage-windows-container-pivot.md

@@ -5,17 +5,24 @@ ms.assetid: 582bb3c2-164b-42f5-b081-95bfcb7a502a
 author: msangapu-msft
 ms.author: msangapu
 ms.topic: quickstart
-ms.custom: mvc, devcenter, seodec18, devdivchpfy22, ignite-2022, devx-track-js
 ms.date: 07/17/2023
 ms.devlang: javascript
 zone_pivot_groups: app-service-vscode-cli-portal
+ms.custom: mvc, devcenter, seodec18, devdivchpfy22, ignite-2022, devx-track-js, ai-video-demo
+ai-usage: ai-assisted
 ---
+
 # Deploy a Node.js web app in Azure
 
 In this quickstart, you'll learn how to create and deploy your first Node.js ([Express](https://www.expressjs.com)) web app to [Azure App Service](overview.md). App Service supports various versions of Node.js on both Linux and Windows. 
 
 This quickstart configures an App Service app in the **Free** tier and incurs no cost for your Azure subscription.
 
+This video shows you how to deploy a Node.js web app in Azure.
+> [!VIDEO c66346dd-9fde-4cef-b135-47d3051d5db5]
+
+The steps in the video are also described in the following sections.
+
 ## Set up your initial environment
 
 :::zone target="docs" pivot="development-environment-vscode"

articles/app-service/quickstart-nodejs.md

@@ -4,12 +4,19 @@ description: Learn how to enable diagnostic logging and add instrumentation to y
 ms.assetid: c9da27b2-47d4-4c33-a3cb-1819955ee43b
 ms.topic: article
 ms.date: 06/29/2023
-ms.custom: "devx-track-csharp, seodec18"
 ms.author: msangapu
 author: msangapu-msft
-
+ms.custom: devx-track-csharp, seodec18, ai-video-demo
+ai-usage: ai-assisted
 ---
+
 # Enable diagnostics logging for apps in Azure App Service
+
+This video shows you how to enable diagnostics logging for apps.
+> [!VIDEO 62f2edbe-1063-4ec3-a76f-faa0bd783f2f]
+
+The steps in the video are also described in the following sections.
+
 ## Overview
 Azure provides built-in diagnostics to assist with debugging an [App Service app](overview.md). In this article, you learn how to enable diagnostic logging and add instrumentation to your application, as well as how to access the information logged by Azure.
 
@@ -18,7 +25,6 @@ This article uses the [Azure portal](https://portal.azure.com) and Azure CLI to
 > [!NOTE]
 > In addition to the logging instructions in this article, there's new, integrated logging capability with Azure Monitoring. You'll find more on this capability in the [Send logs to Azure Monitor](#send-logs-to-azure-monitor) section. 
 >
->
 
 |Type|Platform|Location|Description|
 |-|-|-|-|

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

@@ -5,15 +5,13 @@ author: flang-msft
 
 ms.service: cache
 ms.topic: conceptual
-ms.date: 09/29/2023
+ms.date: 01/05/2024
 ms.author: franlanglois 
 ---
 # How to administer Azure Cache for Redis
 
 This article describes how to do administration tasks such as [rebooting](#reboot) and [Update channel and Schedule updates](#update-channel-and-schedule-updates) for your Azure Cache for Redis instances.
 
-[!INCLUDE [updated-for-az](../../includes/updated-for-az.md)]
-
 ## Reboot
 
 On the left, **Reboot** allows you to reboot one or more nodes of your cache. This reboot capability enables you to test your application for resiliency if there's a failure of a cache node.