merge conflict; paymaun review

Author: kgremban

.openpublishing.redirection.json

@@ -1,5 +1,10 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/governance/machine-configuration/whats-new/migrating-from-dsc-extension.md ",
+      "redirect_url": " https://azure.microsoft.com/updates/migrate-from-linux-dsc-extension-to-the-guest-configuration-feature-of-azure-policy-by-may-1-2025/",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/vpn-gateway/vpn-gateway-about-forced-tunneling.md",
       "redirect_url": "/previous-versions/azure/vpn-gateway/vpn-gateway-about-forced-tunneling",
@@ -2540,21 +2545,6 @@
       "redirect_url": "/azure/developer/jenkins/pipeline-with-github-and-docker",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/kubernetes-fleet/access-fleet-kubernetes-api.md",
-      "redirect_url": "/azure/kubernetes-fleet/quickstart-access-fleet-kubernetes-api",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/kubernetes-fleet/configuration-propagation.md",
-      "redirect_url": "/azure/kubernetes-fleet/resource-propagation",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/kubernetes-fleet/resource-propagation.md",
-      "redirect_url": "/azure/kubernetes-fleet/concepts-resource-propagation",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/labs/anomaly-finder/apiref.md",
       "redirect_url": "/azure/ai-services/anomaly-detector/",
@@ -4776,7 +4766,7 @@
       "redirect_document_id": false
     },
     {
-           "source_path_from_root": "/articles/load-balancer/load-balancer-ipv6-internet-ps.md",
+      "source_path_from_root": "/articles/load-balancer/load-balancer-ipv6-internet-ps.md",
       "redirect_url": "/azure/load-balancer/virtual-network-ipv4-ipv6-dual-stack-standard-load-balancer-powershell",
       "redirect_document_id": false
     },
@@ -4791,4 +4781,4 @@
       "redirect_document_id": false
     }
   ]
-}
+}

articles/app-service/routine-maintenance-downtime.md

@@ -447,6 +447,8 @@
       href: https://azure.microsoft.com/updates/?product=app-service
     - name: Routine maintenance
       href: routine-maintenance.md
+    - name: Routine maintenance, Restarts, and Downtime
+      href: routine-maintenance-downtime.md
     - name: Language support policy
       href: language-support-policy.md
     - name: OS functionality

articles/app-service/toc.yml

@@ -166,9 +166,9 @@ After the Update Management feature is enabled on Windows or Linux machines, you
 If you have more than 2,000 hybrid workers, to get a list of all of them, you can run the following PowerShell script:
 
 ```powershell
-"Get-AzSubscription -SubscriptionName "<subscriptionName>" | Set-AzContext
+Get-AzSubscription -SubscriptionName "<subscriptionName>" | Set-AzContext
 $workersList = (Get-AzAutomationHybridWorkerGroup -ResourceGroupName "<resourceGroupName>" -AutomationAccountName "<automationAccountName>").Runbookworker
-$workersList | export-csv -Path "<Path>\output.csv" -NoClobber -NoTypeInformation"
+$workersList | export-csv -Path "<Path>\output.csv" -NoClobber -NoTypeInformation
 ```
 
 ## Next steps

articles/automation/automation-hybrid-runbook-worker.md

@@ -3,7 +3,7 @@ title: Create a function in Azure triggered by Blob storage
 description: Use Azure Functions to create a serverless function that is invoked by items added to a Blob storage container.
 ms.assetid: d6bff41c-a624-40c1-bbc7-80590df29ded
 ms.topic: how-to
-ms.date: 12/28/2023
+ms.date: 09/18/2024
 ms.custom: mvc, cc996988-fb4f-47
 ---
 # Create a function in Azure that's triggered by Blob storage
@@ -20,76 +20,49 @@ Learn how to create a function triggered when files are uploaded to or updated i
 
 [!INCLUDE [Create function app Azure portal](../../includes/functions-create-function-app-portal.md)]
 
-You've successfully created your new function app.
-
-:::image type="content" source="./media/functions-create-storage-blob-triggered-function/function-app-create-success.png" alt-text="Function app successfully created." border="true":::
-
-Next, you create a function in the new function app.
+You've successfully created your new function app. Next, you create a function in the new function app.
 
 <a name="create-function"></a>
 
 ## Create an Azure Blob storage triggered function
 
 1. In your function app, select **Overview**, and then select **+ Create** under **Functions**.
 
-1. Under **Select a template**, scroll down and choose the **Azure Blob Storage trigger** template.
+1. Under **Select a template**, choose the **Blob trigger** template and select **Next**.
 
 1. In **Template details**, configure the new trigger with the settings as specified in this table, then select **Create**:
 
     | Setting | Suggested value | Description |
     |---|---|---|
+    | **Job type** | Append to app | You only see this setting for a Python v2 app. | 
     | **New Function** | Unique in your function app | Name of this blob triggered function. |
     | **Path**   | samples-workitems/{name}    | Location in Blob storage being monitored. The file name of the blob is passed in the binding as the _name_ parameter.  |
     | **Storage account connection** | AzureWebJobsStorage | You can use the storage account connection already being used by your function app, or create a new one.  |
 
-    Azure creates the Blob Storage triggered function based on the provided values.
-
-Next, create the **samples-workitems** container.
+    Azure creates the Blob Storage triggered function based on the provided values. Next, create the **samples-workitems** container.
 
 ## Create the container
 
-1. In your function, on the **Overview** page, select your resource group.
-
-    :::image type="content" source="./media/functions-create-storage-blob-triggered-function/functions-storage-resource-group.png" alt-text="Select your Azure portal resource group." border="true":::
-
-1. Find and select your resource group's storage account.
-
-    :::image type="content" source="./media/functions-create-storage-blob-triggered-function/functions-storage-account-access.png" alt-text="Access the storage account." border="true":::
-
-1. Choose **Containers**, and then choose **+ Container**. 
+1. Return to the **Overview** page for your function app, select your **Resource group**, then find and select the storage account in your resource group.
 
-    :::image type="content" source="./media/functions-create-storage-blob-triggered-function/functions-storage-add-container.png" alt-text="Add container to your storage account in the Azure portal." border="true":::
+1. In the storage account page, select **Data storage** > **Containers** > **+ Container**. 
 
-1. In the **Name** field, type `samples-workitems`, and then select **Create**.
+1. In the **Name** field, type `samples-workitems`, and then select **Create** to create a container.
 
-    :::image type="content" source="./media/functions-create-storage-blob-triggered-function/functions-storage-name-blob-container.png" alt-text="Name the storage container." border="true":::
-
-Now that you have a blob container, you can test the function by uploading a file to the container.
+1. Select the new `samples-workitems` container, which you use to test the function by uploading a file to the container.
 
 ## Test the function
 
-1. Back in the Azure portal, browse to your function expand the **Logs** at the bottom of the page and make sure that log streaming isn't paused.
-
-    :::image type="content" source="./media/functions-create-storage-blob-triggered-function/functions-storage-log-expander.png" alt-text="Expand the log in the Azure portal." border="true":::
-
-1. In a separate browser window, go to your resource group in the Azure portal, and select the storage account.
-
-1. Select **Containers**, and then select the **samples-workitems** container.
-
-    :::image type="content" source="./media/functions-create-storage-blob-triggered-function/functions-storage-container.png" alt-text="Go to your samples-workitems container in the Azure portal." border="true":::
-
-1. Select **Upload**, and then select the folder icon to choose a file to upload.
-
-    :::image type="content" source="./media/functions-create-storage-blob-triggered-function/functions-storage-manager-upload-file-blob.png" alt-text="Upload a file to the blob container." border="true":::
+1. In a new browser window, return to your function app page and select **Log stream**, which displays real-time logging for your app.
 
-1. Browse to a file on your local computer, such as an image file, choose the file. Select **Open** and then **Upload**.
+1. From the `samples-workitems` container page, select **Upload** > **Browse for files**, browse to a file on your local computer (such as an image file), and choose the file. 
 
-1. Go back to your function logs and verify that the blob has been read.
+1. Select **Open** and then **Upload**.
 
-    :::image type="content" source="./media/functions-create-storage-blob-triggered-function/function-app-in-portal-editor.png" alt-text="View message in the logs." border="true":::
+1. Go back to your function app logs and verify that the blob has been read.
 
     >[!NOTE]
-    > When your function app runs in the default Consumption plan, there may be a delay of up to several minutes between the blob being added or updated and the function being triggered. If you need low latency in your blob triggered functions, consider running your function app in an App Service plan.
+    > When your function app runs in the default Consumption plan, there may be a delay of up to several minutes between the blob being added or updated and the function being triggered. If you need low latency in your blob triggered functions, consider one of these [other blob trigger options](./storage-considerations.md#trigger-on-a-blob-container).
 
 ## Clean up resources
 

articles/azure-functions/functions-create-storage-blob-triggered-function.md

@@ -3,7 +3,7 @@ title: Create a function in Azure triggered by queue messages
 description: Use Azure Functions to create a serverless function that is invoked by messages submitted to a queue in Azure.
 ms.assetid: 361da2a4-15d1-4903-bdc4-cc4b27fc3ff4
 ms.topic: how-to
-ms.date: 12/28/2023
+ms.date: 09/18/2024
 ms.custom: mvc, cc996988-fb4f-47
 ---
 # Create a function triggered by Azure Queue storage
@@ -20,8 +20,6 @@ Learn how to create a function that is triggered when messages are submitted to
 
 [!INCLUDE [Create function app Azure portal](../../includes/functions-create-function-app-portal.md)]
 
-   :::image type="content" source="./media/functions-create-storage-queue-triggered-function/function-app-create-success.png" alt-text="Function app successfully created.." border="true":::
-
 Next, you create a function in the new function app.
 
 <a name="create-function"></a>
@@ -36,53 +34,30 @@ Next, you create a function in the new function app.
 
     | Setting | Suggested value | Description |
     |---|---|---|
+    | **Job type** | Append to app | You only see this setting for a Python v2 app. | 
     | **Name** | Unique in your function app | Name of this queue triggered function. |
     | **Queue name**   | myqueue-items    | Name of the queue to connect to in your Storage account. |
     | **Storage account connection** | AzureWebJobsStorage | You can use the storage account connection already being used by your function app, or create a new one.  |    
 
-    Azure creates the Queue Storage triggered function based on the provided values
-
-Next, you connect to your Azure storage account and create the **myqueue-items** storage queue.
+    Azure creates the Queue Storage triggered function based on the provided values. Next, you connect to your Azure storage account and create the **myqueue-items** storage queue.
 
 ## Create the queue
 
-1. In your function, on the **Overview** page, select your resource group.
-
-    :::image type="content" source="./media/functions-create-storage-queue-triggered-function/functions-storage-resource-group.png" alt-text="Select your Azure portal resource group." border="true":::
-
-1. Find and select your resource group's storage account.
+1. Return to the **Overview** page for your function app, select your **Resource group**, then find and select the storage account in your resource group.
 
-    :::image type="content" source="./media/functions-create-storage-queue-triggered-function/functions-storage-account-access.png" alt-text="Access the storage account." border="true":::
-
-1. Choose **Queues**, and then choose **+ Queue**. 
-
-    :::image type="content" source="./media/functions-create-storage-queue-triggered-function/functions-storage-add-queue.png" alt-text="Add a queue to your storage account in the Azure portal." border="true":::
+1. In the storage account page, select **Data storage** > **Queues** > **+ Queue**. 
 
 1. In the **Name** field, type `myqueue-items`, and then select **Create**.
 
-    :::image type="content" source="./media/functions-create-storage-queue-triggered-function/functions-storage-name-queue.png" alt-text="Name the queue storage container." border="true":::
-
-Now that you have a storage queue, you can test the function by adding a message to the queue.
+1. Select the new **myqueue-items** queue, which you use to test the function by adding a message to the queue.
 
 ## Test the function
 
-1. Back in the Azure portal, browse to your function expand the **Logs** at the bottom of the page and make sure that log streaming isn't paused.
-
-    :::image type="content" source="./media/functions-create-storage-queue-triggered-function/functions-queue-storage-log-expander.png" alt-text="Expand the log in the Azure portal." border="true":::
-
-1. In a separate browser window, go to your resource group in the Azure portal, and select the storage account.
-
-1. Select **Queues**, and then select the **myqueue-items** container.
-
-    :::image type="content" source="./media/functions-create-storage-queue-triggered-function/functions-storage-queue.png" alt-text="Go to your myqueue-items queue in the Azure portal." border="true":::
-
-1. Select **Add message**, and type "Hello World!" in **Message text**. Select **OK**.
-
-    :::image type="content" source="./media/functions-create-storage-queue-triggered-function/functions-storage-queue-test.png" alt-text="Screenshot shows the Add message button selected and the Message text field highlighted." border="true":::
-
-1. Wait for a few seconds, then go back to your function logs and verify that the new message has been read from the queue.
+1. In a new browser window, return to your function app page and select **Log stream**, which displays real-time logging for your app.
+    
+1. In the **myqueue-items** queue, select **Add message**, type "Hello World!" in **Message text**, and select **OK**.
 
-    :::image type="content" source="./media/functions-create-storage-queue-triggered-function/function-app-in-portal-editor.png" alt-text="View message in the logs." border="true":::
+1. Go back to your function app logs and verify that the function ran to process the message from the queue.
 
 1. Back in your storage queue, select **Refresh** and verify that the message has been processed and is no longer in the queue.
 

articles/azure-functions/functions-create-storage-queue-triggered-function.md

@@ -50,7 +50,7 @@ The following is an example of a minimal `project` file with these changes:
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <AzureFunctionsVersion>V4</AzureFunctionsVersion>
+    <AzureFunctionsVersion>v4</AzureFunctionsVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.4.0" />