Skip to content

Commit 89460dc

Browse files
author
gitName
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into oas
2 parents fcdc4e7 + ed42d07 commit 89460dc

File tree

387 files changed

+1238
-1728
lines changed

Some content is hidden

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

387 files changed

+1238
-1728
lines changed

articles/api-management/v2-service-tiers-overview.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ The following API Management capabilities are currently unavailable in the v2 ti
7272

7373
**Infrastructure and networking**
7474
* Multi-region deployment
75+
* Availability zone support
7576
* Multiple custom domain names
7677
* Capacity metric - *replaced by CPU Percentage of Gateway and Memory Percentage of Gateway metrics*
7778
* Built-in analytics - *replaced by Azure Monitor-based dashboard*

articles/application-gateway/ssl-overview.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,9 @@ The following tables outline the differences in SNI between the v1 and v2 SKU in
123123
| If the client doesn't specify a SNI header and if all the multi-site headers are enabled with "Require SNI" | Resets the connection | Returns the certificate of the first HTTPS listener according to the order specified by the request routing rules associated with the HTTPS listeners
124124
| If the client doesn't specify SNI header and if there's a basic listener configured with a certificate | Returns the certificate configured in the basic listener to the client (default or fallback certificate) | Returns the certificate configured in the basic listener |
125125

126+
> [!NOTE]
127+
> When the client does not specify an SNI header, it is recommended that the user add a basic listener and rule to present a default SSL/TLS certificate.
128+
126129
> [!TIP]
127130
> The SNI flag can be configured with PowerShell or by using an ARM template. For more information, see [RequireServerNameIndication](/powershell/module/az.network/set-azapplicationgatewayhttplistener#-requireservernameindication) and [Quickstart: Direct web traffic with Azure Application Gateway - ARM template](quick-create-template.md#review-the-template).
128131

articles/azure-cache-for-redis/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@
444444
- name: Azure CLI
445445
href: /cli/azure/redisenterprise
446446
- name: REST
447-
href: /rest/api/redis/redisenterprisecache
447+
href: /rest/api/redis/redisenterprisecache/operation-groups
448448
- name: Resource Manager template
449449
href: /azure/templates/microsoft.cache/redisenterprise
450450
- name: Azure Cache for Redis
1.75 KB
Loading
76 Bytes
Loading

articles/azure-functions/configure-monitoring.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ The following table summarizes the configuration options available for each stac
3030
|-|-|
3131
| .NET (in-process model) | `host.json` |
3232
| .NET (isolated model) | Default (send custom logs to the Functions host): `host.json`<br/>To send logs directly to Application Insights, see: [Configure Application Insights in the HostBuilder](./dotnet-isolated-process-guide.md#application-insights) |
33-
| Node.JS | `host.json` |
33+
| Node.js | `host.json` |
3434
| Python | `host.json` |
3535
| Java | Default (send custom logs to the Functions host): `host.json`<br/>To send logs directly to Application Insights, see: [Configure the Application Insights Java agent](/azure/azure-monitor/app/monitor-functions#distributed-tracing-for-java-applications) |
3636
| PowerShell | `host.json` |

articles/azure-functions/container-concepts.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ There are several options for hosting your containerized function apps in Azure:
2323

2424
| Hosting option | Benefits |
2525
| --- | --- |
26-
| **[Azure Container Apps]** | Azure Functions provides integrated support for developing, deploying, and managing containerized function apps on [Azure Container Apps](../container-apps/overview.md). This enables you to manage your apps using the same Functions tools and pages in the Azure portal. Use Azure Container Apps to host your function app containers when you need to run your event-driven functions in Azure in the same environment as other microservices, APIs, websites, workflows, or any container hosted programs. Container Apps hosting lets you run your functions in a managed Kubernetes-based environment with built-in support for open-source monitoring, mTLS, Dapr, and KEDA. Supports scale-to-zero and provides a servless pay-for-what-you-use hosting model. You can also request dedicated hardware, even GPUs, by using workload profiles. _Recommended hosting option for running containerized function apps on Azure._ |
26+
| **[Azure Container Apps]** | Azure Functions provides integrated support for developing, deploying, and managing containerized function apps on [Azure Container Apps](../container-apps/overview.md). This enables you to manage your apps using the same Functions tools and pages in the Azure portal. Use Azure Container Apps to host your function app containers when you need to run your event-driven functions in Azure in the same environment as other microservices, APIs, websites, workflows, or any container hosted programs. Container Apps hosting lets you run your functions in a managed Kubernetes-based environment with built-in support for open-source monitoring, mTLS, Dapr, and KEDA. Supports scale-to-zero and provides a serverless pay-for-what-you-use hosting model. You can also request dedicated hardware, even GPUs, by using workload profiles. _Recommended hosting option for running containerized function apps on Azure._ |
2727
| **Azure Arc-enabled Kubernetes clusters (preview)** | You can host your function apps on Azure Arc-enabled Kubernetes clusters as either a [code-only deployment](./create-first-function-arc-cli.md) or in a [custom Linux container](./create-first-function-arc-custom-container.md). Azure Arc lets you attach Kubernetes clusters so that you can manage and configure them in Azure. _Hosting Azure Functions containers on Azure Arc-enabled Kubernetes clusters is currently in preview._ |
2828
| **[Azure Functions]** | You can host your containerized function apps in Azure Functions by running the container in either an [Elastic Premium plan](./functions-premium-plan.md) or a [Dedicated plan](./dedicated-plan.md). Premium plan hosting provides you with the benefits of dynamic scaling. You might want to use Dedicated plan hosting to take advantage of existing unused App Service plan resources. |
2929
| **[Kubernetes]** | Because the Azure Functions runtime provides flexibility in hosting where and how you want, you can host and manage your function app containers directly in Kubernetes clusters. [KEDA](https://keda.sh) (Kubernetes-based Event Driven Autoscaling) pairs seamlessly with the Azure Functions runtime and tooling to provide event driven scale in Kubernetes. Just keep in mind that running your containerized function apps on Kubernetes, either by using KEDA or by direct deployment, is an open-source effort that you can use free of cost, with best-effort support provided by contributors and from the community. You're responsible for maintaining your own function app containers in a cluster, even when deploying to Azure Kubernetes Service (AKS). |
@@ -44,7 +44,7 @@ The degree to which various features and behaviors of Azure Functions are suppor
4444
| [Revisions](../container-apps/revisions.md) | No | Yes |No |No |No |
4545
| [Deployment slots](./functions-deployment-slots.md) |No |No |Yes |Yes |No |
4646
| [Streaming logs](./streaming-logs.md) | Yes | [Yes](../container-apps/log-streaming.md) | Yes | Yes | No |
47-
| [Console access](../container-apps/container-console.md) | Not currently available<sup>4</sup| Yes | Yes (using [Kudu](./functions-how-to-custom-container.md#enable-ssh-connections)| Yes (using [Kudu](./functions-how-to-custom-container.md#enable-ssh-connections)| Yes (in pods [using `kubctl`](https://kubernetes.io/docs/reference/kubectl/)) |
47+
| [Console access](../container-apps/container-console.md) | Not currently available<sup>4</sup| Yes | Yes (using [Kudu](./functions-how-to-custom-container.md#enable-ssh-connections)| Yes (using [Kudu](./functions-how-to-custom-container.md#enable-ssh-connections)| Yes (in pods [using `kubectl`](https://kubernetes.io/docs/reference/kubectl/)) |
4848
| Cold start mitigation | Minimum replicas | [Scale rules](../container-apps/scale-app.md#scale-rules) | [Always-ready/pre-warmed instances](functions-premium-plan.md#eliminate-cold-starts) | n/a | n/a |
4949
| [App Service authentication](../app-service/overview-authentication-authorization.md) | Not currently available<sup>4</sup| Yes | Yes | Yes | No |
5050
| [Custom domain names](../app-service/app-service-web-tutorial-custom-domain.md) | Not currently available<sup>4</sup| Yes | Yes | Yes | No |

articles/azure-functions/dedicated-plan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ You pay for function apps in an App Service Plan as you would for other App Serv
3030
When you run your app on an App Service plan, you should enable the **Always on** setting so that your function app runs correctly. On an App Service plan, the Functions runtime goes idle after a few minutes of inactivity. The **Always on** setting is available only on an App Service plan. In other plans, the platform activates function apps automatically. If you choose not to enable **Always on**, you can reactivate an idled app in these ways:
3131

3232
+ Send a request to an HTTP trigger endpoint or any other endpoint on the app. Even a failed request should wake up your app.
33-
+ Acccess your app in the [Azure portal](https://portal.azure.com).
33+
+ Access your app in the [Azure portal](https://portal.azure.com).
3434

3535
Even with **Always on** enabled, the execution timeout for individual functions is controlled by the `functionTimeout` setting in the [host.json](functions-host-json.md#functiontimeout) project file.
3636

articles/azure-functions/durable/durable-functions-dotnet-isolated-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public class MyActivity : TaskActivity<string, string>
6161
{
6262
private readonly ILogger logger;
6363

64-
public MyActivity(ILogger<MyActivity> logger) // activites have access to DI.
64+
public MyActivity(ILogger<MyActivity> logger) // activities have access to DI.
6565
{
6666
this.logger = logger;
6767
}

articles/azure-functions/durable/durable-functions-entities.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -451,10 +451,10 @@ public static async Task<HttpResponseData> Run(
451451

452452
if (entity is null)
453453
{
454-
return request.CreateResponse(HttpStatusCode.NotFound);
454+
return req.CreateResponse(HttpStatusCode.NotFound);
455455
}
456456

457-
HttpResponseData response = request.CreateResponse(HttpStatusCode.OK);
457+
HttpResponseData response = req.CreateResponse(HttpStatusCode.OK);
458458
await response.WriteAsJsonAsync(entity);
459459

460460
return response;

0 commit comments

Comments
 (0)