Skip to content

Commit 3b44399

Browse files
authored
Merge pull request #260942 from MicrosoftDocs/main
12/12 11:00 AM IST Publish
2 parents 9e2e596 + 4d135a8 commit 3b44399

File tree

75 files changed

+1561
-606
lines changed

Some content is hidden

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

75 files changed

+1561
-606
lines changed

.openpublishing.redirection.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3106,8 +3106,8 @@
31063106
"redirect_document_id": false
31073107
},
31083108
{
3109-
"source_path": "active-directory/authentication/concept-mfa-plan.md",
3110-
"redirect_url": "active-directory/authentication/howto-mfa-getstarted",
3109+
"source_path": "articles/active-directory/authentication/concept-mfa-plan.md",
3110+
"redirect_url": "/entra/identity/authentication/howto-mfa-getstarted",
31113111
"redirect_document_id": false
31123112
},
31133113
{

articles/ai-services/speech-service/pronunciation-assessment-tool.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ At the bottom of the Assessment result, two overall scores are displayed: Pronun
3434

3535
**Content Score**: This score provides an aggregated assessment of the content of the speech and includes three sub-aspects. This score is only available in the speaking tab for an unscripted assessment.
3636

37-
> [!NOTE]
38-
> Content score is currently available on the following regions in Speech Studio: `westcentralus`, `eastasia`, `eastus`, `northeurope`, `westeurope`, and `westus2`. All other regions will have Content score available starting from Nov 30, 2023.
39-
4037
- **Vocabulary score**: Evaluates the speaker's effective usage of words and their appropriateness within the given context to express ideas accurately, as well as the level of lexical complexity.
4138
- **Grammar score**: Evaluates the correctness of grammar usage and variety of sentence patterns. It considers lexical accuracy, grammatical accuracy, and diversity of sentence structures, providing a more comprehensive evaluation of language proficiency.
4239
- **Topic score**: Assesses the level of understanding and engagement with the topic discussed in the speech. It evaluates the speaker's ability to effectively express thoughts and ideas related to the given topic.

articles/ai-services/speech-service/regions.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ The following regions are supported for Speech service features such as speech t
3232
| ----- | ----- | ----- |
3333
| Africa | South Africa North | `southafricanorth` <sup>6</sup>|
3434
| Asia Pacific | East Asia | `eastasia` <sup>5</sup>|
35-
| Asia Pacific | Southeast Asia | `southeastasia` <sup>1,2,3,4,5,7</sup>|
35+
| Asia Pacific | Southeast Asia | `southeastasia` <sup>1,2,3,4,5,7,9</sup>|
3636
| Asia Pacific | Australia East | `australiaeast` <sup>1,2,3,4,7</sup>|
3737
| Asia Pacific | Central India | `centralindia` <sup>1,2,3,4,5</sup>|
3838
| Asia Pacific | Japan East | `japaneast` <sup>2,5</sup>|
3939
| Asia Pacific | Japan West | `japanwest` |
4040
| Asia Pacific | Korea Central | `koreacentral` <sup>2</sup>|
4141
| Canada | Canada Central | `canadacentral` <sup>1</sup>|
4242
| Europe | North Europe | `northeurope` <sup>1,2,4,5,7</sup>|
43-
| Europe | West Europe | `westeurope` <sup>1,2,3,4,5,7</sup>|
43+
| Europe | West Europe | `westeurope` <sup>1,2,3,4,5,7,9</sup>|
4444
| Europe | France Central | `francecentral` |
4545
| Europe | Germany West Central | `germanywestcentral` |
4646
| Europe | Norway East | `norwayeast` |
@@ -51,7 +51,7 @@ The following regions are supported for Speech service features such as speech t
5151
| Middle East | UAE North | `uaenorth` <sup>6</sup>|
5252
| South America | Brazil South | `brazilsouth` <sup>6</sup>|
5353
| US | Central US | `centralus` |
54-
| US | East US | `eastus` <sup>1,2,3,4,5,7</sup>|
54+
| US | East US | `eastus` <sup>1,2,3,4,5,7,9</sup>|
5555
| US | East US 2 | `eastus2` <sup>1,2,4,5</sup>|
5656
| US | North Central US | `northcentralus` <sup>4,6</sup>|
5757
| US | South Central US | `southcentralus` <sup>1,2,3,4,5,6,7</sup>|
@@ -76,6 +76,8 @@ The following regions are supported for Speech service features such as speech t
7676

7777
<sup>8</sup> The region doesn't support Custom Neural Voice.
7878

79+
<sup>9</sup> The region supports personal voice.
80+
7981
## Intent recognition
8082

8183
Available regions for intent recognition via the Speech SDK are in the following table.

articles/app-service/troubleshoot-diagnostic-logs.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -197,17 +197,17 @@ With the new [Azure Monitor integration](https://aka.ms/appsvcblog-azmon), you c
197197
198198
The following table shows the supported log types and descriptions:
199199
200-
| Log type | Windows | Windows Container | Linux | Linux Container | Description |
201-
|-|-|-|-|-|-|
202-
| AppServiceConsoleLogs | Java SE & Tomcat | Yes | Yes | Yes | Standard output and standard error |
203-
| AppServiceHTTPLogs | Yes | Yes | Yes | Yes | Web server logs |
204-
| AppServiceEnvironmentPlatformLogs | Yes | N/A | Yes | Yes | App Service Environment: scaling, configuration changes, and status logs|
205-
| AppServiceAuditLogs | Yes | Yes | Yes | Yes | Login activity via FTP and Kudu |
206-
| AppServiceFileAuditLogs | Yes | Yes | TBA | TBA | File changes made to the site content; **only available for Premium tier and above** |
207-
| AppServiceAppLogs | ASP.NET, .NET Core, & Tomcat <sup>1</sup> | ASP.NET & Tomcat <sup>1</sup> | .NET Core, Java, SE & Tomcat Blessed Images <sup>2</sup> | Java SE & Tomcat Blessed Images <sup>2</sup> | Application logs |
208-
| AppServiceIPSecAuditLogs | Yes | Yes | Yes | Yes | Requests from IP Rules |
209-
| AppServicePlatformLogs | TBA | Yes | Yes | Yes | Container operation logs |
210-
| AppServiceAntivirusScanAuditLogs <sup>3</sup> | Yes | Yes | Yes | Yes | [Anti-virus scan logs](https://azure.github.io/AppService/2020/12/09/AzMon-AppServiceAntivirusScanAuditLogs.html) using Microsoft Defender for Cloud; **only available for Premium tier** |
200+
| Log Name| Log type | Windows | Windows Container | Linux | Linux Container | Description |
201+
|-|-|-|-|-|-|-|
202+
| App Service Console Logs | AppServiceConsoleLogs | Java SE & Tomcat | Yes | Yes | Yes | Standard output and standard error |
203+
| HTTP logs | AppServiceHTTPLogs | Yes | Yes | Yes | Yes | Web server logs |
204+
| App Service Environment Platform Logs | AppServiceEnvironmentPlatformLogs | Yes | N/A | Yes | Yes | App Service Environment: scaling, configuration changes, and status logs|
205+
| Access Audit Logs | AppServiceAuditLogs | Yes | Yes | Yes | Yes | Login activity via FTP and Kudu |
206+
| Site Content Change Audit Logs | AppServiceFileAuditLogs | Yes | Yes | TBA | TBA | File changes made to the site content; **only available for Premium tier and above** |
207+
| App Service Application Logs | AppServiceAppLogs | ASP.NET, .NET Core, & Tomcat <sup>1</sup> | ASP.NET & Tomcat <sup>1</sup> | .NET Core, Java, SE & Tomcat Blessed Images <sup>2</sup> | Java SE & Tomcat Blessed Images <sup>2</sup> | Application logs |
208+
| IPSecurity Audit logs | AppServiceIPSecAuditLogs | Yes | Yes | Yes | Yes | Requests from IP Rules |
209+
| App Service Platform logs | AppServicePlatformLogs | TBA | Yes | Yes | Yes | Container operation logs |
210+
| Report Antivirus Audit Logs | AppServiceAntivirusScanAuditLogs <sup>3</sup> | Yes | Yes | Yes | Yes | [Anti-virus scan logs](https://azure.github.io/AppService/2020/12/09/AzMon-AppServiceAntivirusScanAuditLogs.html) using Microsoft Defender for Cloud; **only available for Premium tier** |
211211
212212
<sup>1</sup> For Tomcat apps, add `TOMCAT_USE_STARTUP_BAT` to the app settings and set it to `false` or `0`. Need to be on the *latest* Tomcat version and use *java.util.logging*.
213213
Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
---
2+
title: Azure Web PubSub local tunnel tool (Preview)
3+
titleSuffix: Azure Web PubSub Service
4+
description: This article describes the awps-tunnel local tunnel tool to help improve local development experience.
5+
author: vicancy
6+
ms.author: lianwei
7+
ms.service: azure-web-pubsub
8+
ms.topic: how-to
9+
ms.date: 12/12/2023
10+
---
11+
12+
# Azure Web PubSub local tunnel tool
13+
14+
Web PubSub local tunnel provides a local development environment for customers to enhance their local development experience. There's no need to use third-party tools to expose local ports anymore, use Web PubSub local tunnel as the tunnel between the Web PubSub service and your local server to keep your local development environment secure and safe.
15+
16+
Web PubSub local tunnel provides:
17+
* A way to tunnel traffic from Web PubSub to your local server
18+
* A way to view the end-to-end data flow from your client to Web PubSub through the tunnel and to your local server
19+
* Provides an embedded upstream server for you to get started
20+
* Provides a simple client for you to get started with your server development
21+
22+
Benefits:
23+
* Secured local: no need to expose your local server to public
24+
* Secured connection: use Microsoft Entra ID and Web PubSub access policy to connect
25+
* Simple configuration: URL template sets to `tunnel:///<your_server_path>`
26+
* Data inspection: vivid view of the data and the workflow
27+
28+
## Prerequisite
29+
* [Node.js](https://nodejs.org/) version 16 or higher
30+
31+
## Install
32+
33+
```bash
34+
npm install -g @azure/web-pubsub-tunnel-tool
35+
```
36+
37+
## Usage
38+
39+
```
40+
Usage: awps-tunnel [options] [command]
41+
42+
A local tool to help tunnel Azure Web PubSub traffic to local web app and provide a vivid view to the end to end workflow.
43+
44+
Options:
45+
-v, --version Show the version number.
46+
-h, --help Show help details.
47+
48+
Commands:
49+
status Show the current configuration status.
50+
bind [options] Bind configurations to the tool so that you don't need to specify them every time running the tool.
51+
run [options] Run the tool.
52+
help [command] Display help details for subcommand.
53+
54+
You could also set WebPubSubConnectionString environment variable if you don't want to configure endpoint.
55+
56+
```
57+
58+
## Prepare the credential
59+
60+
Both connection string and Microsoft Entra ID are supported.
61+
62+
### Using connection string
63+
64+
1. In your Web PubSub service portal, copy your connection string from your Web PubSub service portal.
65+
66+
1. Set the connection string to your local environment variable and start `awps-tunnel`.
67+
68+
# [Linux or macOS](#tab/bash)
69+
```bash
70+
export WebPubSubConnectionString="<your connection string>"
71+
```
72+
# [Windows](#tab/cmd)
73+
```cmd
74+
SET WebPubSubConnectionString=<your connection string>
75+
```
76+
77+
---
78+
79+
### Using Azure Identity
80+
81+
1. In your Web PubSub service portal, go to Access control tab, and add role `Web PubSub Service Owner` to your identity.
82+
83+
1. In your local terminal, use [Azure CLI](/cli/azure/authenticate-azure-cli) `az login` to sign in to your identity.
84+
85+
1. Alternatively, you could set account information via [defined environment variables](/javascript/api/overview/azure/identity-readme#environment-variables), or use [Managed identity authentication](/entra/identity/managed-identities-azure-resources/overview#which-operations-can-i-perform-on-managed-identities) directly for supported Azure services.
86+
87+
## Run
88+
1. In your Web PubSub service portal, go to Settings tab, specify the event handler URL template to start with `tunnel:///` to allow tunnel connection.
89+
90+
:::image type="content" alt-text="Screenshot of setting the upstream URL in hub settings." source="media\howto-web-pubsub-tunnel-tool\hub-settings.png" :::
91+
92+
1. Run the tool with the hub you set before, for example, connect to an endpoint `https://<awps-host-name>.webpubsub.azure.com` with hub `chat`:
93+
```bash
94+
awps-tunnel run --hub chat --endpoint https://<awps-host-name>.webpubsub.azure.com
95+
```
96+
97+
You could also use `awps-tunnel bind --hub chat --endpoint https://<awps-host-name>.webpubsub.azure.com` to save the configuration and then `awps-tunnel run`.
98+
99+
1. You see output like `Open webview at: http://127.0.0.1:4000`, open the link in your browser and you could see the tunnel status and the workflow.
100+
101+
1. Now switch to **Server** tab, and check *Built-in Echo Server* to start a builtin upstream server with code similar to the sample code shown below it.
102+
103+
:::image type="content" alt-text="Screenshot of starting built-in echo server." source="media\howto-web-pubsub-tunnel-tool\overview-upstream.png" :::
104+
105+
1. Alternatively, you can start your own upstream server at http://localhost:3000. You can also specify option`--upstream http://localhost:<custom-port>` when `awps-tunnel run` or `awps-tunnel bind` to configure your own upstream server at a custom port. For example, run the below code to start this sample [upstream server](https://github.com/Azure/azure-webpubsub/tree/main/tools/awps-tunnel/server/samples/upstream/), when it starts, the upstream serves requests to http://localhost:3000/eventhandler/.
106+
107+
```bash
108+
git clone https://github.com/Azure/azure-webpubsub.git
109+
cd tools/awps-tunnel/server/samples/upstream
110+
npm install
111+
npm start
112+
```
113+
114+
1. Now switch to **Client** tab, select `Connect` to start a test WebSocket connection to the Azure Web PubSub service. You would see the traffic goes through Web PubSub to Local Tunnel and finally reaches the upstream server. The tunnel tab provides the details of the request and responses, providing you with a vivid view of what is requesting your upstream server and what is reponding from the upstream server.
115+
116+
:::image type="content" alt-text="Screenshot of starting the test WebSocket connection and send message." source="media\howto-web-pubsub-tunnel-tool\overview-client.png" :::
117+
118+
:::image type="content" alt-text="Screenshot of showing the traffic inspection." source="media\howto-web-pubsub-tunnel-tool\overview-tunnel.png" :::
58.8 KB
Loading
90.1 KB
Loading
123 KB
Loading
107 KB
Loading

articles/azure-web-pubsub/toc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@
5050
href: howto-generate-client-access-url.md
5151
- name: Configure event handler
5252
href: howto-develop-eventhandler.md
53+
- name: Develop with local tunnel tool
54+
href: howto-web-pubsub-tunnel-tool.md
5355
- name: Send client events to Event Hubs
5456
href: howto-develop-event-listener.md
5557
- name: Use server SDK with Azure Identity

0 commit comments

Comments
 (0)