Skip to content

Commit 787d810

Browse files
authored
Merge pull request #287018 from MicrosoftDocs/main
Publish to Live Thursday 4AM PST, 9/19
2 parents 460acd4 + dd998c5 commit 787d810

File tree

7 files changed

+28
-24
lines changed

7 files changed

+28
-24
lines changed

articles/azure-web-pubsub/howto-develop-eventhandler.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: vicancy
55
ms.author: lianwei
66
ms.service: azure-web-pubsub
77
ms.topic: how-to
8-
ms.date: 08/01/2024
8+
ms.date: 09/19/2024
99
---
1010

1111
# Configure event handler in Azure Web PubSub service
@@ -18,7 +18,7 @@ The Web PubSub service delivers client events to the configured upstream webhook
1818

1919
## Event handler settings
2020

21-
A client always connects to a hub, and you could configure multiple event handler settings for the hub. The order of the event handler settings matters and the former one has the higher priority. When a client connects and an event is triggered, Web PubSub goes through the configured event handlers in the priority order and the first matching one wins. When configuring the event handler, the below properties should be set.
21+
A client always connects to a hub, and you could configure multiple event handler settings for the hub. The order of the event handler settings matters and the former one has the higher priority. When a client connects and an event is triggered, Web PubSub goes through the configured event handlers in the priority order and the first matching one wins. Set the following properties when you configure the event handler:
2222

2323
|Property name | Description |
2424
|--|--|
@@ -29,24 +29,24 @@ A client always connects to a hub, and you could configure multiple event handle
2929

3030
### Events
3131

32-
The events include user events and system events. System events are predefined events that are triggered during the lifetime of a client, and user events are the events triggered when the client sends data, the user event name can be customized using client protocols, [here contains the detailed explanation](concept-service-internals.md#client-protocol).
32+
The events include user events and system events. System events are predefined events that are triggered during the lifetime of a client. User events are triggered when the client sends data, the user event name can be customized using client protocols, [here contains the detailed explanation](concept-service-internals.md#client-protocol).
3333

3434
Event type | Supported values |
3535
|--|--|
36-
System events | `connect`, `connected` and `disconnected` |
36+
System events | `connect`, `connected`, and `disconnected` |
3737
User events | `message`, or custom event name following client protocols |
3838

3939
### URL template
4040

41-
URL template supports several parameters that can be evaluated during runtime. With this feature, it is easy to route different hubs or events into different upstream servers with a single setting. KeyVault reference syntax is also support so that data could be stored in Azure Key Vault securely.
41+
URL template supports several parameters that can be evaluated during runtime. With this feature, it's easy to route different hubs or events into different upstream servers with a single setting. KeyVault reference syntax is also support so that data could be stored in Azure Key Vault securely.
4242

43-
Note URL domain name should not contain parameter syntax, for example, `http://{hub}.com` is not a valid URL template.
43+
Note URL domain name shouldn't contain parameter syntax, for example, `http://{hub}.com` isn't a valid URL template.
4444

4545
| Supported parameters | Syntax | Description | Samples |
4646
|--|--|--|--|
4747
| Hub parameter | `{hub}` | The value is the hub that the client connects to. | When a client connects to `client/hubs/chat`, a URL template `http://host.com/api/{hub}` evaluates to `http://host.com/api/chat` because for this client, hub is `chat`. |
48-
| Event parameter | `{event}` | The value of the triggered event. `event` values are listed [here](#events).The event value for abuse protection requests is `validate` as explained [here](#upstream-and-validation). | If there is a URL template `http://host.com/api/{hub}/{event}` configured for event `connect`, When a client connects to `client/hubs/chat`, Web PubSub initiates a POST request to the evaluated URL `http://host.com/api/chat/connect` when the client is connecting, since for this client event, hub is `chat` and the event triggering this event handler setting is `connect`. |
49-
| KeyVault reference parameter | `{@Microsoft.KeyVault(SecretUri=<secretUri>)}` | The **SecretUri** should be the full data-plane URI of a secret in the vault, optionally including a version, e.g., `https://myvault.vault.azure.net/secrets/mysecret/` or `https://myvault.vault.azure.net/secrets/mysecret/ec96f02080254f109c51a1f14cdb1931`. When using KeyVault reference, you also need to configure the authentication between your Web PubSub service and your KeyVault service, check [here](howto-use-managed-identity.md#use-a-managed-identity-for-a-key-vault-reference) for detailed steps. | `@Microsoft.KeyVault(SecretUri=https://myvault.vault.azure.net/secrets/mysecret/)` |
48+
| Event parameter | `{event}` | The value of the triggered event. `event` values are listed [here](#events). The event value for abuse protection requests is `validate` as explained [here](#upstream-and-validation). | If there's a URL template `http://host.com/api/{hub}/{event}` configured for event `connect`, When a client connects to `client/hubs/chat`, Web PubSub initiates a POST request to the evaluated URL `http://host.com/api/chat/connect` when the client is connecting, since for this client event, hub is `chat` and the event triggering this event handler setting is `connect`. |
49+
| KeyVault reference parameter | `{@Microsoft.KeyVault(SecretUri=<secretUri>)}` | The **SecretUri** should be the full data-plane URI of a secret in the vault, optionally including a version, for example, `https://myvault.vault.azure.net/secrets/mysecret/` or `https://myvault.vault.azure.net/secrets/mysecret/ec96f02080254f109c51a1f14cdb1931`. When using KeyVault reference, you also need to configure the authentication between your Web PubSub service and your KeyVault service, check [here](howto-use-managed-identity.md#use-a-managed-identity-for-a-key-vault-reference) for detailed steps. | `@Microsoft.KeyVault(SecretUri=https://myvault.vault.azure.net/secrets/mysecret/)` |
5050

5151
### Authentication between service and webhook
5252

@@ -58,7 +58,7 @@ You can use any of these methods to authenticate between the service and webhook
5858

5959
## Upstream and Validation
6060

61-
When setting up the event handler webhook through Azure portal or CLI, the service follows the [CloudEvents Abuse Protection](https://github.com/cloudevents/spec/blob/v1.0/http-webhook.md#4-abuse-protection) to validate the upstream webhook. Every registered upstream webhook URL is validated by this mechanism. The `WebHook-Request-Origin` request header is set to the service domain name `xxx.webpubsub.azure.com`, and it expects the response to have a header `WebHook-Allowed-Origin` to contain this domain name or `*`.
61+
When setting up the event handler webhook through Azure portal or CLI, the service follows the [CloudEvents Abuse Protection](https://github.com/cloudevents/spec/blob/v1.0/http-webhook.md#4-abuse-protection) to validate the upstream webhook. This mechanism validates every registered upstream webhook URL. The `WebHook-Request-Origin` request header is set to the service domain name `xxx.webpubsub.azure.com`, and it expects the response to have a header `WebHook-Allowed-Origin` to contain this domain name or `*`.
6262

6363
When doing the validation, the `{event}` parameter is resolved to `validate`. For example, when trying to set the URL to `http://host.com/api/{event}`, the service tries to **OPTIONS** a request to `http://host.com/api/validate`. And only when the response is valid, the configuration can be set successfully.
6464

articles/azure-web-pubsub/howto-websocket-connect.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ author: vicancy
55
ms.author: lianwei
66
ms.service: azure-web-pubsub
77
ms.topic: how-to
8-
ms.date: 11/08/2021
8+
ms.date: 09/18/2024
99
---
1010

1111
# Start a WebSocket connection to Azure Web PubSub
1212

13-
Clients connect to the Azure Web PubSub service by using the standard [WebSocket](https://tools.ietf.org/html/rfc6455) protocol. You can use languages that have WebSocket client support to write a client for the service. In this article, you'll see several WebSocket client samples in different languages.
13+
Clients connect to the Azure Web PubSub service by using the standard [WebSocket](https://tools.ietf.org/html/rfc6455) protocol. You can use languages that have WebSocket client support to write a client for the service. In this article, you see several WebSocket client samples in different languages.
1414

1515
## Authorization
1616

articles/confidential-computing/how-to-fortanix-confidential-computing-manager.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Fortanix is a third-party software vendor with products and services built on to
7777

7878
4. In the CCM node agent form, fill all the required fields. Paste the join token that you copied in Step 2 in **Join Token**. Select **Review + submit** to confirm.
7979

80-
For more information on how to enroll a CCM compute node, see [Enroll Compute Node](https://support.fortanix.com/hc/en-us/articles/360043085652-User-s-Guide-Compute-Nodes).
80+
For more information on how to enroll a CCM compute node, see [Enroll Compute Node](https://support.fortanix.com/docs/users-guide-compute-nodes).
8181

8282
:::image type="content" source="media/how-to-fortanix-confidential-computing-manager/enroll-compute-node.png" alt-text="Screenshot that shows enrolling the compute node.":::
8383

articles/data-factory/connector-deprecation-plan.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22
title: Planned connector deprecations for Azure Data Factory
33
description: This page describes future deprecations for some connectors of Azure Data Factory.
4-
author: pennyzhou-msft
5-
ms.author: xupzhou
4+
author: jianleishen
5+
ms.author: jianleishen
66
ms.service: azure-data-factory
77
ms.subservice: data-movement
88
ms.topic: concept-article
99
ms.custom: references_regions
10-
ms.date: 09/13/2024
10+
ms.date: 09/19/2024
1111
---
1212

1313
# Planned connector deprecations for Azure Data Factory
@@ -21,13 +21,13 @@ This article describes future deprecations for some connectors of Azure Data Fac
2121

2222
| Connector|Release stage |End of Support Date |Disabled Date |
2323
|:-- |:-- |:-- | :-- |
24-
| [Google BigQuery (legacy)](connector-google-bigquery-legacy.md)  | End of support announced and new version available | October 31, 2024 | January 10, 2024 |
25-
| [MariaDB (legacy driver version)](connector-mariadb.md)  | End of support announced and new version available | October 31, 2024 | January 10, 2024 |
26-
| [MySQL (legacy driver version)](connector-mysql.md)  | End of support announced and new version available | October 31, 2024| January 10, 2024|
27-
| [Salesforce (legacy)](connector-salesforce-legacy.md)   | End of support announced and new version available | October 11, 2024 | January 10, 2024 |
28-
| [Salesforce Service Cloud (legacy)](connector-salesforce-service-cloud-legacy.md)   | End of support announced and new version available | October 11, 2024 |January 10, 2024 |
29-
| [PostgreSQL (legacy)](connector-postgresql-legacy.md)   | End of support announced and new version available |October 31, 2024 | January 10, 2024 |
30-
| [Snowflake (legacy)](connector-snowflake-legacy.md)   | End of support announced and new version available | October 31, 2024 | January 10, 2024 |
24+
| [Google BigQuery (legacy)](connector-google-bigquery-legacy.md)  | End of support announced and new version available | October 31, 2024 | January 10, 2025 |
25+
| [MariaDB (legacy driver version)](connector-mariadb.md)  | End of support announced and new version available | October 31, 2024 | January 10, 2025 |
26+
| [MySQL (legacy driver version)](connector-mysql.md)  | End of support announced and new version available | October 31, 2024| January 10, 2025|
27+
| [Salesforce (legacy)](connector-salesforce-legacy.md)   | End of support announced and new version available | October 11, 2024 | January 10, 2025|
28+
| [Salesforce Service Cloud (legacy)](connector-salesforce-service-cloud-legacy.md)   | End of support announced and new version available | October 11, 2024 |January 10, 2025 |
29+
| [PostgreSQL (legacy)](connector-postgresql-legacy.md)   | End of support announced and new version available |October 31, 2024 | January 10, 2025 |
30+
| [Snowflake (legacy)](connector-snowflake-legacy.md)   | End of support announced and new version available | October 31, 2024 | January 10, 2025 |
3131
| [Azure Database for MariaDB](connector-azure-database-for-mariadb.md) | End of support announced |December 31, 2024 | December 31, 2024 |
3232
| [Concur (Preview)](connector-concur.md) | End of support announced | December 31, 2024 | December 31, 2024 |
3333
| [Drill](connector-drill.md) | End of support announced | December 31, 2024 | December 31, 2024 |

articles/defender-for-iot/organizations/how-to-manage-device-inventory-for-organizations.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ Use the **Device inventory** page in [Defender for IoT](https://portal.azure.com
1212

1313
For more information, see [Devices monitored by Defender for IoT](architecture.md#devices-monitored-by-defender-for-iot).
1414

15+
>[!Note]
16+
>
17+
>Currently, devices discovered in the Azure portal aren't synchronized with Defender XDR, and therefore the list of devices discovered could be different in each portal.
18+
>
19+
1520
## View the device inventory
1621

1722
To view detected devices in the **Device inventory** page in the Azure portal, go to **Defender for IoT** > **Device inventory**.

articles/logic-apps/biztalk-server-azure-integration-services-migration-approaches.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ Consider the following testing recommendations for your migration project:
210210
- Mock testing capabilities for HTTP actions and Azure connectors.
211211
- Configure tests to use different setting values from production.
212212

213-
- [Integration Playbook: Logic Apps Standard Testing](https://www.mikestephenson.me/2021/12/11/logic-app-standard-integration-testing/) from Michael Stephenson, Microsoft MVP
213+
- [Integration Playbook: Logic Apps Standard Testing](https://mikestephenson.me/2021/12/11/logic-app-standard-integration-testing/) from Michael Stephenson, Microsoft MVP
214214

215215
The [Integration Playbook testing framework](https://github.com/michaelstephensonuk/IntegrationPlaybook-LogicApp-Standard-Testing) builds on the Microsoft-provided test framework and supports additional scenarios:
216216

articles/sentinel/whats-new.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ For more information, see:
7777
- [Migrate to Azure Monitor Agent from Log Analytics agent](/azure/azure-monitor/agents/azure-monitor-agent-migration)
7878
- [AMA migration for Microsoft Sentinel](ama-migrate.md)
7979
- Blogs:
80-
8180
- [Revolutionizing log collection with Azure Monitor Agent](https://techcommunity.microsoft.com/t5/microsoft-sentinel-blog/revolutionizing-log-collection-with-azure-monitor-agent/ba-p/4218129)
8281
- [The power of Data Collection Rules: Collecting events for advanced use cases in Microsoft USOP](https://techcommunity.microsoft.com/t5/microsoft-sentinel-blog/the-power-of-data-collection-rules-collecting-events-for/ba-p/4236486)
8382

0 commit comments

Comments
 (0)