Skip to content

Commit 062afde

Browse files
author
gitName
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into wkspcgw
2 parents 581c6de + 7fc89fc commit 062afde

17 files changed

+273
-305
lines changed

.github/policies/disallow-edits.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ configuration:
160160
matchAny: true
161161
pattern: articles/reliability/*
162162
- commentContains:
163-
pattern: \#sign-off
164-
isRegex: false
163+
pattern: '#sign-off'
164+
isRegex: true
165165
- not:
166166
or:
167167
- isActivitySender:

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5979,6 +5979,11 @@
59795979
"source_path": "articles/reliability/availability-zones-baseline.md",
59805980
"redirect_url": "/azure/reliability/availability-zones-migration-overview",
59815981
"redirect_document_id": false
5982+
},
5983+
{
5984+
"source_path_from_root": "/articles/virtual-network/virtual-network-for-azure-services.md",
5985+
"redirect_url": "/azure/virtual-network/vnet-integration-for-azure-services",
5986+
"redirect_document_id": false
59825987
}
59835988
]
59845989
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ The following tables compare features available in the following API Management
107107
| [Service Fabric](/azure/service-fabric/service-fabric-api-management-overview) | Developer, Premium |||||
108108
| [Pass-through GraphQL](graphql-apis-overview.md) | ✔️ | ✔️ |✔️ | ✔️ | ✔️ |
109109
| [Synthetic GraphQL](graphql-apis-overview.md)| ✔️ | ✔️ | ✔️<sup>1</sup> | ✔️<sup>1</sup> ||
110-
| [Pass-through WebSocket](websocket-api.md) | ✔️ | ✔️ || ✔️ | |
110+
| [Pass-through WebSocket](websocket-api.md) | ✔️ | ✔️ || ✔️ | ✔️ |
111111
| [Pass-through gRPC](grpc-api.md) |||| ✔️ ||
112112
| [OData](import-api-from-odata.md) | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
113113
| [Azure OpenAI and LLM](azure-openai-api-from-specification.md) | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |

articles/api-management/websocket-api.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ ms.custom: template-how-to
1515

1616
With API Management’s WebSocket API solution, API publishers can quickly add a WebSocket API in API Management via the Azure portal, Azure CLI, Azure PowerShell, and other Azure tools.
1717

18-
[!INCLUDE [api-management-workspace-availability](../../includes/api-management-workspace-availability.md)]
19-
2018
WebSocket APIs can be secured by applying API Management's [access control policies](api-management-policies.md#authentication-and-authorization) to the initial handshake operation. You can also test WebSocket APIs using the API test consoles in both Azure portal and developer portal. Building on existing observability capabilities, API Management provides metrics and logs for monitoring and troubleshooting WebSocket APIs.
2119

2220
In this article, you will:
@@ -106,7 +104,7 @@ Per the [WebSocket protocol](https://tools.ietf.org/html/rfc6455), when a client
106104
Use standard API Management and Azure Monitor features to [monitor](api-management-howto-use-azure-monitor.md) WebSocket APIs:
107105

108106
* View API metrics in Azure Monitor
109-
* Optionally enable diagnostic settings to collect and view API Management gateway logs, which include WebSocket API operations
107+
* Optionally enable diagnostic settings to collect and view API Management gateway logs, which include WebSocket API operations, or WebSocket connection logs
110108

111109
For example, the following screenshot shows recent WebSocket API responses with code `101` from the **ApiManagementGatewayLogs** table. These results indicate the successful switch of the requests from TCP to the WebSocket protocol.
112110

articles/api-management/workspaces-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ The following constraints currently apply to workspace gateways:
124124
* APIs in workspaces aren't covered by Defender for APIs
125125
* Workspace gateways don't support the API Management service's credential manager
126126
* Workspace gateways support only internal cache; external cache isn't supported
127-
* Workspace gateways don't support synthetic GraphQL APIs and WebSocket APIs
127+
* Workspace gateways don't support synthetic GraphQL APIs
128128
* Workspace gateways don't support creating APIs directly from Azure resources such as Azure OpenAI Service, App Service, Function Apps, and so on
129129
* Request metrics can't be split by workspace in Azure Monitor; all workspace metrics are aggregated at the service level
130130
* Azure Monitor logs are aggregated at the service level; workspace-level logs aren't available
-82 KB
Loading
-129 KB
Loading
1.26 KB
Loading
-44.1 KB
Loading

articles/digital-twins/quickstart-3d-scenes-studio.md

Lines changed: 52 additions & 52 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)