Skip to content

Commit 530abc9

Browse files
authored
Merge pull request #256211 from MicrosoftDocs/main
10/25/2023 PM Publish
2 parents a17af8f + cba73df commit 530abc9

File tree

86 files changed

+5603
-2018
lines changed

Some content is hidden

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

86 files changed

+5603
-2018
lines changed

.openpublishing.redirection.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9367,6 +9367,11 @@
93679367
"redirect_url": "/azure/azure-vmware/configure-site-to-site-vpn-gateway",
93689368
"redirect_document_id": false
93699369
},
9370+
{
9371+
"source_path_from_root": "/articles/vpn-gateway/vpn-gateway-howto-multi-site-to-site-resource-manager-portal.md",
9372+
"redirect_url": "/azure/vpn-gateway/add-remove-site-to-site-connections",
9373+
"redirect_document_id": false
9374+
},
93709375
{
93719376
"source_path_from_root": "/articles/vpn-gateway/vpn-gateway-howto-openvpn-clients.md",
93729377
"redirect_url": "/azure/vpn-gateway/point-to-site-vpn-client-cert-windows",
@@ -9381,7 +9386,7 @@
93819386
"source_path_from_root": "/articles/vpn-gateway/vpn-gateway-forced-tunneling-rm.md",
93829387
"redirect_url": "/azure/vpn-gateway/about-site-to-site-tunneling",
93839388
"redirect_document_id": false
9384-
},
9389+
},
93859390
{
93869391
"source_path_from_root": "/articles/azure-vmware/public-ip-usage.md",
93879392
"redirect_url": "/azure/azure-vmware/enable-public-ip-nsx-edge",

articles/api-center/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ In preview, create and use an API Center in the Azure portal for the following:
3838

3939
For more information about the information you can manage and the capabilities in API Center, see [Key concepts](key-concepts.md).
4040

41-
## Preview limitations
41+
## Available regions
4242

4343
* In preview, API Center is available in the following Azure regions:
4444
* Australia East

articles/api-center/set-up-api-center.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ If you haven't already, you need to register the **Microsoft.ApiCenter** resourc
5555

5656
1. Enter a **Name** for your API center. It must be unique in your subscription.
5757

58-
1. In **Region**, select one of the [available regions](overview.md#preview-limitations) for API Center preview.
58+
1. In **Region**, select one of the [available regions](overview.md#available-regions) for API Center preview.
5959

6060
1. Optionally, on the **Tags** tab, add one or more name/value pairs to help you categorize your Azure resources.
6161

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

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
2-
title: Policies in Azure API Management | Microsoft Docs
3-
description: Learn about policies in API Management, a way for API publishers to change API behavior through configuration. Policies are statements that run sequentially on the request or response of an API.
2+
title: Policies in Azure API Management
3+
description: Introduction to API Management policies, which change API behavior through configuration. Policy statements run sequentially on an API request or response.
44
services: api-management
55
documentationcenter: ''
66
author: dlepow
77

88
ms.service: api-management
99
ms.topic: article
10-
ms.date: 03/07/2023
10+
ms.date: 10/18/2023
1111
ms.author: danlep
1212

1313
---
@@ -65,7 +65,7 @@ By placing policy statements in the `on-error` section, you can:
6565
* Inspect and customize the error response using the `set-body` policy.
6666
* Configure what happens if an error occurs.
6767

68-
For more information, see [Error handling in API Management policies](./api-management-error-handling-policies.md)
68+
For more information, see [Error handling in API Management policies](./api-management-error-handling-policies.md).
6969

7070
## Policy expressions
7171

@@ -76,7 +76,7 @@ Unless the policy specifies otherwise, [policy expressions](api-management-polic
7676

7777
Each expression has access to the implicitly provided `context` variable and an allowed subset of .NET Framework types.
7878

79-
Policy expressions provide a sophisticated means to control traffic and modify API behavior without requiring you to write specialized code or modify backend services. Some policies are based on policy expressions, such as the [Control flow][Control flow] and [Set variable][Set variable]. For more information, see [Advanced policies][Advanced policies].
79+
Policy expressions provide a sophisticated means to control traffic and modify API behavior without requiring you to write specialized code or modify backend services. Some policies are based on policy expressions, such as [Control flow][Control flow] and [Set variable][Set variable]. For more information, see [Advanced policies][Advanced policies].
8080

8181
## Scopes
8282

@@ -95,10 +95,16 @@ When configuring a policy, you must first select the scope at which the policy a
9595
### Things to know
9696

9797
* For fine-grained control for different API consumers, you can configure policy definitions at more than one scope
98-
* Not all policies can be applied at each scope and policy section
99-
* When configuring policy definitions at more than one scope, you control the policy evaluation order in each policy section by placement of the `base` element
98+
* Not all policies are supported at each scope and policy section
99+
* When configuring policy definitions at more than one scope, you control policy inheritance and the policy evaluation order in each policy section by placement of the `base` element
100+
* Policies applied to API requests are also affected by the request context, including the presence or absence of a subscription key used in the request, the API or product scope of the subscription key, and whether the API or product requires a subscription.
100101

101-
For more information, see [Set or edit policies](set-edit-policies.md#use-base-element-to-set-policy-evaluation-order).
102+
[!INCLUDE [api-management-product-policy-alert](../../includes/api-management-product-policy-alert.md)]
103+
104+
For more information, see:
105+
106+
* [Set or edit policies](set-edit-policies.md#use-base-element-to-set-policy-evaluation-order)
107+
* [Subscriptions in API Management](api-management-subscriptions.md)
102108

103109
### GraphQL resolver policies
104110

articles/api-management/api-management-subscriptions.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ Each API Management instance comes with a built in all-access subscription that
7777
> [!WARNING]
7878
> The all-access subscription enables access to every API in the API Management instance and should only be used by authorized users. Never use this subscription for routine API access or embed the all-access subscription key in client apps.
7979
80-
> [!NOTE]
81-
> If you're using an API-scoped subscription or the all-access subscription, any [policies](api-management-howto-policies.md) configured at the product scope aren't applied to requests from that subscription.
80+
[!INCLUDE [api-management-product-policy-alert](../../includes/api-management-product-policy-alert.md)]
8281

8382
### Standalone subscriptions
8483

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22
title: How to set or edit Azure API Management policies | Microsoft Docs
3-
description: Learn how to use the Azure portal to set or edit policies in an Azure API Management instance. Policies are defined in XML documents that contain a sequence of statements that are run sequentially on the request or response of an API.
3+
description: Configure policies at different scopes in an Azure API Management instance using the policy editor in the Azure portal.
44
services: api-management
55
documentationcenter: ''
66
author: dlepow
77

88
ms.service: api-management
99
ms.topic: how-to
10-
ms.date: 03/01/2022
10+
ms.date: 10/18/2023
1111
ms.author: danlep
1212
---
1313

@@ -149,6 +149,8 @@ Product scope is configured for a selected product.
149149

150150
1. Select **Save** to propagate changes to the API Management gateway immediately.
151151

152+
153+
152154
### API scope
153155

154156
API scope is configured for **All operations** of the selected API.
@@ -221,7 +223,7 @@ To modify the policy evaluation order using the policy editor:
221223

222224
A globally scoped policy has no parent scope, and using the `base` element in it has no effect.
223225

224-
## Next steps
226+
## Related content
225227

226228
For more information about working with policies, see:
227229

articles/application-gateway/proxy-buffers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,4 @@ For reference, visit [Azure SDK for .NET](/dotnet/api/microsoft.azure.management
8686
## Limitations
8787
- API version 2020-01-01 or later should be used to configure buffers.
8888
- Currently, these changes are not supported through Portal and PowerShell.
89-
- Request and Response Buffers can only be disabled for the WAF v2 SKU if request body checking is disabled. Otherwise, Request and Response Buffers cannot be disabled for the WAF v2 SKU.
89+
- Request buffering cannot be disabled if you are running the WAF SKU of Application Gateway. The WAF requires the full request to buffer as part of processing, therefore, even if you disable request buffering within Application Gateway the WAF will still buffer the request. Response buffering is not impacted by the WAF.

articles/azure-arc/resource-bridge/upgrade.md

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Or to upgrade a resource bridge on Azure Stack HCI, run: `az arcappliance upgrad
7070

7171
Currently, private cloud providers differ in how they perform Arc resource bridge upgrades. Review the following information to see how to upgrade your Arc resource bridge for a specific provider.
7272

73-
For Arc-enabled VMware vSphere (preview), manual upgrade is available, and cloud-managed upgrade is supported for appliances on version 1.0.15 and higher. When Arc-enabled VMware vSphere announces General Availability, appliances on version 1.0.15 and higher will receive cloud-managed upgrade as the default experience. Appliances that are below version 1.0.15 must be manually upgraded.
73+
For Arc-enabled VMware vSphere (preview), manual upgrade is available, and cloud-managed upgrade is supported for appliances on version 1.0.15 and higher. When Arc-enabled VMware vSphere announces General Availability, appliances on version 1.0.15 and higher will receive cloud-managed upgrade as the default experience. Appliances that are below version 1.0.15 must be manually upgraded.
7474

7575
[Azure Arc VM management (preview) on Azure Stack HCI](/azure-stack/hci/manage/azure-arc-vm-management-overview) supports upgrade of an Arc resource bridge on Azure Stack HCI, version 22H2 up until appliance version 1.0.14 and `az arcappliance` CLI extension version 0.2.33. These upgrades can be done through manual upgrade or a support request for cloud-managed upgrade. For subsequent upgrades, you must transition to Azure Stack HCI, version 23H2 (preview). In version 23H2 (preview), the LCM tool manages upgrades across all components as a "validated recipe" package. For more information, visit the [Arc VM management FAQ page](/azure-stack/hci/manage/azure-arc-vms-faq).
7676

@@ -82,14 +82,16 @@ The Arc resource bridge version is tied to the versions of underlying components
8282

8383
## Supported versions
8484

85-
Generally, the latest released version and the previous three versions (n-3) of Arc resource bridge are supported. For example, if the current version is 1.0.10, then the typical n-3 supported versions are:
85+
Generally, the latest released version and the previous three versions (n-3) of Arc resource bridge are supported, starting from appliance version 1.0.15 and onward. An Arc resource bridge with an appliance version earlier than 1.0.15 must be upgraded or redeployed to be at minimum on appliance version 1.0.15 to be in a production support window.
8686

87-
- Current version: 1.0.10
88-
- n-1 version: 1.0.9
89-
- n-2 version: 1.0.8
90-
- n-3 version: 1.0.7
87+
For example, if the current version is 1.0.18, then the typical n-3 supported versions are:
9188

92-
There might be instances where supported versions are not sequential. For example, version 1.0.11 is released and later found to contain a bug. A hot fix is released in version 1.0.12 and version 1.0.11 is removed. In this scenario, n-3 supported versions become 1.0.12, 1.0.10, 1.0.9, 1.0.8.
89+
- Current version: 1.0.18
90+
- n-1 version: 1.0.17
91+
- n-2 version: 1.0.16
92+
- n-3 version: 1.0.15
93+
94+
There might be instances where supported versions are not sequential. For example, version 1.0.18 is released and later found to contain a bug. A hot fix is released in version 1.0.19 and version 1.0.18 is removed. In this scenario, n-3 supported versions become 1.0.19, 1.0.17, 1.0.16, 1.0.15.
9395

9496
Arc resource bridge typically releases a new version on a monthly cadence, at the end of the month, although it's possible that delays could push the release date further out. Regardless of when a new release comes out, if you are within n-3 supported versions, then your Arc resource bridge version is supported. To stay updated on releases, visit the [Arc resource bridge release notes](https://github.com/Azure/ArcResourceBridge/releases) on GitHub.
9597

@@ -113,3 +115,5 @@ To see the current version of an Arc resource bridge appliance, run `az arcappli
113115

114116
- Learn about [Arc resource bridge maintenance operations](maintenance.md).
115117
- Learn about [troubleshooting Arc resource bridge](troubleshoot-resource-bridge.md).
118+
119+

articles/azure-functions/configure-monitoring.md

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,14 @@ When custom application logs are sent directly, the host no longer be emits them
3737

3838
## Configure categories
3939

40-
The Azure Functions logger includes a *category* for every log. The category indicates which part of the runtime code or your function code wrote the log. Categories differ between version 1.x and later versions. The following chart describes the main categories of logs that the runtime creates:
40+
The Azure Functions logger includes a *category* for every log. The category indicates which part of the runtime code or your function code wrote the log. Categories differ between version 1.x and later versions.
41+
42+
Category names are assigned differently in Functions compared to other .NET frameworks. For example, when you use `ILogger<T>` in ASP.NET, the category is the name of the generic type. C# functions also use `ILogger<T>`, but instead of setting the generic type name as a category, the runtime assigns categories based on the source. For example:
43+
44+
+ Entries related to running a function are assigned a category of `Function.<FUNCTION_NAME>`.
45+
+ Entries created by user code inside the function, such as when calling `logger.LogInformation()`, are assigned a category of `Function.<FUNCTION_NAME>.User`.
46+
47+
The following chart describes the main categories of logs that the runtime creates:
4148

4249
# [v2.x+](#tab/v2)
4350

@@ -74,13 +81,11 @@ The **Table** column indicates to which table in Application Insights the log is
7481

7582
For each category, you indicate the minimum log level to send. The *host.json* settings vary depending on the [Functions runtime version](functions-versions.md).
7683

77-
The example below defines logging based on the following rules:
78-
79-
+ For logs of `Host.Results` or `Function`, only log events at `Error` or a higher level.
80-
+ For logs of `Host.Aggregator`, log all generated metrics (`Trace`).
81-
+ For all other logs, including user logs, log only `Information` level and higher events.
82-
+ For `fileLoggingMode` the default is `debugOnly`. The value `always` should only be used for short periods of time to review logs in the filesystem. Revert this setting when you are done debugging.
84+
The examples below define logging based on the following rules:
8385

86+
+ The default logging level is set to `Warning` to prevent [excessive logging](#solutions-with-high-volume-of-telemetry) for unanticipated categories.
87+
+ `Host.Aggregator` and `Host.Results` are set to lower levels. Setting these to too high a level (especially higher than `Information`) can result in loss of metrics and performance data.
88+
+ Logging for function runs is set to `Information`. This can be [overridden](functions-host-json.md#override-hostjson-values) in local development to `Debug` or `Trace`, when needed.
8489

8590
# [v2.x+](#tab/v2)
8691

@@ -89,10 +94,10 @@ The example below defines logging based on the following rules:
8994
"logging": {
9095
"fileLoggingMode": "debugOnly",
9196
"logLevel": {
92-
"default": "Information",
93-
"Host.Results": "Error",
94-
"Function": "Error",
95-
"Host.Aggregator": "Trace"
97+
"default": "Warning",
98+
"Host.Aggregator": "Trace",
99+
"Host.Results": "Information",
100+
"Function": "Information"
96101
}
97102
}
98103
}
@@ -104,11 +109,11 @@ The example below defines logging based on the following rules:
104109
{
105110
"logger": {
106111
"categoryFilter": {
107-
"defaultLevel": "Information",
112+
"defaultLevel": "Warning",
108113
"categoryLevels": {
109-
"Host.Results": "Error",
110-
"Function": "Error",
111-
"Host.Aggregator": "Trace"
114+
"Host.Results": "Information",
115+
"Host.Aggregator": "Trace",
116+
"Function": "Information"
112117
}
113118
}
114119
}

0 commit comments

Comments
 (0)