Skip to content

Commit 1e94c2c

Browse files
authored
Merge pull request #290715 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents d8d496e + bd9050a commit 1e94c2c

File tree

22 files changed

+51
-31
lines changed

22 files changed

+51
-31
lines changed

articles/app-service/ip-address-change-ssl.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ If you received a notification that the TLS/SSL IP address of your Azure App Ser
2626

2727
3. Select your App Service app from the list.
2828

29-
4. Under the **Settings** header, click **SSL settings** in the left navigation.
29+
4. Under the **Settings** header, click **Custom domain** in the left navigation.
3030

31-
1. In the TLS/SSL bindings section, select the host name record. In the editor that opens, choose **SNI SSL** on the **SSL Type** drop-down menu and click **Add Binding**. When you see the operation success message, the existing IP address has been released.
31+
5. In the **Custom domains** section, look for the domain with the Binding type of IP Based SSL. Click the three elipses for that domain and select **Update binding**. In the editor that opens, choose **SNI SSL** for the TLS/SSL type and click **Update**.
3232

33-
6. In the **SSL bindings** section, again select the same host name record with the certificate. In the editor that opens, this time choose **IP Based SSL** on the **SSL Type** drop-down menu and click **Add Binding**. When you see the operation success message, you’ve acquired a new IP address.
33+
6. In the **Custom domains** section, select the same host name record. In the editor that opens, this time choose **IP Based SSL** for the TLS/SSL type and click **Update**. When you see the operation success message, you’ve acquired a new IP address.
3434

3535
7. If an A record (DNS record pointing directly to your IP address) is configured in your Domain Registration Portal (third party DNS Provider or Azure DNS), replace the existing IP address with the newly generated one. You can find the new IP address by following the instructions in the next section.
3636

articles/azure-functions/configure-monitoring.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -466,23 +466,23 @@ To configure these values at App settings level (and avoid redeployment on just
466466
| Host.json path | App setting |
467467
|----------------|-------------|
468468
| logging.logLevel.default | AzureFunctionsJobHost__logging__logLevel__default |
469-
| logging.logLevel.Host.Aggregator | AzureFunctionsJobHost__logging__logLevel__Host__Aggregator |
469+
| logging.logLevel.Host.Aggregator | AzureFunctionsJobHost__logging__logLevel__Host.Aggregator |
470470
| logging.logLevel.Function | AzureFunctionsJobHost__logging__logLevel__Function |
471-
| logging.logLevel.Function.Function1 | AzureFunctionsJobHost__logging__logLevel__Function__Function1 |
472-
| logging.logLevel.Function.Function1.User | AzureFunctionsJobHost__logging__logLevel__Function__Function1__User |
471+
| logging.logLevel.Function.Function1 | AzureFunctionsJobHost__logging__logLevel__Function.Function1 |
472+
| logging.logLevel.Function.Function1.User | AzureFunctionsJobHost__logging__logLevel__Function.Function1.User |
473473

474474
You can override the settings directly at the Azure portal Function App Configuration pane or by using an Azure CLI or PowerShell script.
475475

476476
# [Azure CLI](#tab/v2)
477477

478478
```azurecli-interactive
479-
az functionapp config appsettings set --name MyFunctionApp --resource-group MyResourceGroup --settings "AzureFunctionsJobHost__logging__logLevel__Host__Aggregator=Information"
479+
az functionapp config appsettings set --name MyFunctionApp --resource-group MyResourceGroup --settings "AzureFunctionsJobHost__logging__logLevel__Host.Aggregator=Information"
480480
```
481481

482482
# [PowerShell](#tab/v1)
483483

484484
```powershell
485-
Update-AzFunctionAppSetting -Name MyAppName -ResourceGroupName MyResourceGroupName -AppSetting @{"AzureFunctionsJobHost__logging__logLevel__Host__Aggregator" = "Information"}
485+
Update-AzFunctionAppSetting -Name MyAppName -ResourceGroupName MyResourceGroupName -AppSetting @{"AzureFunctionsJobHost__logging__logLevel__Host.Aggregator" = "Information"}
486486
```
487487

488488
---

articles/azure-functions/functions-monitoring.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ If you enable Applications Insights during development, you might hit this limit
2727
> [!IMPORTANT]
2828
> Application Insights has a [sampling](/azure/azure-monitor/app/sampling) feature that can protect you from producing too much telemetry data on completed executions at times of peak load. Sampling is enabled by default. If you appear to be missing data, you might need to adjust the sampling settings to fit your particular monitoring scenario. To learn more, see [Configure sampling](configure-monitoring.md#configure-sampling).
2929
30-
The full list of Application Insights features available to your function app is detailed in [Application Insights for Azure Functions supported features](/azure/azure-monitor/app/azure-functions-supported-features).
3130

3231
## Application Insights integration
3332

articles/azure-functions/functions-scale.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ The following is a summary of the benefits of the various options for Azure Func
3838
|**[Flex Consumption plan]**| Get rapid horizontal scaling with compute choices, virtual networking, and pay-as-you-go billing.<br/><br/>On the Flex Consumption plan, instances of the Functions host are dynamically added and removed based on the configured per instance concurrency and the number of incoming events. <br/><br/> ✔ Reduce cold starts by specifying a number of pre-provisioned (always ready) instances.<br/> ✔ Supports virtual networking for added security.<br/>✔ Pay when your functions are running.<br/>✔ Scales automatically, even during periods of high load.|
3939
|**[Premium plan]**|Automatically scales based on demand using prewarmed workers, which run applications with no delay after being idle, runs on more powerful instances, and connects to virtual networks. <br/><br/>Consider the Azure Functions Premium plan in the following situations: <br/><br/>✔ Your function apps run continuously, or nearly continuously.<br/>✔ You want more control of your instances and want to deploy multiple function apps on the same plan with event-driven scaling.<br/>✔ You have a high number of small executions and a high execution bill, but low GB seconds in the Consumption plan.<br/>✔ You need more CPU or memory options than are provided by consumption plans.<br/>✔ Your code needs to run longer than the maximum execution time allowed on the Consumption plan.<br/>✔ You require virtual network connectivity.<br/>✔ You want to provide a custom Linux image in which to run your functions. |
4040
|**[Dedicated plan]** |Run your functions within an App Service plan at regular [App Service plan rates](https://azure.microsoft.com/pricing/details/app-service/windows/).<br/><br/>Best for long-running scenarios where [Durable Functions](durable/durable-functions-overview.md) can't be used. Consider an App Service plan in the following situations:<br/><br/>✔ You have existing and underutilized virtual machines that are already running other App Service instances.<br/>✔ You must have fully predictable billing, or you need to manually scale instances.<br/>✔ You want to run multiple web apps and function apps on the same plan<br/>✔ You need access to larger compute size choices.<br/>✔ Full compute isolation and secure network access provided by an App Service Environment (ASE).<br/>✔ Very high memory usage and high scale (ASE).|
41-
| **[Container Apps]** | Create and deploy containerized function apps in a fully managed environment hosted by Azure Container Apps.<br/><br/>Use the Azure Functions programming model to build event-driven, serverless, cloud native function apps. Run your functions alongside other microservices, APIs, websites, and workflows as container-hosted programs. Consider hosting your functions on Container Apps in the following situations:<br/><br/>✔ You want to package custom libraries with your function code to support line-of-business apps.<br/>✔ You need to migration code execution from on-premises or legacy apps to cloud native microservices running in containers.<br/>✔ When you want to avoid the overhead and complexity of managing Kubernetes clusters and dedicated compute.<br/>✔ Your functions need high-end processing power provided by dedicated GPU compute resources. |
41+
| **[Container Apps]** | Create and deploy containerized function apps in a fully managed environment hosted by Azure Container Apps.<br/><br/>Use the Azure Functions programming model to build event-driven, serverless, cloud native function apps. Run your functions alongside other microservices, APIs, websites, and workflows as container-hosted programs. Consider hosting your functions on Container Apps in the following situations:<br/><br/>✔ You want to package custom libraries with your function code to support line-of-business apps.<br/>✔ You need to migrate code execution from on-premises or legacy apps to cloud native microservices running in containers.<br/>✔ When you want to avoid the overhead and complexity of managing Kubernetes clusters and dedicated compute.<br/>✔ Your functions need high-end processing power provided by dedicated GPU compute resources. |
4242
|**[Consumption plan]**| Pay for compute resources only when your functions are running (pay-as-you-go) with automatic scale.<br/><br/>On the Consumption plan, instances of the Functions host are dynamically added and removed based on the number of incoming events.<br/><br/> ✔ Default hosting plan that provides true _serverless_ hosting.<br/>✔ Pay only when your functions are running.<br/>✔ Scales automatically, even during periods of high load.|
4343

4444
The remaining tables in this article compare hosting options based on various features and behaviors.

articles/azure-maps/rest-sdk-developer-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.custom: devx-track-java, devx-track-js, devx-track-python, devx-track-ts
1313

1414
# REST SDK Developer Guide
1515

16-
You can call the Azure Maps [Rest API] directly from any programming language, however that can be error prone work requiring extra effort. To make incorporating Azure Maps in your applications easier and less error prone, the Azure Maps team has encapsulated their REST API in SDKs for C# (.NET), Python, JavaScript/Typescript, and Java.
16+
You can call the Azure Maps [Rest API] directly from any programming language, however that can be error prone work requiring extra effort. To make incorporating Azure Maps in your applications easier and less error prone, the Azure Maps team has encapsulated their REST API in SDKs for C# (.NET), Python, JavaScript/TypeScript, and Java.
1717

1818
This article lists the libraries currently available for each SDK with links to how-to articles to help you get started.
1919

articles/azure-resource-manager/management/move-support-resources.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -806,9 +806,11 @@ Before starting your move operation, review the [checklist](./move-resource-grou
806806
> [!div class="mx-tableFixed"]
807807
> | Resource type | Resource group | Subscription | Region move |
808808
> | ------------- | ----------- | ---------- | ----------- |
809-
> | databaseaccounts | **Yes** | Partial | No |
809+
> | databaseaccounts | **Yes** | **Yes** | No |
810+
> | mongoClusters | No | No | No |
811+
> | cassandraClusters | No | No | No |
810812
811-
Moves between subscriptions are supported for APIs that use the RU architecture (Microsoft.DocumentDB/databaseAccounts), but not for those based on the vCore architecture, such as:
813+
Moves between Resource groups and subscriptions are supported for APIs that use the RU architecture (Microsoft.DocumentDB/databaseAccounts), but not for those based on the vCore architecture, such as:
812814

813815
- MongoDB vCore (Microsoft.DocumentDB/mongoClusters)
814816
- Azure Managed Instance for Apache Cassandra (Microsoft.DocumentDB/cassandraClusters)

articles/azure-resource-manager/management/tag-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.date: 09/26/2024
77

88
# Tag support for Azure resources
99

10-
This article describes whether a resource type supports [tags](tag-resources.md). The column labeled **Supports tags** indicates whether the resource type has a property for the tag. The column labeled **Tag in cost report** indicates whether that resource type passes the tag to the cost report. You can view costs by tags in the [Cost Management cost analysis](../../cost-management-billing/costs/group-filter.md) and the [Azure billing invoice and daily usage data](../../cost-management-billing/manage/download-azure-invoice-daily-usage-date.md).
10+
This article describes whether a resource type supports [tags](tag-resources.md). The column labeled **Supports tags** indicates whether the resource type has a property for the tag. The column labeled **Tag in cost report** indicates whether that resource type passes the tag to the cost report. You can view costs by tags in the [Cost Management cost analysis](../../cost-management-billing/costs/group-filter.md) and the [Azure billing invoice and daily usage data](../../cost-management-billing/manage/download-azure-invoice-daily-usage-date.md). To ensure that all the usage/cost records are tagged irrespective of whether the resource supports or emits tags, use [tag inheritance in Cost Management.](../../cost-management-billing/costs/enable-tag-inheritance.md)
1111

1212
To get the same data as a file of comma-separated values, download [tag-support.csv](https://github.com/tfitzmac/resource-capabilities/blob/master/tag-support.csv).
1313

articles/baremetal-infrastructure/workloads/nc2-on-azure/architecture.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ When planning your NC2 on Azure design, use the following table to understand wh
112112
| Azure region | SKU |
113113
| :--- | :---: |
114114
| Australia East | AN36P |
115+
| Central India | AN36P |
115116
| East US | AN36 |
116117
| East US 2 | AN36P |
117118
| Germany West Central | AN36P |

articles/communication-services/how-tos/calling-sdk/closed-captions-teams-interop-how-to.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Learn how to allow your users to enable closed captions during a Teams interoper
2222
::: zone-end
2323

2424
::: zone pivot="platform-web"
25-
[!INCLUDE [Closed captions with Typescript](./includes/closed-captions/closed-captions-teams-interop-web.md)]
25+
[!INCLUDE [Closed captions with TypeScript](./includes/closed-captions/closed-captions-teams-interop-web.md)]
2626
::: zone-end
2727

2828
::: zone pivot="platform-android"

articles/communication-services/quickstarts/call-automation/quickstart-make-an-outbound-call.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Azure Communication Services Call Automation APIs are a powerful way to create i
2525
::: zone-end
2626

2727
::: zone pivot="programming-language-javascript"
28-
[!INCLUDE [Make an outbound call Typescript](./includes/quickstart-make-an-outbound-call-using-callautomation-node.md)]
28+
[!INCLUDE [Make an outbound call TypeScript](./includes/quickstart-make-an-outbound-call-using-callautomation-node.md)]
2929
::: zone-end
3030

3131
::: zone pivot="programming-language-python"

0 commit comments

Comments
 (0)