Skip to content

Commit dcca500

Browse files
committed
zone pivot adjustment, merge conflict
2 parents 0ca4eb3 + c83d46f commit dcca500

446 files changed

Lines changed: 12001 additions & 2914 deletions

File tree

Some content is hidden

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

.openpublishing.redirection.json

Lines changed: 80 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -565,6 +565,81 @@
565565
"redirect_url": "/azure/storage/files/create-file-share",
566566
"redirect_document_id": false
567567
},
568+
{
569+
"source_path": "articles/trusted-signing/overview.md",
570+
"redirect_url": "/azure/artifact-signing/overview",
571+
"redirect_document_id": false
572+
},
573+
{
574+
"source_path": "articles/trusted-signing/how-to-sign-ci-policy.md",
575+
"redirect_url": "/azure/artifact-signing/how-to-sign-ci-policy",
576+
"redirect_document_id": false
577+
},
578+
{
579+
"source_path": "articles/trusted-signing/quickstart.md",
580+
"redirect_url": "/azure/artifact-signing/quickstart",
581+
"redirect_document_id": false
582+
},
583+
{
584+
"source_path": "articles/trusted-signing/tutorial-assign-roles.md",
585+
"redirect_url": "/azure/artifact-signing/tutorial-assign-roles",
586+
"redirect_document_id": false
587+
},
588+
{
589+
"source_path": "articles/trusted-signing/how-to-signing-integrations.md",
590+
"redirect_url": "/azure/artifact-signing/how-to-signing-integrations",
591+
"redirect_document_id": false
592+
},
593+
{
594+
"source_path": "articles/trusted-signing/how-to-sign-history.md",
595+
"redirect_url": "/azure/artifact-signing/how-to-sign-history",
596+
"redirect_document_id": false
597+
},
598+
{
599+
"source_path": "articles/trusted-signing/how-to-renew-identity-validation.md",
600+
"redirect_url": "/azure/artifact-signing/how-to-renew-identity-validation",
601+
"redirect_document_id": false
602+
},
603+
{
604+
"source_path": "articles/trusted-signing/how-to-device-guard-signing-service-migration.md",
605+
"redirect_url": "/azure/artifact-signing/how-to-device-guard-signing-service-migration",
606+
"redirect_document_id": false
607+
},
608+
{
609+
"source_path": "articles/trusted-signing/how-to-change-sku.md",
610+
"redirect_url": "/azure/artifact-signing/how-to-change-sku",
611+
"redirect_document_id": false
612+
},
613+
{
614+
"source_path": "articles/trusted-signing/how-to-cert-revocation.md",
615+
"redirect_url": "/azure/artifact-signing/how-to-cert-revocation",
616+
"redirect_document_id": false
617+
},
618+
{
619+
"source_path": "articles/trusted-signing/concept-trust-models.md",
620+
"redirect_url": "/azure/artifact-signing/concept-trust-models",
621+
"redirect_document_id": false
622+
},
623+
{
624+
"source_path": "articles/trusted-signing/concept-resources-roles.md",
625+
"redirect_url": "/azure/artifact-signing/concept-resources-roles",
626+
"redirect_document_id": false
627+
},
628+
{
629+
"source_path": "articles/trusted-signing/concept-cert-management.md",
630+
"redirect_url": "/azure/artifact-signing/concept-certificate-management",
631+
"redirect_document_id": false
632+
},
633+
{
634+
"source_path": "articles/trusted-signing/index.yml",
635+
"redirect_url": "/azure/artifact-signing/index",
636+
"redirect_document_id": false
637+
},
638+
{
639+
"source_path": "articles/trusted-signing/faq.yml",
640+
"redirect_url": "/azure/artifact-signing/faq",
641+
"redirect_document_id": false
642+
},
568643
{
569644
"source_path": "articles/managed-ccf/application-scenarios.md",
570645
"redirect_url": "/azure/confidential-ledger/managed-confidential-consortium-framework-migration",
@@ -6579,7 +6654,11 @@
65796654
"source_path": "articles/reliability/reliability-health-insights.md",
65806655
"redirect_url": "/azure/azure-health-insights/reliability-health-insights",
65816656
"redirect_document_id": false
6657+
},
6658+
{
6659+
"source_path": "articles/reliability/migrate-load-balancer.md",
6660+
"redirect_url": "/azure/reliability/reliability-load-balancer",
6661+
"redirect_document_id": false
65826662
}
6583-
65846663
]
65856664
}

articles/active-directory-b2c/client-credentials-grant-flow.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ There are no specific actions to enable the client credentials for user flows or
152152
| grant_type | `client_credentials` |
153153
| client_id | The **Client ID** from the [Step 2 Register an application](#step-2-register-an-application). |
154154
| client_secret | The **Client secret** value from [Step 2.1 Create a client secret](#step-21-create-a-client-secret). |
155-
| scope | The **Application ID URI** from [Step 1.1 Define web API roles (scopes)](#step-11-define-web-api-roles-scopes) and `.default`. For example `https://contoso.onmicrosoft.com/api/.default`, or `https://contoso.onmicrosoft.com/00001111-aaaa-2222-bbbb-3333cccc4444/.default`.|
155+
| scope | The **Application ID URI** from [Step 1.1 Define web API roles (scopes)](#step-11-define-web-api-roles-scopes) and `.default`. For example `https://contoso.onmicrosoft.com/api/.default`, or `https://contoso.onmicrosoft.com/aaaabbbb-0000-cccc-1111-dddd2222eeee/.default`.|
156156

157157
The actual POST request looks like the following example:
158158

articles/active-directory-b2c/partner-biocatch.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ For the following instructions, see [Tutorial: Register a web application in Azu
407407

408408
"score": 275,
409409

410-
"tid": "aaaaaaaa-0000-1111-2222-bbbbbbbbbbbb"
410+
"tid": "bbbbcccc-1111-dddd-2222-eeee3333ffff"
411411

412412
}.[Signature]
413413

articles/active-directory-b2c/partner-dynamics-365-fraud-protection.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ In the provided [custom policies](https://github.com/azure-ad-b2c/partner-integr
117117
|{Settings:FacebookClientId}|App ID of the Facebook app you configured for federation with B2C| `000000000000000`|
118118
|{Settings:FacebookClientSecretKeyContainer}| Name of the policy key, in which you saved Facebook's app secret |`B2C_1A_FacebookAppSecret`|
119119
|{Settings:ContentDefinitionBaseUri}|Endpoint in where you deployed the UI files|`https://<my-storage-account>.blob.core.windows.net/<my-storage-container>`|
120-
|{Settings:DfpApiBaseUrl}|The base path for your DFP API instance, found in the DFP portal| `https://tenantname-00001111-aaaa-2222-bbbb-3333cccc4444.api.dfp.dynamics.com/v1.0/`|
120+
|{Settings:DfpApiBaseUrl}|The base path for your DFP API instance, found in the DFP portal| `https://tenantname-aaaabbbb-0000-cccc-1111-dddd2222eeee.api.dfp.dynamics.com/v1.0/`|
121121
|{Settings:DfpApiAuthScope}|The client_credentials scope for the DFP API service|`https://api.dfp.dynamics-int.com/.default or https://api.dfp.dynamics.com/.default`|
122122
|{Settings:DfpTenantId}|The ID of the Microsoft Entra tenant (not B2C) where DFP is licensed and installed|`00001111-aaaa-2222-bbbb-3333cccc4444` or `contoso.onmicrosoft.com` |
123123
|{Settings:DfpAppClientIdKeyContainer}|Name of the policy key-in which you save the DFP client ID|`B2C_1A_DFPClientId`|

articles/active-directory-b2c/partner-onfido.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ In [/samples/OnFido-Combined/Policies](https://github.com/azure-ad-b2c/partner-i
128128
|{your_tenant_IdentityExperienceFramework_appid}|IdentityExperienceFramework app App ID configured in your Azure AD B2C tenant|00001111-aaaa-2222-bbbb-3333cccc4444|
129129
|{your_tenant_ ProxyIdentityExperienceFramework_appid}|ProxyIdentityExperienceFramework app App ID configured in your Azure AD B2C tenant| 00001111-aaaa-2222-bbbb-3333cccc4444|
130130
|{your_tenant_extensions_appid}|Your tenant storage application App ID| 00001111-aaaa-2222-bbbb-3333cccc4444|
131-
|{your_tenant_extensions_app_objectid}|Your tenant storage application Object ID| aaaabbbb-0000-cccc-1111-dddd2222eeee|
131+
|{your_tenant_extensions_app_objectid}|Your tenant storage application Object ID| aaaaaaaa-0000-1111-2222-bbbbbbbbbbbb|
132132
|{your_app_insights_instrumentation_key}|Your app insights instance* instrumentation key|00001111-aaaa-2222-bbbb-3333cccc4444|
133133
|{your_ui_file_base_url}|Location URL of your UI folders **ocean_blue**, **dist**, and **assets**| `https://yourstorage.blob.core.windows.net/UI/`|
134134
|{your_app_service_URL}|The app service URL you set up|`https://yourapp.azurewebsites.net`|

articles/active-directory-b2c/partner-twilio.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ The following components make up the Twilio solution:
8282
- Update the following lines based on your certificate in the web.config:
8383

8484
```xml
85-
<add key="ida:SigningCertThumbprint" value="4F39D6014818082CBB763E5BA5F230E545212E89" />
85+
<add key="ida:SigningCertThumbprint" value="AA11BB22CC33DD44EE55FF66AA77BB88CC99DD00" />
8686
<add key="ida:SigningCertAlgorithm" value="RS256" />
8787
```
8888

articles/api-center/export-to-copilot-studio.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
description: Learn how to export an API definition from your Azure API center as a custom connector in Microsoft Copilot Studio.
66
author: dlepow
77
ms.author: danlep
8-
ms.service: azure-api-management
8+
ms.service: azure-api-center
99
ms.topic: how-to
1010
ms.date: 04/28/2025
1111
ms.collection: ce-skilling-ai-copilot

articles/api-management/api-management-gateways-overview.md

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.author: danlep
1616

1717
[!INCLUDE [api-management-availability-all-tiers](../../includes/api-management-availability-all-tiers.md)]
1818

19-
This article provides information about the roles and features of the API Management *gateway* component and compares the gateways you can deploy.
19+
This article describes the roles and features of the API Management *gateway* component. It also compares the gateways you can deploy.
2020

2121
Related information:
2222

@@ -34,21 +34,21 @@ The API Management *gateway* (also called *data plane* or *runtime*) is the serv
3434

3535

3636
> [!NOTE]
37-
> All requests to the API Management gateway, including those rejected by policy configurations, count toward configured rate limits, quotas, and billing limits if applied in the service tier.
37+
> All requests to the API Management gateway, including those rejected by policy configurations, count toward configured rate limits, quotas, and billing limits if the service tier applies them.
3838
3939

40-
## Managed and self-hosted
40+
## Managed and self-hosted gateways
4141

4242
API Management offers both managed and self-hosted gateways:
4343

44-
* **Managed** - The managed gateway is the default gateway component that is deployed in Azure for every API Management instance in every service tier. A standalone managed gateway can also be associated with a [workspace](workspaces-overview.md) in an API Management instance. With the managed gateway, all API traffic flows through Azure regardless of where backends implementing the APIs are hosted.
44+
* **Managed** - The managed gateway is the default gateway component that Azure deploys for every API Management instance in every service tier. You can also associate a standalone managed gateway with a [workspace](workspaces-overview.md) in an API Management instance in select service tiers. By using the managed gateway, all API traffic flows through Azure regardless of where backends implementing the APIs are hosted.
4545

4646
> [!NOTE]
4747
> Because of differences in the underlying service architecture, the gateways provided in the different API Management service tiers have some differences in capabilities. For details, see the section [Feature comparison: Managed versus self-hosted gateways](#feature-comparison-managed-versus-self-hosted-gateways).
4848
>
4949
5050

51-
* **Self-hosted** - The [self-hosted gateway](self-hosted-gateway-overview.md) is an optional, containerized version of the default managed gateway that is available in select service tiers. It's useful for hybrid and multicloud scenarios where there's a requirement to run the gateways off of Azure in the same environments where API backends are hosted. The self-hosted gateway enables customers with hybrid IT infrastructure to manage APIs hosted on-premises and across clouds from a single API Management service in Azure.
51+
* **Self-hosted** - The [self-hosted gateway](self-hosted-gateway-overview.md) is an optional, containerized version of the default managed gateway that's available in select service tiers. It's useful for hybrid and multicloud scenarios where there's a requirement to run the gateways off of Azure in the same environments where API backends are hosted. The self-hosted gateway enables customers with hybrid IT infrastructure to manage APIs hosted on-premises and across clouds from a single API Management service in Azure.
5252

5353
* The self-hosted gateway is [packaged](self-hosted-gateway-overview.md#packaging) as a Linux-based Docker container and is commonly deployed to Kubernetes, including to [Azure Kubernetes Service](how-to-deploy-self-hosted-gateway-azure-kubernetes-service.md) and [Azure Arc-enabled Kubernetes](how-to-deploy-self-hosted-gateway-azure-arc.md).
5454

@@ -66,7 +66,7 @@ The following tables compare features available in the following API Management
6666

6767
> [!NOTE]
6868
> * Some features of managed and self-hosted gateways are supported only in certain [service tiers](api-management-features.md) or with certain [deployment environments](self-hosted-gateway-overview.md#packaging) for self-hosted gateways.
69-
> * For the current supported features of the self-hosted gateway, ensure that you have upgraded to the latest major version of the self-hosted gateway [container image](self-hosted-gateway-overview.md#container-images).
69+
> * To see the current supported features of the self-hosted gateway, make sure you upgraded to the latest major version of the self-hosted gateway [container image](self-hosted-gateway-overview.md#container-images).
7070
> * See also self-hosted gateway [limitations](self-hosted-gateway-overview.md#limitations).
7171
7272
### Infrastructure
@@ -90,7 +90,7 @@ The following tables compare features available in the following API Management
9090

9191
<sup>1</sup> Depends on how the gateway is deployed, but is the responsibility of the customer.<br/>
9292
<sup>2</sup> Connectivity to the self-hosted gateway v2 [configuration endpoint](self-hosted-gateway-overview.md#fqdn-dependencies) requires DNS resolution of the endpoint hostname.<br/>
93-
<sup>3</sup> CA root certificates for self-hosted gateway are managed separately per gateway<br/>
93+
<sup>3</sup> CA root certificates for self-hosted gateway are managed separately per gateway.<br/>
9494
<sup>4</sup> Client protocol needs to be enabled.<br/>
9595
<sup>5</sup> Configure using the [forward-request](forward-request-policy.md) policy.<br/>
9696
<sup>6</sup> Configure CA certificate details for backend certificate authentication in [backend](backends.md) settings.
@@ -154,7 +154,7 @@ For details about monitoring options, see [Observability in Azure API Management
154154
| [Request tracing](api-management-howto-api-inspector.md) | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
155155

156156
<sup>1</sup> The v2 tiers support Azure Monitor-based analytics.<br/>
157-
<sup>2</sup> Gateway uses [Azure Application Insight's built-in memory buffer](/azure/azure-monitor/app/telemetry-channels#built-in-telemetry-channels) and does not provide delivery guarantees.<br/>
157+
<sup>2</sup> Gateway uses [Azure Application Insight's built-in memory buffer](/azure/azure-monitor/app/telemetry-channels#built-in-telemetry-channels) and doesn't provide delivery guarantees.<br/>
158158
<sup>3</sup> The self-hosted gateway currently doesn't send resource logs (diagnostic logs) to Azure Monitor. Optionally [send metrics](how-to-configure-cloud-metrics-logs.md) to Azure Monitor, or [configure and persist logs locally](how-to-configure-local-metrics-logs.md) where the self-hosted gateway is deployed.<br/>
159159

160160
### Authentication and authorization
@@ -169,17 +169,17 @@ Managed and self-hosted gateways support all available [API authentication and a
169169
## Gateway throughput and scaling
170170

171171
> [!IMPORTANT]
172-
> Throughput is affected by the number and rate of concurrent client connections, the kind and number of configured policies, payload sizes, backend API performance, and other factors. Self-hosted gateway throughput is also dependent on the compute capacity (CPU and memory) of the host where it runs. Perform gateway load testing using anticipated production conditions to determine expected throughput accurately.
172+
> Throughput depends on many factors, including the number and rate of concurrent client connections, the kind and number of configured policies, payload sizes, backend API performance, and other factors. Self-hosted gateway throughput also depends on the compute capacity (CPU and memory) of the host where it runs. To accurately determine expected throughput, perform gateway load testing by using anticipated production conditions.
173173
174174
### Managed gateway
175175

176176
For estimated maximum gateway throughput in the API Management service tiers, see [API Management pricing](https://azure.microsoft.com/pricing/details/api-management/).
177177

178178
> [!IMPORTANT]
179-
> Throughput figures are presented for information only and must not be relied upon for capacity and budget planning. See [API Management pricing](https://azure.microsoft.com/pricing/details/api-management/) for details.
179+
> Use the throughput figures for information only. Don't rely on them for capacity and budget planning. See [API Management pricing](https://azure.microsoft.com/pricing/details/api-management/) for details.
180180
181181
* **Classic tiers**
182-
* Scale gateway capacity by adding and removing scale [units](upgrade-and-scale.md), or upgrade the service tier. (Scaling not available in the Developer tier.)
182+
* Scale gateway capacity by adding and removing scale [units](upgrade-and-scale.md), or upgrade the service tier. (Scaling isn't available in the Developer tier.)
183183
* In the Basic, Standard, and Premium tiers, optionally configure [Azure Monitor autoscale](api-management-howto-autoscale.md).
184184
* In the Premium tier, optionally add and distribute gateway capacity across multiple [regions](api-management-howto-deploy-multi-region.md).
185185

@@ -198,6 +198,19 @@ For estimated maximum gateway throughput in the API Management service tiers, se
198198

199199
Scale capacity by adding and removing scale [units](upgrade-and-scale.md) in the workspace gateway.
200200

201+
## Gateway health check endpoint
202+
203+
In all tiers except the Consumption tier, Azure API Management provides a built-in gateway health check endpoint at path `/status-0123456789abcdef`. Reach this endpoint to help confirm that the API gateway is available and functioning correctly. It doesn't test backend APIs, only the gateway itself.
204+
205+
A request to the endpoint returns a `200 OK` HTTP response when the gateway is healthy; failures indicate networking or gateway issues.
206+
207+
* Azure uses this endpoint internally for continuous SLA monitoring and gateway health validation.
208+
* Customers can integrate requests to this endpoint into their own monitoring tools and probes.
209+
* The endpoint is available for managed gateways (including regional gateways in multi-region deployments), self-hosted gateways, and workspace gateways.
210+
211+
> [!TIP]
212+
> When you [integrate Azure Application Insights](api-management-howto-app-insights.md) with API Management, you can optionally enable availability monitoring of the gateway. This setting regularly polls the gateway health check endpoint and reports results on the **Availability** tab in Application Insights.
213+
201214
## Related content
202215

203216
Learn more about:

articles/api-management/api-management-howto-manage-protocols-ciphers.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
2-
title: Manage protocols and ciphers in Azure API Management | Microsoft Learn
2+
title: Manage Protocols and Ciphers in Azure API Management
33
description: Learn how to manage transport layer security (TLS) protocols and cipher suites in Azure API Management.
44
services: api-management
55
author: dlepow
66

77
ms.service: azure-api-management
88
ms.topic: how-to
9-
ms.date: 10/10/2025
9+
ms.date: 01/06/2026
1010
ms.author: danlep
1111
---
1212

@@ -41,7 +41,7 @@ API Management supports TLS versions up to TLS 1.3 for client and backend connec
4141

4242
## How to manage TLS protocols and cipher suites
4343

44-
1. In the sidebar of your API Management instance, under **Security**, select **Protocols + ciphers**.
44+
1. In the sidebar menu of your API Management instance, under **Security**, select **Protocols + ciphers**.
4545
1. Enable or disable desired protocols or ciphers.
4646
1. Select **Save**.
4747

@@ -58,7 +58,7 @@ TLS 1.3 is a major revision of the TLS protocol that provides improved security
5858

5959
TLS 1.3 doesn't support certificate renegotiation. Certificate renegotiation in TLS allows client and server to renegotiate connection parameters mid-session for authentication without terminating the connection.
6060

61-
Services that API Management identifies as reliant on client certificate renegotiation do not have TLS 1.3 enabled by default. You can choose to enable TLS 1.3 manually.
61+
API Management instances that are detected as reliant on client certificate renegotiation do not have TLS 1.3 enabled by default. In these instances, you can choose to enable TLS 1.3 manually.
6262

6363
> [!WARNING]
6464
> If your APIs are accessed by TLS-compliant clients that rely on certificate renegotiation, enabling TLS 1.3 for client-side connections will cause those clients to fail to connect. Review APIs that recently used certificate renegotiation before enabling client-side TLS 1.3 in any service that doesn't have it enabled by default.

0 commit comments

Comments
 (0)