Skip to content

Commit 8999dd0

Browse files
authored
Merge pull request #286161 from MicrosoftDocs/main
9/5 11:00 AM IST Publish
2 parents 044645e + dcdc9df commit 8999dd0

25 files changed

+227
-120
lines changed

articles/api-management/validate-content-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ The policy validates the following content in the request or response against th
5656
| Attribute | Description | Required | Default |
5757
| ----------------- | ------------------------------------------------------ | -------- | ------- |
5858
| unspecified-content-type-action | [Action](#actions) to perform for requests or responses with a content type that isn’t specified in the API schema. Policy expressions are allowed. | Yes | N/A |
59-
| max-size | Maximum length of the body of the request or response in bytes, checked against the `Content-Length` header. If the request body or response body is compressed, this value is the decompressed length. Maximum allowed value: 102,400 bytes (100 KB). (Contact [support](https://azure.microsoft.com/support/options/) if you need to increase this limit.) Policy expressions are allowed. | Yes | N/A |
59+
| max-size | Maximum length of the body of the request or response in bytes, checked against the `Content-Length` header. If the request body or response body is compressed, this value is the decompressed length. Maximum allowed value: 4 MB. Policy expressions are allowed. | Yes | N/A |
6060
| size-exceeded-action | [Action](#actions) to perform for requests or responses whose body exceeds the size specified in `max-size`. Policy expressions are allowed.| Yes | N/A |
6161
| errors-variable-name | Name of the variable in `context.Variables` to log validation errors to. Policy expressions aren't allowed. | No | N/A |
6262

articles/azure-functions/create-first-function-cli-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Before you begin, you must have the following:
3131

3232
+ The [.NET 6.0 SDK](https://dotnet.microsoft.com/download)
3333

34-
+ [PowerShell 7.2](/powershell/scripting/install/installing-powershell-core-on-windows)
34+
+ [PowerShell 7.4](/powershell/scripting/install/installing-powershell-core-on-windows)
3535

3636
[!INCLUDE [functions-install-core-tools](../../includes/functions-install-core-tools.md)]
3737

articles/azure-functions/functions-reference-powershell.md

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -389,34 +389,40 @@ The following table shows the PowerShell versions available to each major versio
389389

390390
| Functions version | PowerShell version | .NET version |
391391
|-------------------|--------------------------------------------------|---------------|
392-
| 4.x | PowerShell 7.2 | .NET 6 |
392+
| 4.x | PowerShell 7.4 | .NET 8 |
393+
| 4.x | PowerShell 7.2 (support ending) | .NET 6 |
393394

394395
You can see the current version by printing `$PSVersionTable` from any function.
395396

396397
To learn more about Azure Functions runtime support policy, please refer to this [article](./language-support-policy.md)
397398

399+
> [!NOTE]
400+
> Support for PowerShell 7.2 in Azure Functions ends on November 8, 2024. You might have to resolve some breaking changes when upgrading your PowerShell 7.2 functions to run on PowerShell 7.4. Follow this [migration guide](https://github.com/Azure/azure-functions-powershell-worker/wiki/Upgrading-your-Azure-Function-Apps-to-run-on-PowerShell-7.4) to upgrade to PowerShell 7.4.
401+
398402
### Running local on a specific version
399403

400-
Support for PowerShell 7.0 in Azure Functions has ended on 3 December 2022. To use PowerShell 7.2 when running locally, you need to add the setting `"FUNCTIONS_WORKER_RUNTIME_VERSION" : "7.2"` to the `Values` array in the local.setting.json file in the project root. When running locally on PowerShell 7.2, your local.settings.json file looks like the following example:
404+
When running your PowerShell functions locally, you need to add the setting `"FUNCTIONS_WORKER_RUNTIME_VERSION" : "7.4"` to the `Values` array in the local.setting.json file in the project root. When running locally on PowerShell 7.4, your local.settings.json file looks like the following example:
401405

402406
```json
403407
{
404408
"IsEncrypted": false,
405409
"Values": {
406410
"AzureWebJobsStorage": "",
407411
"FUNCTIONS_WORKER_RUNTIME": "powershell",
408-
"FUNCTIONS_WORKER_RUNTIME_VERSION" : "7.2"
412+
"FUNCTIONS_WORKER_RUNTIME_VERSION" : "7.4"
409413
}
410414
}
411415
```
412416

413417
> [!NOTE]
414-
> In PowerShell Functions, the value "~7" for FUNCTIONS_WORKER_RUNTIME_VERSION refers to "7.0.x". We do not automatically upgrade PowerShell Function apps that have "~7" to "7.2". Going forward, for PowerShell Function Apps, we will require that apps specify both the major and minor version they want to target. Hence, it is necessary to mention "7.2" if you want to target "7.2.x"
418+
> In PowerShell Functions, the value "~7" for FUNCTIONS_WORKER_RUNTIME_VERSION refers to "7.0.x". We do not automatically upgrade PowerShell Function apps that have "~7" to "7.4". Going forward, for PowerShell Function Apps, we will require that apps specify both the major and minor version they want to target. Hence, it is necessary to mention "7.4" if you want to target "7.4.x"
415419
416420
### Changing the PowerShell version
417421

418-
Support for PowerShell 7.0 in Azure Functions has ended on 3 December 2022. To upgrade your Function App to PowerShell 7.2, ensure the value of FUNCTIONS_EXTENSION_VERSION is set to ~4. To learn how to do this, see [View and update the current runtime version](set-runtime-version.md#view-the-current-runtime-version).
422+
Take these considerations into account before you migrate your PowerShell function app to PowerShell 7.4:
423+
+ Because the migration might introduce breaking changes in your app, review this [migration guide](https://github.com/Azure/azure-functions-powershell-worker/wiki/Upgrading-your-Azure-Function-Apps-to-run-on-PowerShell-7.4) before upgrading your app to PowerShell 7.4.
419424

425+
+ Make sure that your function app is running on the latest version of the Functions runtime in Azure, which is version 4.x. For more information, see [View and update the current runtime version](set-runtime-version.md#view-the-current-runtime-version).
420426

421427
Use the following steps to change the PowerShell version used by your function app. You can do this either in the Azure portal or by using PowerShell.
422428

@@ -430,6 +436,9 @@ Use the following steps to change the PowerShell version used by your function a
430436

431437
1. Choose your desired **PowerShell Core version** and select **Save**. When warned about the pending restart choose **Continue**. The function app restarts on the chosen PowerShell version.
432438

439+
> [!NOTE]
440+
> Azure Functions support for PowerShell 7.4 is generally available (GA). You may see PowerShell 7.4 still indicated as preview in the Azure portal, but this will be updated soon to reflect the GA status.
441+
433442
# [PowerShell](#tab/powershell)
434443

435444
Run the following script to change the PowerShell version:
@@ -439,7 +448,7 @@ Set-AzResource -ResourceId "/subscriptions/<SUBSCRIPTION_ID>/resourceGroups/<RES
439448
440449
```
441450

442-
Replace `<SUBSCRIPTION_ID>`, `<RESOURCE_GROUP>`, and `<FUNCTION_APP>` with the ID of your Azure subscription, the name of your resource group and function app, respectively. Also, replace `<VERSION>` with `7.2`. You can verify the updated value of the `powerShellVersion` setting in `Properties` of the returned hash table.
451+
Replace `<SUBSCRIPTION_ID>`, `<RESOURCE_GROUP>`, and `<FUNCTION_APP>` with the ID of your Azure subscription, the name of your resource group and function app, respectively. Also, replace `<VERSION>` with `7.4`. You can verify the updated value of the `powerShellVersion` setting in `Properties` of the returned hash table.
443452

444453
---
445454

articles/azure-functions/start-stop-vms/deploy.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,9 @@ For each scenario, you can target the action against one or more subscriptions,
141141

142142
:::image type="content" source="media/deploy/schedule-recurrence-property.png" alt-text="Configure the recurrence frequency for logic app":::
143143

144+
> [!NOTE]
145+
> If you do not provide a start date and time for the first recurrence, a recurrence will immediately run when you save the logic app, which might cause the VMs to start or stop before the scheduled run.
146+
144147
1. In the designer pane, select **Function-Try** to configure the target settings. In the request body, if you want to manage VMs across all resource groups in the subscription, modify the request body as shown in the following example.
145148

146149
```json
@@ -238,6 +241,9 @@ In an environment that includes two or more components on multiple Azure Resourc
238241

239242
:::image type="content" source="media/deploy/schedule-recurrence-property.png" alt-text="Configure the recurrence frequency for logic app":::
240243

244+
> [!NOTE]
245+
> If you do not provide a start date and time for the first recurrence, a recurrence will immediately run when you save the logic app, which might cause the VMs to start or stop before the scheduled run.
246+
241247
1. In the designer pane, select **Function-Try** to configure the target settings and then select the **</> Code view** button in the top menu to edit the code for the **Function-Try** element. In the request body, if you want to manage VMs across all resource groups in the subscription, modify the request body as shown in the following example.
242248

243249
```json

articles/azure-functions/start-stop-vms/overview.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ This new version of Start/Stop VMs v2 provides a decentralized low-cost automati
1616

1717
## Important Start/Stop VMs v2 Updates
1818

19-
> + We've updated our Start/Stop VMs v2 function app resource to use [Azure Functions version 4.x](../functions-versions.md), and you'll get this version by default when you install Start/Stop VMs v2 from the marketplace. Existing customers should migrate from Functions version 3.x to version 4.x using our auto-update functionality. This functionality gets the latest version either by running the TriggerAutoUpdate timer function once manually or waiting for the schedule to run, if you've enabled it.
19+
> + No further development, enhancements, or updates will be available for Start/Stop V2 except when required to remain on supported versions of components and Azure services.
2020
>
21-
> + We've added a plan (**AZ - Availability Zone**) to our Start/Stop VMs v2 solution to enable a more reliable offering. You can now choose between Consumption and Availability Zone plans before you start your deployment. In most cases, the monthly cost of the Availability Zone plan is higher when compared to the Consumption plan.
22-
>
23-
> + Automatic updating functionality was introduced on April 28th, 2022. This new auto update feature helps you stay on the latest version of the solution. This feature is enabled by default when you perform a new installation.
24-
> If you deployed your solution before this date, you can reinstall to the latest version from our [GitHub repository](https://github.com/microsoft/startstopv2-deployments)
21+
> + The TriggerAutoUpdate and UpdateStartStopV2 functions are now deprecated and will be removed in future updates to Start/Stop,V2. To update Start/Stop V2, we recommend that you stop the site, install to the latest version from our [GitHub repository](https://github.com/microsoft/startstopv2-deployments), and the start the site. No built-in notification system is available for updates. After an update to Start/Stop V2 becomes available, we will update the [readme.md](https://github.com/microsoft/startstopv2-deployments/blob/main/README.md) in the GitHub repository. Third-party Github file watchers might be available to enable you to be notified of changes. To disable the automatic update functionality, set the Function App's **AzureClientOptions:EnableAutoUpdate** [application setting](../functions-how-to-use-azure-function-app-settings.md?tabs=azure-portal%2Cto-premium#get-started-in-the-azure-portal) to **false**.
22+
>
23+
> + As of August 19, 2024. Start/Stop v2 has been updated to the [.NET 8 isolated worker model](../functions-versions.md?tabs=isolated-process%2Cv4&pivots=programming-language-csharp#languages).
24+
2525

2626
## Overview
2727

@@ -43,8 +43,8 @@ An HTTP trigger function endpoint is created to support the schedule and sequenc
4343
|CostAnalyticsFunction |Timer |This function is used by Microsoft to estimate aggregate cost of Start/Stop V2 across customers. This function does not impact the functionality of Start/Stop V2.|
4444
|SavingsAnalyticsFunction |Timer |This function is used by Microsoft to estimate aggregate savings of Start/Stop V2 across customers. This function does not impact the functionality of Start/Stop V2.|
4545
|VirtualMachineSavingsFunction |Queue |This function performs the actual savings calculation on a VM achieved by the Start/Stop V2 solution.|
46-
|TriggerAutoUpdate |Timer |This function starts the auto update process based on the application setting "**EnableAutoUpdate=true**".|
47-
|UpdateStartStopV2 |Queue |This function performs the actual auto update execution, which validates your current version with the available version and decides the final action.|
46+
|TriggerAutoUpdate |Timer |Deprecated. This function starts the auto update process based on the application setting "**AzureClientOptions:EnableAutoUpdate=true**".|
47+
|UpdateStartStopV2 |Queue |Deprecated. This function performs the actual auto update execution, which validates your current version with the available version and decides the final action.|
4848

4949
For example, **Scheduled** HTTP trigger function is used to handle schedule and sequence scenarios. Similarly, **AutoStop** HTTP trigger function handles the auto stop scenario.
5050

articles/cost-management-billing/reservations/azure-openai.md

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
title: Save costs with Microsoft Azure OpenAI Service Provisioned Reservations
3-
description: Learn about how to save costs with Microsoft Azure OpenAI Service Provisioned Reservations.
3+
description: Save costs with Microsoft Azure OpenAI Service Provisioned Reservations by committing to a reservation for your provisioned throughput units.
44
author: bandersmsft
55
ms.reviewer: primittal
66
ms.service: cost-management-billing
77
ms.subservice: reservations
8-
ms.topic: concept-article
9-
ms.date: 08/30/2024
8+
ms.topic: how-to
9+
ms.date: 09/04/2024
1010
ms.author: banders
1111
# customer intent: As a billing administrator, I want to learn about saving costs with Microsoft Azure OpenAI Service Provisioned Reservations and buy one.
1212
---
@@ -17,15 +17,19 @@ You can save money on Azure OpenAI provisioned throughput by committing to a res
1717

1818
To purchase an Azure OpenAI reservation, you choose an Azure region, quantity, and then add the Azure OpenAI SKU to your cart. Then you choose the quantity of provisioned throughput units that you want to purchase.
1919

20-
When you purchase a reservation, the Azure OpenAI provisioned throughput usage that matches the reservation attributes is no longer charged at the hourly rates.
20+
When you purchase a reservation, the Azure OpenAI provisioned throughput usage that matches the reservation attributes is no longer charged at the hourly rates. For pricing information, see the [Azure OpenAI Service pricing](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/) page.
21+
22+
## Reservation application
2123

2224
A reservation applies to provisioned deployments only and doesn't include other offerings such as standard deployments or fine tuning. Azure OpenAI Service Provisioned Reservations also don't guarantee capacity availability. To ensure capacity availability, the recommended best practice is to create your deployments before you buy your reservation.
2325

2426
When the reservation expires, Azure OpenAI deployments continue to run but are billed at the hourly rate.
2527

28+
## Renewal options
29+
2630
You can choose to enable automatic renewal of reservations by selecting the option in the renewal settings or at time of purchase. With Azure OpenAI reservation auto renewal, the reservation renews using the same reservation order ID, and a new reservation doesn't get purchased. You can also choose to replace this reservation with a new reservation purchase in renewal settings and a replacement reservation is purchased when the reservation expires. By default, the replacement reservation has the same attributes as the expiring reservation. You can optionally change the name, billing frequency, term, or quantity in the renewal settings. Any user with owner access on the reservation and the subscription used for billing can set up renewal.
2731

28-
For pricing information, see the [Azure OpenAI Service pricing](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/) page.
32+
## Prerequisites
2933

3034
You can buy an Azure OpenAI reservation in the [Azure portal](https://portal.azure.com/#blade/Microsoft_Azure_Reservations/ReservationsBrowseBlade). Pay for the reservation [up front or with monthly payments](prepare-buy-reservation.md). To buy a reservation:
3135

@@ -44,6 +48,8 @@ For example, assume that your total consumption of provisioned throughput units
4448

4549
## Buy a Microsoft Azure OpenAI reservation
4650

51+
To buy an Azure OpenAI reservation, follow these steps:
52+
4753
1. Sign in to the [Azure portal](https://portal.azure.com/).
4854
2. Select **All services** > **Reservations** and then select **Azure OpenAI**
4955
:::image type="content" source="./media/azure-openai/purchase-openai.png" border="true" alt-text="Screenshot showing the Purchase reservations page." lightbox="./media/azure-openai/purchase-openai.png" :::
@@ -67,7 +73,9 @@ For example, assume that your total consumption of provisioned throughput units
6773

6874
## Cancel, exchange, or refund reservations
6975

70-
You can cancel or refund reservations with certain limitations. For more information, see [Self-service exchanges and refunds for Azure Reservations](exchange-and-refund-azure-reservations.md). However, Exchanges aren't allowed for Azure OpenAI Service Provisioned Reservations.
76+
*Exchange isn't supported for Azure OpenAI Service Provisioned reservations*.
77+
78+
You can cancel or refund reservations with certain limitations. For more information, see [Self-service exchanges and refunds for Azure Reservations](exchange-and-refund-azure-reservations.md).
7179

7280
If you want to request a refund for your Azure OpenAI reservation, you can do so by following these steps:
7381

@@ -105,9 +113,9 @@ The following examples show how the Azure OpenAI reservation discount applies, d
105113
- **Example 3** - A reservation that's smaller than the deployed units. For example, you purchase 200 PTUs on a reservation and you deploy 600 PTUs. In this example, the reservation discount is applied to the 200 PTUs that were used. The remaining 400 PTUs are charged at the pay-as-you-go rate.
106114
- **Example 4** - A reservation that's the same size as the total of two deployments. For example, you purchase 200 PTUs on a reservation and you have two deployments of 100 PTUs each. In this example, the discount is applied to the sum of deployed units.
107115

108-
## Increase the size of an Azure OpenAI reservation
116+
## Increase Azure OpenAI reservation capacity
109117

110-
If you want to increase the size of your Azure OpenAI reservation, you can buy more Azure OpenAI Service Provisioned Reservations using the preceding steps.
118+
You can't change the size of a purchased reservation. If you want to increase your Azure OpenAI reservation capacity to cover more hourly PTUs, you can buy more Azure OpenAI Service Provisioned reservations.
111119

112120
## Related content
113121

0 commit comments

Comments
 (0)