Skip to content

Commit 35ef002

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into als-add-move-schedule-article
2 parents 4a47e21 + 6ac7b8b commit 35ef002

File tree

48 files changed

+643
-323
lines changed

Some content is hidden

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

48 files changed

+643
-323
lines changed

articles/active-directory/fundamentals/whats-new.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ This page is updated monthly, so revisit it regularly. If you're looking for ite
3434

3535
## April 2022
3636

37-
### General Availability- Microsoft Defender for Cloud for Endpoint Signal in Identity Protection
37+
### General Availability - Microsoft Defender for Endpoint Signal in Identity Protection
3838

3939

4040
**Type:** New feature

articles/app-service/resources-kudu.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ It also provides other features, such as:
3232
- Run commands in the [Kudu console](https://github.com/projectkudu/kudu/wiki/Kudu-console).
3333
- Download IIS diagnostic dumps or Docker logs.
3434
- Manage IIS processes and site extensions.
35-
- Add deployment webhooks for Windows aps.
35+
- Add deployment webhooks for Windows apps.
3636
- Allow ZIP deployment UI with `/ZipDeploy`.
3737
- Generates [custom deployment scripts](https://github.com/projectkudu/kudu/wiki/Custom-Deployment-Script).
3838
- Allows access with [REST API](https://github.com/projectkudu/kudu/wiki/REST-API).

articles/azure-portal/supportability/quotas-overview.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,5 @@ Different entry points, data views, actions, and programming options are availab
3939
## Next steps
4040

4141
- Learn more about [viewing quotas in the Azure portal](view-quotas.md).
42-
- Learn how to increase Compute quotas.
4342
- Learn how to request increases for [VM-family vCPU quotas](per-vm-quota-requests.md), [vCPU quotas by region](regional-quota-requests.md), and [spot vCPU quotas](spot-quota.md).
4443
- Learn about [Azure subscription and service limits, quotas, and constraints](../../azure-resource-manager/management/azure-subscription-service-limits.md).

articles/azure-resource-manager/management/tag-support.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Tag support for resources
33
description: Shows which Azure resource types support tags. Provides details for all Azure services.
44
ms.topic: conceptual
5-
ms.date: 04/20/2022
5+
ms.date: 05/13/2022
66
---
77

88
# Tag support for Azure resources
@@ -2934,7 +2934,7 @@ To get the same data as a file of comma-separated values, download [tag-support.
29342934
> | servers / usages | No | No |
29352935
> | servers / virtualNetworkRules | No | No |
29362936
> | servers / vulnerabilityAssessments | No | No |
2937-
> | virtualClusters | Yes | Yes |
2937+
> | virtualClusters | No | No |
29382938
29392939
<a id="sqlnote"></a>
29402940

articles/azure-resource-manager/templates/deploy-github-actions.md

Lines changed: 94 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Deploy Resource Manager templates by using GitHub Actions
33
description: Describes how to deploy Azure Resource Manager templates (ARM templates) by using GitHub Actions.
44
ms.topic: conceptual
5-
ms.date: 02/07/2022
5+
ms.date: 05/10/2022
66
ms.custom: github-actions-azure
77
---
88

@@ -27,11 +27,13 @@ The file has two sections:
2727

2828
|Section |Tasks |
2929
|---------|---------|
30-
|**Authentication** | 1. Define a service principal. <br /> 2. Create a GitHub secret. |
30+
|**Authentication** | 1. Generate deployment credentials. |
3131
|**Deploy** | 1. Deploy the Resource Manager template. |
3232

3333
## Generate deployment credentials
3434

35+
# [Service principal](#tab/userlevel)
36+
3537
You can create a [service principal](../../active-directory/develop/app-objects-and-service-principals.md#service-principal-object) with the [az ad sp create-for-rbac](/cli/azure/ad/sp#az-ad-sp-create-for-rbac) command in the [Azure CLI](/cli/azure/). Run this command with [Azure Cloud Shell](https://shell.azure.com/) in the Azure portal or by selecting the **Try it** button.
3638

3739
Create a resource group if you do not already have one.
@@ -61,8 +63,29 @@ In the example above, replace the placeholders with your subscription ID and res
6163
> [!IMPORTANT]
6264
> It is always a good practice to grant minimum access. The scope in the previous example is limited to the resource group.
6365
66+
# [OpenID Connect](#tab/openid)
67+
68+
You need to provide your application's **Client ID**, **Tenant ID**, and **Subscription ID** to the login action. These values can either be provided directly in the workflow or can be stored in GitHub secrets and referenced in your workflow. Saving the values as GitHub secrets is the more secure option.
69+
70+
1. Open your GitHub repository and go to **Settings**.
71+
72+
1. Select **Settings > Secrets > New secret**.
73+
74+
1. Create secrets for `AZURE_CLIENT_ID`, `AZURE_TENANT_ID`, and `AZURE_SUBSCRIPTION_ID`. Use these values from your Active Directory application for your GitHub secrets:
75+
76+
|GitHub Secret | Active Directory Application |
77+
|---------|---------|
78+
|AZURE_CLIENT_ID | Application (client) ID |
79+
|AZURE_TENANT_ID | Directory (tenant) ID |
80+
|AZURE_SUBSCRIPTION_ID | Subscription ID |
81+
82+
1. Save each secret by selecting **Add secret**.
83+
84+
---
6485
## Configure the GitHub secrets
6586

87+
# [Service principal](#tab/userlevel)
88+
6689
You need to create secrets for your Azure credentials, resource group, and subscriptions.
6790

6891
1. In [GitHub](https://github.com/), browse your repository.
@@ -75,6 +98,25 @@ You need to create secrets for your Azure credentials, resource group, and subsc
7598

7699
1. Create an additional secret named `AZURE_SUBSCRIPTION`. Add your subscription ID to the secret's value field (example: `90fd3f9d-4c61-432d-99ba-1273f236afa2`).
77100

101+
# [OpenID Connect](#tab/openid)
102+
103+
You need to provide your application's **Client ID**, **Tenant ID**, and **Subscription ID** to the login action. These values can either be provided directly in the workflow or can be stored in GitHub secrets and referenced in your workflow. Saving the values as GitHub secrets is the more secure option.
104+
105+
1. Open your GitHub repository and go to **Settings**.
106+
107+
1. Select **Settings > Secrets > New secret**.
108+
109+
1. Create secrets for `AZURE_CLIENT_ID`, `AZURE_TENANT_ID`, and `AZURE_SUBSCRIPTION_ID`. Use these values from your Active Directory application for your GitHub secrets:
110+
111+
|GitHub Secret | Active Directory Application |
112+
|---------|---------|
113+
|AZURE_CLIENT_ID | Application (client) ID |
114+
|AZURE_TENANT_ID | Directory (tenant) ID |
115+
|AZURE_SUBSCRIPTION_ID | Subscription ID |
116+
117+
1. Save each secret by selecting **Add secret**.
118+
119+
---
78120
## Add Resource Manager template
79121

80122
Add a Resource Manager template to your GitHub repository. This template creates a storage account.
@@ -94,8 +136,9 @@ The workflow file must be stored in the **.github/workflows** folder at the root
94136
1. Select **set up a workflow yourself**.
95137
1. Rename the workflow file if you prefer a different name other than **main.yml**. For example: **deployStorageAccount.yml**.
96138
1. Replace the content of the yml file with the following:
139+
# [Service principal](#tab/userlevel)
97140

98-
```yml
141+
```yml
99142
on: [push]
100143
name: Azure ARM
101144
jobs:
@@ -122,15 +165,57 @@ The workflow file must be stored in the **.github/workflows** folder at the root
122165

123166
# output containerName variable from template
124167
- run: echo ${{ steps.deploy.outputs.containerName }}
125-
```
168+
```
169+
170+
> [!NOTE]
171+
> You can specify a JSON format parameters file instead in the ARM Deploy action (example: `.azuredeploy.parameters.json`).
172+
173+
The first section of the workflow file includes:
174+
175+
- **name**: The name of the workflow.
176+
- **on**: The name of the GitHub events that triggers the workflow. The workflow is trigger when there is a push event on the main branch, which modifies at least one of the two files specified. The two files are the workflow file and the template file.
177+
178+
# [OpenID Connect](#tab/openid)
179+
180+
```yml
181+
on: [push]
182+
name: Azure ARM
183+
jobs:
184+
build-and-deploy:
185+
runs-on: ubuntu-latest
186+
steps:
187+
188+
# Checkout code
189+
- uses: actions/checkout@main
190+
191+
# Log into Azure
192+
- uses: azure/login@v1
193+
with:
194+
client-id: ${{ secrets.AZURE_CLIENT_ID }}
195+
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
196+
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
197+
198+
# Deploy ARM template
199+
- name: Run ARM deploy
200+
uses: azure/arm-deploy@v1
201+
with:
202+
subscriptionId: ${{ secrets.AZURE_SUBSCRIPTION }}
203+
resourceGroupName: ${{ secrets.AZURE_RG }}
204+
template: ./azuredeploy.json
205+
parameters: storageAccountType=Standard_LRS
206+
207+
# output containerName variable from template
208+
- run: echo ${{ steps.deploy.outputs.containerName }}
209+
```
126210

127-
> [!NOTE]
128-
> You can specify a JSON format parameters file instead in the ARM Deploy action (example: `.azuredeploy.parameters.json`).
211+
> [!NOTE]
212+
> You can specify a JSON format parameters file instead in the ARM Deploy action (example: `.azuredeploy.parameters.json`).
129213

130-
The first section of the workflow file includes:
214+
The first section of the workflow file includes:
131215

132-
- **name**: The name of the workflow.
133-
- **on**: The name of the GitHub events that triggers the workflow. The workflow is trigger when there is a push event on the main branch, which modifies at least one of the two files specified. The two files are the workflow file and the template file.
216+
- **name**: The name of the workflow.
217+
- **on**: The name of the GitHub events that triggers the workflow. The workflow is trigger when there is a push event on the main branch, which modifies at least one of the two files specified. The two files are the workflow file and the template file.
218+
---
134219

135220
1. Select **Start commit**.
136221
1. Select **Commit directly to the main branch**.

articles/azure-signalr/signalr-concept-authenticate-oauth.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ To complete this tutorial, you must have the following prerequisites:
5757
| Setting Name | Suggested Value | Description |
5858
| ------------ | --------------- | ----------- |
5959
| Application name | *Azure SignalR Chat* | The GitHub user should be able to recognize and trust the app they are authenticating with. |
60-
| Homepage URL | `http://localhost:5000/home` | |
60+
| Homepage URL | `http://localhost:5000` | |
6161
| Application description | *A chat room sample using the Azure SignalR Service with GitHub authentication* | A useful description of the application that will help your application users understand the context of the authentication being used. |
6262
| Authorization callback URL | `http://localhost:5000/signin-github` | This setting is the most important setting for your OAuth application. It's the callback URL that GitHub returns the user to after successful authentication. In this tutorial, you must use the default callback URL for the *AspNet.Security.OAuth.GitHub* package, */signin-github*. |
6363

@@ -547,7 +547,7 @@ The last thing you need to do is update the **Homepage URL** and **Authorization
547547
548548
| Setting | Example |
549549
| ------- | ------- |
550-
| Homepage URL | `https://signalrtestwebapp22665120.azurewebsites.net/home` |
550+
| Homepage URL | `https://signalrtestwebapp22665120.azurewebsites.net` |
551551
| Authorization callback URL | `https://signalrtestwebapp22665120.azurewebsites.net/signin-github` |
552552
553553
3. Navigate to your web app URL and test the application.

articles/cognitive-services/QnAMaker/includes/quickstart-sdk-ruby.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ Here is the main method for the application.
170170

171171
:::code language="ruby" source="~/cognitive-services-quickstart-code/ruby/qnamaker/sdk/quickstart.rb" id="Main":::
172172

173-
Run the application with the ruby command on your quickstart file.
173+
Run the application with the Ruby command on your quickstart file.
174174

175175
```console
176176
ruby quickstart.rb

articles/cognitive-services/Speech-Service/includes/how-to/recognize-speech-results/example-offset-duration.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.author: eur
99

1010
### Example offset and duration
1111

12-
The following table shows potential offset and duration in ticks when a speaker says "Welcome to Applied Mathematics course 201." For each utterance, the offset doesn't change throughout the `Recognizing` and `Recognized` events. The duration of speech recognized so far is calculated as an offset from the beginning of the utterance.
12+
The following table shows potential offset and duration in ticks when a speaker says "Welcome to Applied Mathematics course 201." In this example, the offset doesn't change throughout the `Recognizing` and `Recognized` events. However, don't rely on the offset to remain the same between the `Recognizing` and `Recognized` events, since the final result could be different.
1313

1414
|Event |Text |Offset (in ticks) |Duration (in ticks) |
1515
|---------|---------|---------|---------|
@@ -22,9 +22,9 @@ The following table shows potential offset and duration in ticks when a speaker
2222
|RECOGNIZING |welcome to applied mathematics course 201 |17000000 |33400000 |
2323
|RECOGNIZED |Welcome to applied Mathematics course 201. |17000000 |34500000 |
2424

25-
The total duration of the first utterance was 3.45 seconds. It was recognized at 1.7 to 5.15 seconds offset from the start of speech recognition (00:00:01.700 --> 00:00:05.150).
25+
The total duration of the first utterance was 3.45 seconds. It was recognized at 1.7 to 5.15 seconds offset from the start of the audio stream being recognized (00:00:01.700 --> 00:00:05.150).
2626

27-
If the speaker continues to say "Let's get started," a new offset is calculated. Again, the offset is always calculated from the start of recognition to the start of an utterance. The following table shows potential offset and duration for an utterance that was recognized two seconds after the previous utterance ended.
27+
If the speaker continues then to say "Let's get started," a new offset is calculated from the start of the audio stream being recognized, to the start of the new utterance. The following table shows potential offset and duration for an utterance that started two seconds after the previous utterance ended.
2828

2929
|Event |Text |Offset (in ticks) |Duration (in ticks) |
3030
|---------|---------|---------|---------|
@@ -34,4 +34,4 @@ If the speaker continues to say "Let's get started," a new offset is calculated.
3434
|RECOGNIZING |OK, now let's get started. |71500000 |18500000 |
3535
|RECOGNIZED |OK, now let's get started. |71500000 |20600000 |
3636

37-
The total duration of the second utterance was 2.06 seconds. It was recognized at 7.15 to 9.21 seconds offset from the start of speech recognition (00:00:07.150 --> 00:00:09.210).
37+
The total duration of the second utterance was 2.06 seconds. It was recognized at 7.15 to 9.21 seconds offset from the start of the audio stream being recognized (00:00:07.150 --> 00:00:09.210).

articles/cognitive-services/Speech-Service/speech-studio-overview.md

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,14 @@ manager: nitinme
88
ms.service: cognitive-services
99
ms.subservice: speech-service
1010
ms.topic: overview
11-
ms.date: 01/24/2022
11+
ms.date: 05/13/2022
1212
ms.author: eur
1313
---
1414

1515
# What is Speech Studio?
1616

1717
[Speech Studio](https://speech.microsoft.com) is a set of UI-based tools for building and integrating features from Azure Cognitive Services Speech service in your applications. You create projects in Speech Studio by using a no-code approach, and then reference those assets in your applications by using the [Speech SDK](speech-sdk.md), the [Speech CLI](spx-overview.md), or the REST APIs.
1818

19-
## Prerequisites
20-
21-
Before you can begin using [Speech Studio](https://speech.microsoft.com), you need to have an Azure account and a Speech resource. Create a Speech resource on the [Azure portal](https://portal.azure.com). For more information, see [Get the keys for your resource](~/articles/cognitive-services/cognitive-services-apis-create-account.md#get-the-keys-for-your-resource).
22-
23-
After you've created an Azure account and a Speech service resource, do the following:
24-
25-
1. Sign in to [Speech Studio](https://speech.microsoft.com) with your Azure account.
26-
1. In your Speech Studio subscription, select a Speech resource. You can change the resource at any time by selecting **Settings** at the top of the pane.
27-
2819
## Speech Studio features
2920

3021
In Speech Studio, the following Speech service features are available as project types:

articles/container-apps/samples.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ Refer to the following samples to learn how to use Azure Container Apps in diffe
1515

1616
| Name | Description |
1717
|--|--|
18-
| [Deploy an Orleans Cluster to Container Apps](https://github.com/Azure-Samples/Orleans-Cluster-on-Azure-Container-Apps) | An end-to-end sample and tutorial for getting a Microsoft Orleans cluster running on Azure Container Apps. Worker microservices rapidly transmit data to a back-end Orleans cluster for monitoring and storage, emulating thousands of physical devices in the field. |
19-
| [ASP.NET Core front-end with two back-end APIs on Azure Container Apps](https://github.com/Azure-Samples/dotNET-FrontEnd-to-BackEnd-on-Azure-Container-Apps ) | This sample demonstrates ASP.NET Core 6.0 can be used to build a cloud-native application hosted in Azure Container Apps. |
20-
| [ASP.NET Core front-end with two back-end APIs on Azure Container Apps (with Dapr)](https://github.com/Azure-Samples/dotNET-FrontEnd-to-BackEnd-with-DAPR-on-Azure-Container-Apps ) | Demonstrates how ASP.NET Core 6.0 is used to build a cloud-native application hosted in Azure Container Apps using Dapr. |
18+
| [A/B Testing your ASP.NET Core apps using Azure Container Apps](https://github.com/Azure-Samples/dotNET-Frontend-AB-Testing-on-Azure-Container-Apps)<br /> | Shows how to use Azure App Configuration, ASP.NET Core Feature Flags, and Azure Container Apps revisions together to gradually release features or perform A/B tests. <br /> |
19+
| [gRPC with ASP.NET Core on Azure Container Apps](https://github.com/Azure-Samples/dotNET-Workers-with-gRPC-messaging-on-Azure-Container-Apps) | This repository contains a simple scenario built to demonstrate how ASP.NET Core 6.0 can be used to build a cloud-native application hosted in Azure Container Apps that uses gRPC request/response transmission from Worker microservices. The gRPC service simultaneously streams sensor data to a Blazor server frontend, so you can watch the data be charted in real-time. <br /> |
20+
| [Deploy an Orleans Cluster to Container Apps](https://github.com/Azure-Samples/Orleans-Cluster-on-Azure-Container-Apps) | An end-to-end sample and tutorial for getting a Microsoft Orleans cluster running on Azure Container Apps. Worker microservices rapidly transmit data to a back-end Orleans cluster for monitoring and storage, emulating thousands of physical devices in the field.<br /> |
21+
| [ASP.NET Core front-end with two back-end APIs on Azure Container Apps](https://github.com/Azure-Samples/dotNET-FrontEnd-to-BackEnd-on-Azure-Container-Apps )<br /> | This sample demonstrates ASP.NET Core 6.0 can be used to build a cloud-native application hosted in Azure Container Apps. |
22+
| [ASP.NET Core front-end with two back-end APIs on Azure Container Apps (with Dapr)](https://github.com/Azure-Samples/dotNET-FrontEnd-to-BackEnd-with-DAPR-on-Azure-Container-Apps )<br /> | Demonstrates how ASP.NET Core 6.0 is used to build a cloud-native application hosted in Azure Container Apps using Dapr. |

0 commit comments

Comments
 (0)