Skip to content

Commit 9a7afcc

Browse files
Learn Build Service GitHub AppLearn Build Service GitHub App
authored andcommitted
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents fe21e5a + 1ef5635 commit 9a7afcc

File tree

152 files changed

+978
-825
lines changed

Some content is hidden

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

152 files changed

+978
-825
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/virtual-network/migrate-classic-vnet-powershell.md",
5+
"redirect_url": "/previous-versions/azure/virtual-network/migrate-classic-vnet-powershell",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path": "articles/modeling-simulation-workbench/index.yml",
510
"redirect_url": "/azure",

articles/api-management/api-management-policies.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ More information about policies:
3838
| [Set usage quota by subscription](quota-policy.md) | Allows you to enforce a renewable or lifetime call volume and/or bandwidth quota, on a per subscription basis. | Yes | Yes | Yes | Yes | Yes |
3939
| [Set usage quota by key](quota-by-key-policy.md) | Allows you to enforce a renewable or lifetime call volume and/or bandwidth quota, on a per key basis. | Yes | No | No | Yes | Yes |
4040
| [Limit concurrency](limit-concurrency-policy.md) | Prevents enclosed policies from executing by more than the specified number of requests at a time. | Yes | Yes | Yes | Yes | Yes |
41-
| [Limit Azure OpenAI Service token usage](azure-openai-token-limit-policy.md) | Prevents Azure OpenAI API usage spikes by limiting large language model tokens per calculated key. | Yes | Yes | No | No | Yes |
42-
| [Limit large language model API token usage](llm-token-limit-policy.md) | Prevents large language model (LLM) API usage spikes by limiting LLM tokens per calculated key. | Yes | Yes | No | No | Yes |
41+
| [Limit Azure OpenAI Service token usage](azure-openai-token-limit-policy.md) | Prevents Azure OpenAI API usage spikes by limiting large language model tokens per calculated key. | Yes | Yes | No | Yes | Yes |
42+
| [Limit large language model API token usage](llm-token-limit-policy.md) | Prevents large language model (LLM) API usage spikes by limiting LLM tokens per calculated key. | Yes | Yes | No | Yes | Yes |
4343

4444
## Authentication and authorization
4545

articles/app-service/manage-create-arc-environment.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: msangapu-msft
55
ms.author: msangapu
66
ms.topic: article
77
ms.custom: devx-track-azurecli
8-
ms.date: 09/23/2024
8+
ms.date: 01/15/2025
99
---
1010
# Set up an Azure Arc-enabled Kubernetes cluster to run App Service, Functions, and Logic Apps (Preview)
1111

@@ -297,7 +297,7 @@ While a [Log Analytic workspace](/azure/azure-monitor/logs/quick-create-workspac
297297
| `appsNamespace` | The namespace to provision the app definitions and pods. **Must** match that of the extension release namespace. |
298298
| `clusterName` | The name of the App Service Kubernetes environment that is created against this extension. |
299299
| `keda.enabled` | Whether [KEDA](https://keda.sh/) should be installed on the Kubernetes cluster. Accepts `true` or `false`. |
300-
| `buildService.storageClassName` | The [name of the storage class](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#class) for the build service to store build artifacts. A value like `default` specifies a class named `default`, and not [any class that is marked as default](https://kubernetes.io/docs/tasks/administer-cluster/change-default-storage-class/). Default is a valid storage class for AKS and AKS HCI but it may not be for other distributions/platforms. |
300+
| `buildService.storageClassName` | The [name of the storage class](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#class) for the build service to store build artifacts. A value like `default` specifies a class named `default`, and not [any class that is marked as default](https://kubernetes.io/docs/tasks/administer-cluster/change-default-storage-class/). Default is a valid storage class for AKS and AKS on Azure Local but it may not be for other distributions/platforms. |
301301
| `buildService.storageAccessMode` | The [access mode](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#access-modes) to use with the named storage class. Accepts `ReadWriteOnce` or `ReadWriteMany`. |
302302
| `customConfigMap` | The name of the config map that will be set by the App Service Kubernetes environment. Currently, it must be `<namespace>/kube-environment-config`, replacing `<namespace>` with the value of `appsNamespace`. |
303303
| `envoy.annotations.service.beta.kubernetes.io/azure-load-balancer-resource-group` | The name of the resource group in which the Azure Kubernetes Service cluster resides. Valid and required only when the underlying cluster is Azure Kubernetes Service. |

articles/app-service/overview-arc-integration.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: 'App Service on Azure Arc'
33
description: An introduction to App Service integration with Azure Arc for Azure operators.
44
ms.topic: article
55
ms.custom: devx-track-azurecli
6-
ms.date: 09/23/2024
6+
ms.date: 01/15/2025
77
author: apwestgarth
88
ms.author: msangapu
99
---
@@ -133,7 +133,7 @@ Arm64 based clusters aren't supported at this time.
133133

134134
### Which Kubernetes distributions can I deploy the extension on?
135135

136-
The extension has been validated on AKS, AKS on Azure Stack HCI, Google Kubernetes Engine, Amazon Elastic Kubernetes Service and Kubernetes Cluster API.
136+
The extension has been validated on AKS, AKS on Azure Local, Google Kubernetes Engine, Amazon Elastic Kubernetes Service and Kubernetes Cluster API.
137137

138138
## Extension Release Notes
139139

articles/azure-functions/durable/durable-functions-powershell-v2-sdk-migration-guide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Update-AzFunctionAppSetting -Name <FUNCTION_APP_NAME> -ResourceGroupName <RESOUR
8484

8585
### Install and import the SDK
8686

87-
You have two options for installing the SDK package: it can be installed as a [managed dependency](./../functions-reference-powershell.md#dependency-management), or as a [custom module](./../functions-reference-powershell.md#custom-modules).
87+
You have two options for installing the SDK package: it can be installed using [Managed Dependencies](./../functions-reference-powershell.md#managed-dependencies-feature), or [bundled with your app content](./../functions-reference-powershell.md#including-modules-in-app-content).
8888
In this section, we describe both options, but only one of them is needed.
8989

9090
#### Installation option 1: Use managed dependencies
@@ -119,7 +119,7 @@ Then you simply need to specify an entry for the DF SDK in your `requirements.ps
119119

120120
#### Installation option 2: Use custom modules
121121

122-
To install the standalone DF SDK as a custom module, you need to follow the [guidance regarding creating an app-level modules folder](./../functions-reference-powershell.md#function-app-level-modules-folder). Make sure to review the aforementioned docs for details.
122+
To install the standalone DF SDK as a custom module, you need to follow the [guidance regarding including modules in app content](./../functions-reference-powershell.md#including-modules-in-app-content). Make sure to review the aforementioned docs for details.
123123
In summary, you'll need to place the SDK package inside a `".\Modules"` directory located at the root of your app.
124124

125125
For example, from within your application's root, and after creating a `".\Modules"` directory, you may download the standalone SDK into the modules directory as such:

articles/azure-functions/flex-consumption-plan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ Keep these other considerations in mind when using Flex Consumption plan:
138138
+ **Regions**: Not all regions are currently supported. To learn more, see [View currently supported regions](flex-consumption-how-to.md#view-currently-supported-regions).
139139
+ **Deployments**: Deployment slots are not currently supported.
140140
+ **Scale**: The lowest maximum scale is currently `40`. The highest currently supported value is `1000`.
141-
+ **Managed dependencies**: [Managed dependencies in PowerShell](functions-reference-powershell.md#dependency-management) aren't supported by Flex Consumption. You must instead [define your own custom modules](functions-reference-powershell.md#custom-modules).
141+
+ **Managed dependencies**: [Managed dependencies in PowerShell](functions-reference-powershell.md#managed-dependencies-feature) aren't supported by Flex Consumption. You must instead [upload modules with app content](functions-reference-powershell.md#including-modules-in-app-content).
142142
+ **Diagnostic settings**: Diagnostic settings are not currently supported.
143143
+ **Certificates**: Loading certificates with the WEBSITE_LOAD_CERTIFICATES app setting is currently not supported.
144144
+ **Key Vault References**: Key Vault references in app settings don't work when Key Vault is network access restricted, even if the function app has Virtual Network integration. The current workaround is to directly reference the Key Vault in code and read the required secrets.

0 commit comments

Comments
 (0)