Skip to content

Commit 4aadf24

Browse files
author
gitName
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into forcemig
2 parents 4c4abeb + 1834354 commit 4aadf24

File tree

1,413 files changed

+4257
-7824
lines changed

Some content is hidden

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

1,413 files changed

+4257
-7824
lines changed

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@
3030
"redirect_url": "/previous-versions/azure/partner-solutions/logzio/troubleshoot",
3131
"redirect_document_id": false
3232
},
33+
{
34+
"source_path": "articles/event-grid/event-schema-storage-actions.md",
35+
"redirect_url": "/azure/storage-actions/overview",
36+
"redirect_document_id": false
37+
},
3338
{
3439
"source_path_from_root": "/articles/hdinsight-aks/index.yml",
3540
"redirect_url": "/previous-versions/azure/hdinsight-aks",
@@ -5935,6 +5940,11 @@
59355940
"redirect_url": "/azure/reliability/overview-reliability-guidance",
59365941
"redirect_document_id": false
59375942
},
5943+
{
5944+
"source_path_from_root": "/articles/reliability/sovereign-cloud-china.md",
5945+
"redirect_url": "/azure/china/concepts-service-availability",
5946+
"redirect_document_id": false
5947+
},
59385948
{
59395949
"source_path_from_root": "/articles/managed-grafana/concept-role-based-access-control.md",
59405950
"redirect_url": "/azure/managed-grafana/how-to-manage-access-permissions-users-identities",

articles/active-directory-b2c/localization-string-ids.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -496,18 +496,18 @@ The following IDs are used for a [time-based one-time password (TOTP) display co
496496
</LocalizedResources>
497497
```
498498

499-
## Restful service error messages
499+
## RESTful service error messages
500500

501-
The following IDs are used for [Restful service technical profile](restful-technical-profile.md) error messages:
501+
The following IDs are used for [RESTful service technical profile](restful-technical-profile.md) error messages:
502502

503503
| ID | Default value |
504504
| --- | ------------- |
505-
| `DefaultUserMessageIfRequestFailed` | Failed to establish connection to restful service end point. Restful service URL: {0} |
506-
| `UserMessageIfCircuitOpen` | {0} Restful Service URL: {1} |
507-
| `UserMessageIfDnsResolutionFailed` | Failed to resolve the hostname of the restful service endpoint. Restful service URL: {0} |
508-
| `UserMessageIfRequestTimeout` | Failed to establish connection to restful service end point within timeout limit {0} seconds. Restful service URL: {1} |
505+
| `DefaultUserMessageIfRequestFailed` | Failed to establish connection to restful service end point. RESTful service URL: {0} |
506+
| `UserMessageIfCircuitOpen` | {0} RESTful Service URL: {1} |
507+
| `UserMessageIfDnsResolutionFailed` | Failed to resolve the hostname of the restful service endpoint. RESTful service URL: {0} |
508+
| `UserMessageIfRequestTimeout` | Failed to establish connection to restful service end point within timeout limit {0} seconds. RESTful service URL: {1} |
509509

510-
### Restful service example
510+
### RESTful service example
511511

512512
```xml
513513
<LocalizedResources Id="api.localaccountsignup.en">

articles/api-management/api-management-authenticate-authorize-azure-openai.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Options to authenticate and authorize to Azure OpenAI APIs using Az
55
author: dlepow
66
ms.service: azure-api-management
77
ms.topic: article
8-
ms.date: 02/20/2024
8+
ms.date: 01/23/2025
99
ms.author: danlep
1010
ms.collection: ce-skilling-ai-copilot
1111
---
@@ -78,7 +78,7 @@ In this example, the named value in API Management is *openai-api-key*.
7878

7979
## Authenticate with managed identity
8080

81-
An alternative way to authenticate to an Azure OpenAI API by using a managed identity in Microsoft Entra ID. For background, see
81+
An alternative and recommended way to authenticate to an Azure OpenAI API is by using a managed identity in Microsoft Entra ID. For background, see
8282
[How to configure Azure OpenAI Service with managed identity](/azure/ai-services/openai/how-to/managed-identity).
8383

8484
Following are steps to configure your API Management instance to use a managed identity to authenticate requests to an Azure OpenAI API.

articles/api-management/azure-openai-api-from-specification.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ms.service: azure-api-management
55
author: dlepow
66
ms.author: danlep
77
ms.topic: how-to
8-
ms.date: 05/10/2024
8+
ms.date: 01/23/2025
99
ms.collection: ce-skilling-ai-copilot
1010
ms.custom: template-how-to, build-2024
1111
---
@@ -16,7 +16,7 @@ ms.custom: template-how-to, build-2024
1616

1717
This article shows two options to import an [Azure OpenAI Service](/azure/ai-services/openai/overview) API into an Azure API Management instance as a REST API:
1818

19-
- [Import an Azure OpenAI API directly from Azure OpenAI Service](#option-1-import-api-from-azure-openai-service)
19+
- [Import an Azure OpenAI API directly from Azure OpenAI Service](#option-1-import-api-from-azure-openai-service) (recommended)
2020
- [Download and add the OpenAPI specification](#option-2-add-an-openapi-specification-to-api-management) for Azure OpenAI and add it to API Management as an OpenAPI API.
2121

2222
## Prerequisites

articles/api-management/azure-openai-token-limit-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.collection: ce-skilling-ai-copilot
99
ms.custom:
1010
- build-2024
1111
ms.topic: reference
12-
ms.date: 06/25/2024
12+
ms.date: 02/18/2025
1313
ms.author: danlep
1414
---
1515

articles/api-management/graphql-apis-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ API Management helps you import, manage, protect, test, publish, and monitor Gra
2121

2222
|Pass-through GraphQL |Synthetic GraphQL |
2323
|---------|---------|
24-
| ▪️ Pass-through API to existing GraphQL service endpoint<br><br/>▪️ Support for GraphQL queries, mutations, and subscriptions | ▪️ API based on a custom GraphQL schema<br></br>▪️ Support for GraphQL queries, mutations, and subscriptions<br/><br/>▪️ Configure custom resolvers, for example, to HTTP data sources<br/><br/>▪️ Develop GraphQL schemas and GraphQL-based clients while consuming data from legacy APIs |
24+
| ▪️ Pass-through API to existing GraphQL service endpoint<br><br/>▪️ Support for GraphQL queries, mutations, and subscriptions | ▪️ API based on a custom GraphQL schema<br></br>▪️ Support for GraphQL queries, mutations, and subscriptions<br/><br/>▪️ Configure custom resolvers, for example, to HTTP data sources<br/><br/>▪️ Develop GraphQL schemas and GraphQL-based clients while consuming data from legacy APIs<br/><br/>▪️ Synthetic subscriptions do not require resolvers. See [publish-event](publish-event-policy.md) policy. |
2525

2626
## Availability
2727

articles/api-management/llm-token-limit-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: azure-api-management
88
ms.collection: ce-skilling-ai-copilot
99
ms.custom:
1010
ms.topic: reference
11-
ms.date: 08/08/2024
11+
ms.date: 02/18/2025
1212
ms.author: danlep
1313
---
1414

8.46 KB
Loading

articles/api-management/publish-event-policy.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ The `publish-event` policy publishes an event to one or more subscriptions speci
5353
### Usage notes
5454

5555
* This policy is invoked only when a related GraphQL query or mutation is executed.
56+
* Resolver *should not* be defined for the corresponding subscription. Defining a `publish-event` policy on a source query or mutation is sufficient to trigger subscription events.
5657

5758
## Example
5859

articles/api-management/validate-client-certificate-policy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ For more information about custom CA certificates and certificate authorities, s
6464

6565
| Element | Description | Required |
6666
| ------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- |
67-
| identities | Add this element to specify one or more `identity` elements with defined claims on the client certificate. | No |
67+
| identities | Add this element to specify up to 10 `identity` subelements with defined claims on the client certificate. | No |
6868

6969
## identity attributes
7070

@@ -73,7 +73,7 @@ For more information about custom CA certificates and certificate authorities, s
7373
| thumbprint | Certificate thumbprint. | No | N/A |
7474
| serial-number | Certificate serial number. | No | N/A |
7575
| common-name | Certificate common name (part of Subject string). | No | N/A |
76-
| subject | Subject string. Must follow format of Distinguished Name, which consists of comma-separated name attributes, for example, *"CN=MyName, OU=MyOrgUnit, C=US..."*.| No | N/A |
76+
| subject | Subject string. Must follow format of Distinguished Name, which consists of comma-separated name attributes, for example, *"CN=MyName, OU=MyOrgUnit, C=US..."*.| No | N/A |
7777
| dns-name | Value of dnsName entry inside Subject Alternative Name claim. | No | N/A |
7878
| issuer-subject | Issuer's subject. Must follow format of Distinguished Name, which consists of comma-separated name attributes, for example, *"CN=MyName, OU=MyOrgUnit, C=US..."*. | No | N/A |
7979
| issuer-thumbprint | Issuer thumbprint. | No | N/A |

0 commit comments

Comments
 (0)