Skip to content

Commit 5fa46d3

Browse files
authored
Merge pull request #295481 from MicrosoftDocs/main
2/28 11:00 AM IST Publish
2 parents a7c1d6e + bc7eaa4 commit 5fa46d3

File tree

100 files changed

+1965
-1236
lines changed

Some content is hidden

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

100 files changed

+1965
-1236
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
@@ -103,7 +103,7 @@ The following constraints currently apply to workspace gateways:
103103
* APIs in workspaces aren't covered by Defender for APIs
104104
* Workspace gateways don't support the API Management service's credential manager
105105
* Workspace gateways support only internal cache; external cache isn't supported
106-
* Workspace gateways don't support synthetic GraphQL APIs and WebSocket APIs
106+
* Workspace gateways don't support synthetic GraphQL APIs
107107
* Workspace gateways don't support creating APIs directly from Azure resources such as Azure OpenAI Service, App Service, Function Apps, and so on
108108
* Request metrics can't be split by workspace in Azure Monitor; all workspace metrics are aggregated at the service level
109109
* Azure Monitor logs are aggregated at the service level; workspace-level logs aren't available

articles/app-service/monitor-instances-health-check.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ Imagine you have two applications (or one app with a slot) with Health check ena
203203
If all instances of your application are unhealthy, App Service won't remove instances from the load balancer. In this scenario, taking all unhealthy app instances out of the load balancer rotation would effectively cause an outage for your application. However, the instance replacement will still occur.
204204

205205
### What happens during a slot swap?
206-
Health check configuration is not slot-specific, so after a swap, the Health check configuration of the swapped slot will be applied to the destination slot and vice-versa. For example, if you have Health Check enabled for your staging slot the endpoint configured will be applied to the production slot after a swap.
206+
Health check configuration is not slot-specific, so after a swap, the Health check configuration of the swapped slot will be applied to the destination slot and vice-versa. For example, if you have Health Check enabled for your staging slot the endpoint configured will be applied to the production slot after a swap. We recommend using consistent configuration for both production and non-production slots if possible to prevent any unexpected behavior after the swap.
207207

208208
### Does Health check work on App Service Environments?
209209

0 commit comments

Comments
 (0)