Skip to content

Commit 543ce87

Browse files
authored
Merge pull request #222228 from MicrosoftDocs/main
Merge main to live, 4 AM
2 parents 69bd6dd + 1d13522 commit 543ce87

File tree

46 files changed

+1325
-252
lines changed

Some content is hidden

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

46 files changed

+1325
-252
lines changed

articles/app-service/environment/migrate.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Migrate to App Service Environment v3 by using the migration feature
33
description: Overview of the migration feature for migration to App Service Environment v3
44
author: seligj95
55
ms.topic: article
6-
ms.date: 12/12/2022
6+
ms.date: 12/21/2022
77
ms.author: jordanselig
88
ms.custom: references_regions
99
---
@@ -44,6 +44,7 @@ At this time, App Service Environment migrations to v3 using the migration featu
4444
- Norway West
4545
- South Central US
4646
- South India
47+
- Southeast Asia
4748
- Switzerland North
4849
- Switzerland West
4950
- UAE North
41.7 KB
Loading
38 KB
Loading

articles/application-gateway/toc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@
4141
href: tutorial-ingress-controller-add-on-new.md
4242
- name: Ingress Controller add-on for AKS (Brownfield)
4343
href: tutorial-ingress-controller-add-on-existing.md
44+
- name: Deploy Application Gateway with DDoS protection
45+
href: tutorial-protect-application-gateway.md
4446
- name: Samples
4547
items:
4648
- name: Azure PowerShell

articles/application-gateway/tutorial-protect-application-gateway.md

Lines changed: 276 additions & 0 deletions
Large diffs are not rendered by default.

articles/azure-monitor/alerts/alerts-overview.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,9 @@ For stateful alerts, the alert is considered resolved when:
9191
|Alert type |The alert is resolved when |
9292
|---------|---------|
9393
|Metric alerts|The alert condition isn't met for three consecutive checks.|
94-
|Log alerts| In log alerts, the alert is resolved at different rates based on the frequency of the alert:<ul> <li>**1 minute**: The alert condition isn't met for 10 minutes.</li> <li>**5-15 minutes**: The alert condition isn't met for three frequency periods.</li> <li>**15 minutes - 11 hours**: The alert condition isn't met for two frequency periods.</li> <li>**11 to 12 hours**: The alert condition isn't met for one frequency period.</li></ul>|
94+
|Log alerts| A log alert is considered resolved when the condition is not met for a specific time range. The time range differs based on the frequency of the alert:<ul> <li>**1 minute**: The alert condition isn't met for 10 minutes.</li> <li>**5-15 minutes**: The alert condition isn't met for three frequency periods.</li> <li>**15 minutes - 11 hours**: The alert condition isn't met for two frequency periods.</li> <li>**11 to 12 hours**: The alert condition isn't met for one frequency period.</li></ul>|
9595

96-
When the alert is considered resolved, the alert rule sends out a resolved notification using webhooks or email and the monitor state in the Azure portal is set to resolved.
97-
98-
> [!NOTE]
99-
> Log search alert is resolved after time range that teh alert wasn't met. Threrefore the resolve evaluation window is based on last unhealthy window.
96+
When an alert is considered resolved, the alert rule sends out a resolved notification using webhooks or email, and the monitor state in the Azure portal is set to resolved.
10097

10198
## Manage your alerts programmatically
10299

articles/azure-monitor/alerts/alerts-types.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ A log alert rule monitors a resource by using a Log Analytics query to evaluate
124124

125125
The target of the log alert rule can be:
126126
- A single resource, such as a VM.
127-
- Multiple resources of the same type in the same Azure region, such as a resource group. This is currently available for selected resource types.
128-
- Multiple resources using [cross-resource query](../logs/cross-workspace-query.md#querying-across-log-analytics-workspaces-and-from-application-insights).
127+
- A single container of resources, like a resource group or subscription.
128+
- Multiple resources using [cross-resource query](../logs/cross-workspace-query.md).
129129

130130
Log alerts can measure two different things, which can be used for different monitoring scenarios:
131131
- Table rows: The number of rows returned can be used to work with events such as Windows event logs, syslog, application exceptions.

articles/azure-video-indexer/accounts-overview.md

Lines changed: 19 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,58 +2,49 @@
22
title: Azure Video Indexer accounts
33
description: This article gives an overview of Azure Video Indexer accounts and provides links to other articles for more details.
44
ms.topic: conceptual
5-
ms.date: 11/19/2022
5+
ms.date: 12/21/2022
66
ms.author: juliako
77
---
88

99
# Azure Video Indexer account types
1010

1111
This article gives an overview of Azure Video Indexer accounts types and provides links to other articles for more details.
1212

13-
## A trial account
13+
## Trial account
1414

15-
The first time you visit the [Azure Video Indexer](https://www.videoindexer.ai/) website, a trial account is automatically created. The trial Azure Video Indexer account has limitation on number of indexing minutes, support, and SLA.
15+
When starting out with [Azure Video Indexer](https://www.videoindexer.ai/), click **start free** to kick off a quick and easy process of creating a trial account. No Azure subscription is required and this is a great way to explore Azure Video Indexer and try it out with your content. Keep in mind that the trial Azure Video Indexer account has a limitation on the number of indexing minutes, support, and SLA.
1616

17-
With a trial, account Azure Video Indexer provides:
17+
With a trial account, Azure Video Indexer provides:
1818

19-
* up to 600 minutes of free indexing to the [Azure Video Indexer](https://www.videoindexer.ai/) website users and
20-
* up to 2400 minutes of free indexing to users that subscribe to the Azure Video Indexer API on the [developer portal](https://aka.ms/avam-dev-portal).
21-
22-
When using the trial account, you don't have to set up an Azure subscription.
19+
* up to 600 minutes of free indexing to the [Azure Video Indexer](https://www.videoindexer.ai/) website users and
20+
* up to 2400 minutes of free indexing to users that subscribe to the Azure Video Indexer API on the [developer portal](https://api-portal.videoindexer.ai/).
2321

2422
The trial account option is not available on the Azure Government cloud. For other Azure Government limitations, see [Limitations of Azure Video Indexer on Azure Government](connect-to-azure.md#limitations-of-azure-video-indexer-on-azure-government).
2523

26-
## A paid (unlimited) account
27-
28-
You can later create a paid account where you're not limited by the quota. Two types of paid accounts are available to you: Azure Resource Manager (recommended) and classic. The main difference between the two is account management platform.
24+
## Paid (unlimited) account
2925

30-
* ARM-based accounts management is built on Azure, which enables using [Azure RBAC](../role-based-access-control/overview.md) (recommended).
31-
* Classic accounts are built on the API Management.
26+
When you have used up the free trial minutes or are ready to start using Video Indexer for production workloads, you can create a regular paid account which doesn't have minute, support, or SLA limitations. Account creation can be performed through the Azure portal (see [Create an account with the Azure portal](create-account-portal.md)) or API (see [Create accounts with API](/rest/api/videoindexer/stable/accounts)).
3227

33-
With the paid option, you pay for indexed minutes, for more information, see [Azure Video Indexer pricing](https://azure.microsoft.com/pricing/details/video-indexer/).
28+
Azure Video Indexer unlimited accounts are Azure Resource Manager (ARM) based and unlike trial accounts, are created in your Azure subscription. Moving to an unlimited ARM based account unlocks many security and management capabilities, such as [RBAC user management](../role-based-access-control/overview.md), [Azure Monitor integration](../azure-monitor/overview.md), deployment through ARM templates, and much more.
3429

35-
When creating a new paid account, you need to connect the Azure Video Indexer account to your Azure subscription and an Azure Media Services account.
30+
Billing is per indexed minute, with the per minute cost determined by the selected preset. For more information regarding pricing, see [Azure Video Indexer pricing](https://azure.microsoft.com/pricing/details/video-indexer/).
3631

3732
## Create accounts
3833

39-
> [!NOTE]
40-
> It is recommended to use Azure Video Indexer ARM-based accounts.
41-
42-
* [Create an ARM-based (paid) account in Azure portal](create-account-portal.md). To create an account with an API, see [Accounts](/rest/api/videoindexer/preview/accounts)
34+
* To create an ARM-based (paid) account with the Azure portal, see [Create accounts with the Azure portal](create-account-portal.md).
35+
* To create an account with an API, see [Create accounts](/rest/api/videoindexer/stable/accounts)
4336

4437
> [!TIP]
4538
> Make sure you are signed in with the correct domain to the [Azure Video Indexer website](https://www.videoindexer.ai/). For details, see [Switch tenants](switch-tenants-portal.md).
4639
* [Upgrade a trial account to an ARM-based (paid) account and import your content for free](import-content-from-trial.md).
47-
* If you have a classic (paid) account, [connect an existing classic Azure Video Indexer account to an ARM-based account](connect-classic-account-to-arm.md).
48-
49-
Unless your code or infrastructure prevents you from moving from existing classic accounts, you should start using ARM-based accounts.
40+
41+
## Classic accounts
42+
43+
Before ARM based accounts were added to Azure Video Indexer, there was a "classic" account type (where the accounts management plane is built on API Management.) The classic account type is still used by some users.
5044

51-
## To get access to your account
52-
53-
| | ARM-based |Classic| Trial|
54-
|---|---|---|---|
55-
|Get access token | [ARM REST API](https://aka.ms/avam-arm-api) |[Get access token](https://api-portal.videoindexer.ai/api-details#api=Operations&operation=Get-Account-Access-Token)|Same as classic|
56-
|Share account| [Azure RBAC(role based access control)](../role-based-access-control/overview.md)| [Invite users](restricted-viewer-role.md#share-the-account) |Same as classic|
45+
* If you are using a classic (paid) account and interested in moving to an ARM-based account, see [connect an existing classic Azure Video Indexer account to an ARM-based account](connect-classic-account-to-arm.md).
46+
47+
For more information on the difference between regular unlimited accounts and classic accounts, see [Azure Video Indexer as an Azure resource](https://techcommunity.microsoft.com/t5/ai-applied-ai-blog/azure-video-indexer-is-now-available-as-an-azure-resource/ba-p/2912422).
5748

5849
## Limited access features
5950

@@ -64,5 +55,3 @@ For more information, see [Azure Video Indexer limited access features](limited-
6455
## Next steps
6556

6657
Make sure to review [Pricing](https://azure.microsoft.com/pricing/details/video-indexer/).
67-
68-

articles/backup/guidance-best-practices.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Guidance and best practices
33
description: Discover the best practices and guidance for backing up cloud and on-premises workload to the cloud
44
ms.topic: conceptual
5-
ms.date: 12/22/2021
5+
ms.date: 12/22/2022
66
ms.reviewer: dapatil
77
author: v-amallick
88
ms.service: backup
@@ -291,9 +291,9 @@ Governance in Azure is primarily implemented with [Azure Policy](../governance/p
291291

292292
- Whenever new infrastructure is provisioned and new VMs are created, as a backup admin, you need to ensure their protection. You can easily configure backups for one or two VMs. But it becomes complex when you need to configure hundreds or even thousands of VMs at scale. To simplify the process of configuring backups, Azure Backup provides you a set of built-in Azure Policies to govern your backup estate.
293293

294-
- **Central Policy**: If your organization has a central backup team that manages backups across application teams, you can use this policy to configure backup to an existing central Recovery Services vault in the same subscription and location as that of the VMs. You can choose to include/exclude VMs that contain a certain tag from the policy scope.
294+
- **Auto-enable backup on VMs using Policy (Central backup team model)**: If your organization has a central backup team that manages backups across application teams, you can use this policy to configure backup to an existing central Recovery Services vault in the same subscription and location as that of the VMs. You can choose to include/exclude VMs that contain a certain tag from the policy scope. [Learn more](backup-azure-auto-enable-backup.md#policy-1---configure-backup-on-vms-without-a-given-tag-to-an-existing-recovery-services-vault-in-the-same-location).
295295

296-
- **App Policy**: If you organize applications in dedicated resource groups and want to have them backed-up by the same vault, use this policy to automatically manage this action. You can choose to include/exclude VMs that contain a certain tag from the policy scope.
296+
- **Auto-enable backup on VMs using Policy (where backup owned by application teams)**: If you organize applications in dedicated resource groups and want to have them backed-up by the same vault, use this policy to automatically manage this action. You can choose to include/exclude VMs that contain a certain tag from the policy scope. [Learn more](backup-azure-auto-enable-backup.md#policy-3---configure-backup-on-vms-without-a-given-tag-to-a-new-recovery-services-vault-with-a-default-policy).
297297

298298
- **Monitoring Policy**: To generate the Backup Reports for your resources, enable the diagnostic settings when you create a new vault. Often, adding a diagnostic setting manually per vault can be a cumbersome task. So, you can utilize an Azure built-in policy that configures the diagnostics settings at scale to all vaults in each subscription or resource group, with Log Analytics as the destination.
299299

articles/cognitive-services/Speech-Service/text-to-speech.md

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Text-to-speech includes the following features:
2727
| Feature | Summary | Demo |
2828
| --- | --- | --- |
2929
| Prebuilt neural voice (called *Neural* on the [pricing page](https://azure.microsoft.com/pricing/details/cognitive-services/speech-services/)) | Highly natural out-of-the-box voices. Create an Azure account and Speech service subscription, and then use the [Speech SDK](./get-started-text-to-speech.md) or visit the [Speech Studio portal](https://speech.microsoft.com/portal) and select prebuilt neural voices to get started. Check the [pricing details](https://azure.microsoft.com/pricing/details/cognitive-services/speech-services/). | Check the [voice samples](https://azure.microsoft.com/services/cognitive-services/text-to-speech/#overview) and determine the right voice for your business needs. |
30-
| Custom neural voice (called *Custom Neural* on the [pricing page](https://azure.microsoft.com/pricing/details/cognitive-services/speech-services/)) | Easy-to-use self-service for creating a natural brand voice, with limited access for responsible use. Create an Azure account and Speech service subscription (with the S0 tier), and [apply](https://aka.ms/customneural) to use the custom neural feature. After you've been granted access, visit the [Speech Studio portal](https://speech.microsoft.com/portal) and select **Custom Voice** to get started. Check the [pricing details](https://azure.microsoft.com/pricing/details/cognitive-services/speech-services/). | Check the [voice samples](https://aka.ms/customvoice). |
30+
| Custom Neural Voice (called *Custom Neural* on the [pricing page](https://azure.microsoft.com/pricing/details/cognitive-services/speech-services/)) | Easy-to-use self-service for creating a natural brand voice, with limited access for responsible use. Create an Azure account and Speech service subscription (with the S0 tier), and [apply](https://aka.ms/customneural) to use the custom neural feature. After you've been granted access, visit the [Speech Studio portal](https://speech.microsoft.com/portal) and select **Custom Voice** to get started. Check the [pricing details](https://azure.microsoft.com/pricing/details/cognitive-services/speech-services/). | Check the [voice samples](https://aka.ms/customvoice). |
3131

3232
### More about neural text-to-speech features
3333

@@ -76,12 +76,13 @@ Sample code for text-to-speech is available on GitHub. These samples cover text-
7676
* [Text-to-speech samples (SDK)](https://github.com/Azure-Samples/cognitive-services-speech-sdk)
7777
* [Text-to-speech samples (REST)](https://github.com/Azure-Samples/Cognitive-Speech-TTS)
7878

79-
## Custom neural voice
79+
## Custom Neural Voice
8080

81-
In addition to prebuilt neural voices, you can create and fine-tune custom neural voices that are unique to your product or brand. All it takes to get started is a handful of audio files and the associated transcriptions. For more information, see [Get started with custom neural voice](how-to-custom-voice.md).
81+
In addition to prebuilt neural voices, you can create and fine-tune custom neural voices that are unique to your product or brand. All it takes to get started is a handful of audio files and the associated transcriptions. For more information, see [Get started with Custom Neural Voice](how-to-custom-voice.md).
8282

8383
## Pricing note
8484

85+
### Billable characters
8586
When you use the text-to-speech feature, you're billed for each character that's converted to speech, including punctuation. Although the SSML document itself is not billable, optional elements that are used to adjust how the text is converted to speech, like phonemes and pitch, are counted as billable characters. Here's a list of what's billable:
8687

8788
* Text passed to the text-to-speech feature in the SSML body of the request
@@ -94,6 +95,15 @@ For detailed information, see [Speech service pricing](https://azure.microsoft.c
9495
> [!IMPORTANT]
9596
> Each Chinese character is counted as two characters for billing, including kanji used in Japanese, hanja used in Korean, or hanzi used in other languages.
9697
98+
### Model training and hosting time for Custom Neural Voice
99+
100+
Custom Neural Voice training and hosting are both calculated by hour and billed per second. For the billing unit price, see [Speech service pricing](https://azure.microsoft.com/pricing/details/cognitive-services/speech-services/).
101+
102+
Custom Neural Voice (CNV) training time is measured by ‘compute hour’ (a unit to measure machine running time). Typically, when training a voice model, two computing tasks are running in parallel. So, the calculated compute hours will be longer than the actual training time. On average, it takes less than one compute hour to train a CNV Lite voice; while for CNV Pro, it usually takes 20 to 40 compute hours to train a single-style voice, and around 90 compute hours to train a multi-style voice. The CNV training time is billed with a cap of 96 compute hours. So in the case that a voice model is trained in 98 compute hours, you will only be charged with 96 compute hours.
103+
104+
Custom Neural Voice (CNV) endpoint hosting is measured by the actual time (hour). The hosting time (hours) for each endpoint is calculated at 00:00 UTC every day for the previous 24 hours. For example, if the endpoint has been active for 24 hours on day one, it will be billed for 24 hours at 00:00 UTC the second day. If the endpoint is newly created or has been suspended during the day, it will be billed for its acumulated running time until 00:00 UTC the second day. If the endpoint is not currently hosted, it will not be billed. In addition to the daily calculation at 00:00 UTC each day, the billing is also triggered immediately when an endpoint is deleted or suspended. For example, for an endpoint created at 08:00 UTC on December 1, the hosting hour will be calculated to 16 hours at 00:00 UTC on December 2 and 24 hours at 00:00 UTC on December 3. If the user suspends hosting the endpoint at 16:00 UTC on December 3, the duration (16 hours) from 00:00 to 16:00 UTC on December 3 will be calculated for billing.
105+
106+
97107
## Reference docs
98108

99109
* [Speech SDK](speech-sdk.md)

0 commit comments

Comments
 (0)