Skip to content

Commit fb9eeec

Browse files
authored
Merge pull request #304088 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents a92af30 + c601a99 commit fb9eeec

File tree

4 files changed

+40
-20
lines changed

4 files changed

+40
-20
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
title: include file
33
description: include file
44
services: azure-communication-services
5-
author: probableprime
5+
author: awang119
66
manager: mikben
77
ms.service: azure-communication-services
88
ms.subservice: azure-communication-services
99
ms.date: 06/30/2021
1010
ms.topic: include
1111
ms.custom: include file
12-
ms.author: rifox
12+
ms.author: anniewang
1313
---
1414

1515
## Prerequisites
@@ -30,18 +30,19 @@ ms.author: rifox
3030
### Create a new android application
3131

3232
1. Open Android Studio and select `Create a new project`.
33-
2. On the next window, select `Empty Activity` as the project template.
33+
2. On the next window, select `Empty Views Activity` as the project template.
3434
3. When choosing options, enter `ChatQuickstart` as the project name.
35-
4. Click next and choose the directory where you want the project to be created.
35+
4. This sample uses Java as language
36+
5. Click next and choose the directory where you want the project to be created.
3637

3738
### Install the libraries
3839

3940
We use Gradle to install the necessary Communication Services dependencies. From the command line, navigate inside the root directory of the `ChatQuickstart` project. Open the app's build.gradle file and add the following dependencies to the `ChatQuickstart` target:
4041

4142
```groovy
42-
implementation 'com.azure.android:azure-communication-common:' + $azureCommunicationCommonVersion
43-
implementation 'com.azure.android:azure-communication-chat:' + $azureCommunicationChatVersion
44-
implementation 'org.slf4j:slf4j-log4j12:1.7.29'
43+
implementation libs.azure.communication.common
44+
implementation libs.azure.communication.chat
45+
implementation libs.slf4j.log4j12
4546
```
4647

4748
For the latest version numbers, see https://search.maven.org/artifact/com.azure.android/azure-communication-common and https://search.maven.org/artifact/com.azure.android/azure-communication-chat.
@@ -120,7 +121,6 @@ Copy the following code into class `MainActivity` in file `MainActivity.java`:
120121
private ChatAsyncClient chatAsyncClient;
121122

122123
private void log(String msg) {
123-
Log.i(TAG, msg);
124124
Toast.makeText(this, msg, Toast.LENGTH_LONG).show();
125125
}
126126

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

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
title: include file
33
description: include file
44
services: azure-communication-services
5-
author: probableprime
5+
author: awang119
66
manager: mikben
77
ms.service: azure-communication-services
88
ms.subservice: azure-communication-services
99
ms.date: 06/30/2021
1010
ms.topic: include
1111
ms.custom: include file
12-
ms.author: rifox
12+
ms.author: anniewang
1313
---
1414

1515
## Prerequisites
@@ -60,11 +60,25 @@ The `--save` option lists the library as a dependency in your **package.json** f
6060

6161
### Set up the app framework
6262

63-
This article uses parcel to bundle the application assets. Run the following command to install it and list it as a development dependency in your **package.json**:
63+
This article uses webpack to bundle the application assets. Run the following command to install it and list it as a development dependency in your **package.json**:
6464

6565
```console
66-
npm install parcel --save-dev
66+
npm install webpack webpack-cli webpack-dev-server --save-dev
6767
```
68+
69+
Create a **webpack.config.js** in the root directory of your project.
70+
71+
```js
72+
module.exports = {
73+
entry: "./client.js",
74+
output: {
75+
filename: "bundle.js"
76+
},
77+
devtool: "inline-source-map",
78+
mode: "development"
79+
}
80+
```
81+
6882
Create an **index.html** file in the root directory of your project. Use this file as a template to add chat capability using the Azure Communication Chat SDK for JavaScript.
6983

7084
```html
@@ -76,7 +90,7 @@ Create an **index.html** file in the root directory of your project. Use this fi
7690
<body>
7791
<h4>Azure Communication Services</h4>
7892
<h1>Chat Quickstart</h1>
79-
<script src="./client.js" type="module"></script>
93+
<script src="./bundle.js"></script>
8094
</body>
8195
</html>
8296
```
@@ -110,12 +124,18 @@ console.log('Azure Communication Chat client created!');
110124

111125
### Run the code
112126

127+
Update the `scripts` section in the **package.json** to include "start"
128+
```json
129+
"start": "webpack serve --config ./webpack.config.js"
130+
```
131+
113132
Run the following command to run your application:
114133
```console
115-
npx parcel index.html
134+
npm install
135+
npm run start
116136
```
117137

118-
Open your browser and navigate to http://localhost:1234/. In the developer tools console within your browser, you should see:
138+
Open your browser and navigate to http://localhost:8080/. In the developer tools console within your browser, you should see:
119139

120140
```console
121141
Azure Communication Chat client created!

articles/nat-gateway/monitor-nat-gateway.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ This table describes how you can collect data to monitor your service, and what
2121
|Data to collect|Description|How to collect and route the data|Where to view the data|Supported data|
2222
|---------|---------|---------|---------|---------|
2323
|Metric data|Metrics are numerical values that describe an aspect of a system at a particular point in time. Metrics can be aggregated using algorithms, compared to other metrics, and analyzed for trends over time.|[- Collected automatically at regular intervals.</br> - You can route some platform metrics to a Log Analytics workspace to query with other data. Check the **DS export** setting for each metric to see if you can use a diagnostic setting to route the metric data.]|[Metrics explorer](/azure/azure-monitor/essentials/metrics-getting-started)| [Azure NAT Gateway metrics supported by Azure Monitor](/azure/nat-gateway/monitor-nat-gateway-reference#metrics)|
24-
|Resource log data|Logs are recorded system events with a timestamp. Logs can contain different types of data, and be structured or free-form text. You can route resource log data to Log Analytics workspaces for querying and analysis.|| [Log Analytics](/azure/azure-monitor/learn/quick-create-workspace)|[Azure NAT Gateway resource log data supported by Azure Monitor](/azure/nat-gateway/monitor-nat-gateway-reference#activity-log) |
2524
|Activity log data|The Azure Monitor activity log provides insight into subscription-level events. The activity log includes information like when a resource is modified or a virtual machine is started.|- Collected automatically.</br> - [Create a diagnostic setting](/azure/azure-monitor/essentials/create-diagnostic-settings) to a Log Analytics workspace at no charge.|[Activity log](/azure/azure-monitor/essentials/activity-log)| |
2625

2726
[!INCLUDE [azmon-horz-supported-data](~/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/azmon-horz-supported-data.md)]

articles/private-link/private-endpoint-dns.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ For Azure services, use the recommended zone names as described in the following
6060
>[!div class="mx-tdBreakAll"]
6161
>| Private link resource type | Subresource | Private DNS zone name | Public DNS zone forwarders |
6262
>|---|---|---|---|
63-
>| Azure Machine Learning (Microsoft.MachineLearningServices/workspaces) | amlworkspace | privatelink.api.azureml.ms<br/>privatelink.notebooks.azure.net | api.azureml.ms<br/>notebooks.azure.net<br/>instances.azureml.ms<br/>aznbcontent.net<br/>inference.ml.azure.com |
63+
>| Azure Machine Learning workspace (Microsoft.MachineLearningServices/workspaces) | amlworkspace | privatelink.api.azureml.ms<br/>privatelink.notebooks.azure.net | api.azureml.ms<br/>notebooks.azure.net<br/>instances.azureml.ms<br/>aznbcontent.net<br/>inference.ml.azure.com |
64+
>| Azure Machine Learning registry (Microsoft.MachineLearningServices/registries) | amlregistry | privatelink.api.azureml.ms | api.azureml.ms |
6465
>| Azure AI services (Microsoft.CognitiveServices/accounts) | account | privatelink.cognitiveservices.azure.com <br/> privatelink.openai.azure.com <br/> privatelink.services.ai.azure.com | cognitiveservices.azure.com <br/> openai.azure.com <br/> services.ai.azure.com |
6566
>| Azure Bot Service (Microsoft.BotService/botServices) | Bot | privatelink.directline.botframework.com | directline.botframework.com |
6667
>| Azure Bot Service (Microsoft.BotService/botServices) | Token | privatelink.token.botframework.com | token.botframework.com |
@@ -109,7 +110,7 @@ For Azure services, use the recommended zone names as described in the following
109110
>| Private link resource type | Subresource | Private DNS zone name | Public DNS zone forwarders |
110111
>|---|---|---|---|
111112
>| Azure SQL Database (Microsoft.Sql/servers) | sqlServer | privatelink.database.windows.net | database.windows.net |
112-
>| Azure SQL Managed Instance (Microsoft.Sql/managedInstances) | managedInstance | privatelink.{dnsPrefix}.database.windows.net | {instanceName}.{dnsPrefix}.database.windows.net |
113+
>| Azure SQL Managed Instance (Microsoft.Sql/managedInstances) | managedInstance | privatelink.{dnsPrefix}.database.windows.net | {dnsPrefix}.database.windows.net |
113114
>| Azure Cosmos DB (Microsoft.DocumentDB/databaseAccounts) | Sql | privatelink.documents.azure.com | documents.azure.com |
114115
>| Azure Cosmos DB (Microsoft.DocumentDB/databaseAccounts) | MongoDB | privatelink.mongo.cosmos.azure.com | mongo.cosmos.azure.com |
115116
>| Azure Cosmos DB (Microsoft.DocumentDB/databaseAccounts) | Cassandra | privatelink.cassandra.cosmos.azure.com | cassandra.cosmos.azure.com |
@@ -124,7 +125,7 @@ For Azure services, use the recommended zone names as described in the following
124125
>| Azure Database for MariaDB (Microsoft.DBforMariaDB/servers) | mariadbServer | privatelink.mariadb.database.azure.com | mariadb.database.azure.com |
125126
>| Azure Cache for Redis (Microsoft.Cache/Redis) | redisCache | privatelink.redis.cache.windows.net | redis.cache.windows.net |
126127
>| Azure Cache for Redis Enterprise (Microsoft.Cache/RedisEnterprise) | redisEnterprise | privatelink.redisenterprise.cache.azure.net | {cachename}.{region}.redisenterprise.cache.azure.net |
127-
>| Azure Managed Redis (Microsoft.Cache/RedisEnterprise) | redisEnterprise | privatelink.redis.azure.net | {instanceName}.{region}.redis.azure.net |
128+
>| Azure Managed Redis (Microsoft.Cache/RedisEnterprise) | redisEnterprise | privatelink.redis.azure.net | {region}.redis.azure.net |
128129
129130
### Hybrid + multicloud
130131

@@ -281,7 +282,7 @@ For Azure services, use the recommended zone names as described in the following
281282
>| Private link resource type | Subresource | Private DNS zone name | Public DNS zone forwarders |
282283
>|---|---|---|---|
283284
>| Azure SQL Database (Microsoft.Sql/servers) | sqlServer | privatelink.database.usgovcloudapi.net | database.usgovcloudapi.net |
284-
>| Azure SQL Managed Instance (Microsoft.Sql/managedInstances) | managedInstance | privatelink.{dnsPrefix}.database.usgovcloudapi.net | {instanceName}.{dnsPrefix}.database.usgovcloudapi.net |
285+
>| Azure SQL Managed Instance (Microsoft.Sql/managedInstances) | managedInstance | privatelink.{dnsPrefix}.database.usgovcloudapi.net | {dnsPrefix}.database.usgovcloudapi.net |
285286
>| Azure Cosmos DB (Microsoft.DocumentDB/databaseAccounts) | Sql | privatelink.documents.azure.us | documents.azure.us |
286287
>| Azure Cosmos DB (Microsoft.DocumentDB/databaseAccounts) | MongoDB | privatelink.mongo.cosmos.azure.us | mongo.cosmos.azure.us |
287288
>| Azure Cosmos DB (Microsoft.DocumentDB/databaseAccounts) | Cassandra | privatelink.cassandra.cosmos.azure.us | cassandra.cosmos.azure.us |

0 commit comments

Comments
 (0)