Skip to content

Commit 773123f

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into privlink-nsg
2 parents cbcf719 + a675b0b commit 773123f

File tree

25 files changed

+464
-141
lines changed

25 files changed

+464
-141
lines changed

articles/azure-monitor/toc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ items:
2525
href: essentials/tutorial-resource-logs.md
2626
- name: Create a log query alert
2727
href: alerts/tutorial-log-alert.md
28+
- name: Forward syslog data to workspace
29+
href: /azure/sentinel/forward-syslog-monitor-agent?toc=/azure/azure-monitor/toc.json&bc=/azure/azure-monitor/breadcrumb/toc.json
2830
- name: Virtual machines
2931
items:
3032
- name: Enable monitoring

articles/communication-services/concepts/chat/sdk-features.md

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,32 +19,32 @@ Azure Communication Services Chat SDKs can be used to add rich, real-time chat t
1919

2020
## Chat SDK capabilities
2121

22-
The following list presents the set of features which are currently available in the Communication Services chat SDKs.
22+
The following list presents the set of features that are currently available in the Communication Services chat SDKs.
2323

24-
| Group of features | Capability | JavaScript | Java | .NET | Python | iOS | Android |
25-
|-----------------|-------------------|---|-----|----|-----|----|----|
26-
| Core Capabilities | Create a chat thread between 2 or more users | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
27-
| | Update the topic of a chat thread | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
28-
| | Add or remove participants from a chat thread | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
29-
| | Choose whether to share chat message history with the participant being added | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
30-
| | Get a list of participants in a chat thread | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
31-
| | Delete a chat thread | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
32-
| | Given a communication user, get the list of chat threads the user is part of | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
33-
| | Get info for a particular chat thread | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
34-
| | Send and receive messages in a chat thread | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
35-
| | Update the content of your sent message | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
36-
| | Delete a message you previously sent | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
37-
| | Read receipts for messages that have been read by other participants in a chat | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
38-
| | Get notified when participants are actively typing a message in a chat thread | ✔️ | || | ✔️ | ✔️ |
39-
| | Get all messages in a chat thread | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
40-
| | Send Unicode emojis as part of message content | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
41-
| | Add metadata to chat messages | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
42-
| | Add display name to typing indicator notification | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
43-
|Real-time notifications (enabled by proprietary signaling package**)| Chat clients can subscribe to get real-time updates for incoming messages and other operations occurring in a chat thread. To see a list of supported updates for real-time notifications, see [Chat concepts](concepts.md#real-time-notifications) | ✔️ |||| ✔️ | ✔️ |
44-
|Mobile push notifications with Notification Hub | The Chat SDK provides APIs allowing clients to be notified for incoming messages and other operations occurring in a chat thread by connecting an Azure Notification Hub to your Communication Services resource. In situations where your mobile app is not running in the foreground, patterns are available to [fire pop-up notifications](../notifications.md) ("toasts") to inform end-users, see [Chat concepts](concepts.md#push-notifications). ||||| ✔️ | ✔️ |
45-
| Server Events with Event Grid | Use the chat events available in Azure Event Grid to plug custom notification services or post that event to a webhook to execute business logic like updating CRM records after a chat is finished | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
46-
| Reporting </br>(This info is available under Monitoring tab for your Communication Services resource on Azure portal) | Understand API traffic from your chat app by monitoring the published metrics in Azure Metrics Explorer and set alerts to detect abnormalities | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
47-
| | Monitor and debug your Communication Services solution by enabling diagnostic logging for your resource | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
24+
| Group of features | Capability | Azure CLI | JavaScript | Java | .NET | Python | iOS | Android |
25+
|-----------------|-------------------|---|---|-----|----|-----|----|----|
26+
| Core Capabilities | Create a chat thread between 2 or more users | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
27+
| | Update the topic of a chat thread | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
28+
| | Add or remove participants from a chat thread | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
29+
| | Choose whether to share chat message history with the participant being added | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
30+
| | Get a list of participants in a chat thread | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
31+
| | Delete a chat thread | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
32+
| | Given a communication user, get the list of chat threads the user is part of | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
33+
| | Get info for a particular chat thread | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
34+
| | Send and receive messages in a chat thread | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
35+
| | Update the content of your sent message | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
36+
| | Delete a message you previously sent | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
37+
| | Read receipts for messages that have been read by other participants in a chat | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
38+
| | Get notified when participants are actively typing a message in a chat thread | | ✔️ || || ✔️ | ✔️ |
39+
| | Get all messages in a chat thread | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
40+
| | Send Unicode emojis as part of message content | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
41+
| | Add metadata to chat messages | | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
42+
| | Add display name to typing indicator notification | | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
43+
|Real-time notifications (enabled by proprietary signaling package**)| Chat clients can subscribe to get real-time updates for incoming messages and other operations occurring in a chat thread. To see a list of supported updates for real-time notifications, see [Chat concepts](concepts.md#real-time-notifications) | | ✔️ |||| ✔️ | ✔️ |
44+
|Mobile push notifications with Notification Hub | The Chat SDK provides APIs allowing clients to be notified for incoming messages and other operations occurring in a chat thread by connecting an Azure Notification Hub to your Communication Services resource. In situations where your mobile app is not running in the foreground, patterns are available to [fire pop-up notifications](../notifications.md) ("toasts") to inform end-users, see [Chat concepts](concepts.md#push-notifications). ||| ||| ✔️ | ✔️ |
45+
| Server Events with Event Grid | Use the chat events available in Azure Event Grid to plug custom notification services or post that event to a webhook to execute business logic like updating CRM records after a chat is finished | | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
46+
| Reporting </br>(This info is available under Monitoring tab for your Communication Services resource on Azure portal) | Understand API traffic from your chat app by monitoring the published metrics in Azure Metrics Explorer and set alerts to detect abnormalities | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
47+
| | Monitor and debug your Communication Services solution by enabling diagnostic logging for your resource | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
4848

4949
**The proprietary signaling package is implemented using web sockets. It will fallback to long polling if web sockets are unsupported.
5050

articles/communication-services/concepts/sms/sdk-features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Azure Communication Services SMS SDKs can be used to add SMS messaging to your a
2020

2121
## SMS SDK capabilities
2222

23-
The following list presents the set of features which are currently available in our SDKs.
23+
The following list presents the set of features that are currently available in our SDKs.
2424

2525
| Group of features | Capability | JS | Java | .NET | Python |
2626
| ----------------- | ------------------------------------------------------------------------------------- | --- | ---- | ---- | ------ |

articles/communication-services/concepts/voice-video-calling/calling-sdk-features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Key features of the Calling SDK:
2929

3030
## Detailed capabilities
3131

32-
The following list presents the set of features which are currently available in the Azure Communication Services Calling SDKs.
32+
The following list presents the set of features that are currently available in the Azure Communication Services Calling SDKs.
3333

3434

3535
| Group of features | Capability | JS | Windows | Java (Android) | Objective-C (iOS) |

articles/communication-services/quickstarts/chat/get-started.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,17 @@ ms.date: 06/30/2021
1010
ms.topic: quickstart
1111
ms.service: azure-communication-services
1212
ms.subservice: chat
13-
zone_pivot_groups: acs-js-csharp-java-python-swift-android
13+
zone_pivot_groups: acs-azcli-js-csharp-java-python-swift-android
1414
ms.custom: mode-other
1515
---
1616
# Quickstart: Add Chat to your App
1717

1818
Get started with Azure Communication Services by using the Communication Services Chat SDK to add real-time chat to your application. In this quickstart, we'll use the Chat SDK to create chat threads that allow users to have conversations with one another. To learn more about Chat concepts, visit the [chat conceptual documentation](../../concepts/chat/concepts.md).
1919

20+
::: zone pivot="platform-azcli"
21+
[!INCLUDE [Chat with Azure CLI](./includes/chat-azcli.md)]
22+
::: zone-end
23+
2024
::: zone pivot="programming-language-javascript"
2125
[!INCLUDE [Chat with JavaScript SDK](./includes/chat-js.md)]
2226
::: zone-end

articles/communication-services/quickstarts/chat/includes/chat-android.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Before you get started, make sure to:
2222
- Create **two** Communication Services Users and issue them a [User Access Token](../../access-tokens.md). Be sure to set the scope to **chat**, and **note the token string and the user_id string**. In this quickstart, we will create a thread with an initial participant and then add a second participant to the thread. You can also use the Azure CLI and run the command below with your connection string to create a user and an access token.
2323

2424
```azurecli-interactive
25-
az communication identity issue-access-token --scope chat --connection-string "yourConnectionString"
25+
az communication identity token issue --scope chat --connection-string "yourConnectionString"
2626
```
2727

2828
For details, see [Use Azure CLI to Create and Manage Access Tokens](../../access-tokens.md?pivots=platform-azcli).

0 commit comments

Comments
 (0)