Skip to content

Commit d10d971

Browse files
authored
Merge pull request #270244 from MicrosoftDocs/main
3/26/2024 AM Publish
2 parents b0b0c42 + 7d0ef11 commit d10d971

File tree

49 files changed

+339
-191
lines changed

Some content is hidden

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

49 files changed

+339
-191
lines changed

articles/ai-services/speech-service/migrate-v3-1-to-v3-2.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: eric-urban
66
manager: nitinme
77
ms.service: azure-ai-speech
88
ms.topic: how-to
9-
ms.date: 1/21/2024
9+
ms.date: 3/26/2024
1010
ms.author: eur
1111
ms.devlang: csharp
1212
ms.custom: devx-track-csharp
@@ -177,9 +177,10 @@ Added token count and token error properties to the `EvaluationProperties` prope
177177

178178
### Model copy
179179

180-
Added the new `"/operations/models/copy/{id}"` operation. Used for copy models scenario.
181-
Added the new `"/models/{id}:copy"` operation. Schema in the new copy operation: `"$ref": "#/definitions/ModelCopyAuthorization"` Deprecated the `"/models/{id}:copyto"` operation. Schema in the deprecated copy operation: `"$ref": "#/definitions/ModelCopy"`
182-
Added the new `"/models:authorizecopy"` operation returns `"$ref": "#/definitions/ModelCopyAuthorization"`. This returned entity can be used in the new `"/models/{id}:copy"` operation.
180+
The following changes are for the scenario where you copy a model.
181+
- Added the new [Models_Copy](https://eastus.dev.cognitive.microsoft.com/docs/services/speech-to-text-api-v3-2-preview2/operations/Models_Copy) operation. Here's the schema in the new copy operation: `"$ref": "#/definitions/ModelCopyAuthorization"`
182+
- Deprecated the [Models_CopyTo](https://eastus.dev.cognitive.microsoft.com/docs/services/speech-to-text-api-v3-2-preview2/operations/Models_CopyTo) operation. Here's the schema in the deprecated copy operation: `"$ref": "#/definitions/ModelCopy"`
183+
- Added the new [Models_AuthorizeCopy](https://eastus.dev.cognitive.microsoft.com/docs/services/speech-to-text-api-v3-2-preview2/operations/Models_AuthorizeCopy) operation that returns `"$ref": "#/definitions/ModelCopyAuthorization"`. This returned entity can be used in the new [Models_Copy](https://eastus.dev.cognitive.microsoft.com/docs/services/speech-to-text-api-v3-2-preview2/operations/Models_Copy) operation.
183184

184185
Added a new entity definition for `ModelCopyAuthorization`:
185186

@@ -252,8 +253,8 @@ Added a new entity definition for `ModelCopyAuthorizationDefinition`:
252253
### CustomModelLinks copy properties
253254

254255
Added a new `copy` property.
255-
copyTo URI: The location to the obsolete model copy action. See operation \"Models_CopyTo\" for more details.
256-
copy URI: The location to the model copy action. See operation \"Models_Copy\" for more details.
256+
- `copyTo` URI: The location of the obsolete model copy action. See the [Models_CopyTo](https://eastus.dev.cognitive.microsoft.com/docs/services/speech-to-text-api-v3-2-preview2/operations/Models_CopyTo) operation for more details.
257+
- `copy` URI: The location of the model copy action. See the [Models_Copy](https://eastus.dev.cognitive.microsoft.com/docs/services/speech-to-text-api-v3-2-preview2/operations/Models_Copy) operation for more details.
257258

258259
```json
259260
"CustomModelLinks": {

articles/ai-services/speech-service/whisper-overview.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,25 @@ author: eric-urban
66
manager: nitinme
77
ms.service: azure-ai-speech
88
ms.topic: overview
9-
ms.date: 1/22/2024
9+
ms.date: 3/26/2024
1010
ms.author: eur
1111
---
1212

1313
# What is the Whisper model?
1414

1515
The Whisper model is a speech to text model from OpenAI that you can use to transcribe audio files. The model is trained on a large dataset of English audio and text. The model is optimized for transcribing audio files that contain speech in English. The model can also be used to transcribe audio files that contain speech in other languages. The output of the model is English text.
1616

17+
Whisper models are available via the Azure OpenAI Service or via Azure AI Speech. The features differ for those offerings. In Azure AI Speech, Whisper is just one of several speech to text models that you can use.
18+
1719
You might ask:
1820

1921
- Is the Whisper Model a good choice for my scenario, or is an Azure AI Speech model better? What are the API comparisons between the two types of models?
2022

2123
- If I want to use the Whisper Model, should I use it via the Azure OpenAI Service or via Azure AI Speech? What are the scenarios that guide me to use one or the other?
2224

23-
## Whisper model via Azure AI Speech models
25+
## Whisper model or Azure AI Speech models
2426

25-
Either the Whisper model or the Azure AI Speech models are appropriate depending on your scenarios. The following table compares options with recommendations about where to start.
27+
Either the Whisper model or the Azure AI Speech models are appropriate depending on your scenarios. If you decide to use Azure AI Speech, you can choose from several models, including the Whisper model. The following table compares options with recommendations about where to start.
2628

2729
| Scenario | Whisper model | Azure AI Speech models |
2830
|---------|---------------|------------------------|
@@ -41,7 +43,7 @@ Either the Whisper model or the Azure AI Speech models are appropriate depending
4143

4244
## Whisper model via Azure AI Speech or via Azure OpenAI Service?
4345

44-
You can choose whether to use the Whisper Model via [Azure OpenAI](../openai/whisper-quickstart.md) or via [Azure AI Speech](./batch-transcription-create.md#use-a-whisper-model). In either case, the readability of the transcribed text is the same. You can input mixed language audio and the output is in English.
46+
If you decide to use the Whisper model, you have two options. You can choose whether to use the Whisper Model via [Azure OpenAI](../openai/whisper-quickstart.md) or via [Azure AI Speech](./batch-transcription-create.md#use-a-whisper-model). In either case, the readability of the transcribed text is the same. You can input mixed language audio and the output is in English.
4547

4648
Whisper Model via Azure OpenAI Service might be best for:
4749
- Quickly transcribing audio files one at a time

articles/aks/best-practices-cost.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Cost optimization is about maximizing the value of resources while minimizing un
1212

1313
In this article, you learn about:
1414
> [!div class="checklist"]
15-
> * Strategic infrastucture selection
15+
> * Strategic infrastructure selection
1616
> * Dynamic rightsizing and autoscaling
1717
> * Leveraging Azure discounts for substantial savings
1818
> * Holistic monitoring and FinOps practices

articles/aks/operator-best-practices-network.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Best practices for network resources in Azure Kubernetes Service (AKS)
33
titleSuffix: Azure Kubernetes Service
44
description: Learn the cluster operator best practices for virtual network resources and connectivity in Azure Kubernetes Service (AKS).
55
ms.topic: conceptual
6-
ms.date: 06/22/2023
6+
ms.date: 03/18/2024
77

88
---
99

@@ -81,7 +81,7 @@ Since you don't create the virtual network and subnets separately from the AKS c
8181
* Simple websites with low traffic.
8282
* Lifting and shifting workloads into containers.
8383

84-
For most production deployments, you should plan for and use Azure CNI networking.
84+
For production deployments, both kubenet and Azure CNI are valid options. Environments which require separation of control and management, Azure CNI may the preferred option. Additionally, kubenet is suited for Linux only environments where IP address range conservation is a priority.
8585

8686
You can also [configure your own IP address ranges and virtual networks using kubenet][aks-configure-kubenet-networking]. Like Azure CNI networking, these address ranges shouldn't overlap each other or any networks associated with the cluster (virtual networks, subnets, on-premises and peered networks).
8787

articles/aks/use-network-policies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ To use Azure Network Policy Manager, you must use the Azure CNI plug-in. Calico
9696

9797
The following example script creates an AKS cluster with system-assigned identity and enables network policy by using Azure Network Policy Manager.
9898

99-
>[!Note}
99+
>[!NOTE]
100100
> Calico can be used with either the `--network-plugin azure` or `--network-plugin kubenet` parameters.
101101
102102
Instead of using a system-assigned identity, you can also use a user-assigned identity. For more information, see [Use managed identities](use-managed-identity.md).

articles/app-service/environment/how-to-migrate.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn how to migrate your App Service Environment to App Service En
44
author: seligj95
55
ms.topic: tutorial
66
ms.custom: devx-track-azurecli
7-
ms.date: 3/7/2024
7+
ms.date: 3/26/2024
88
ms.author: jordanselig
99
zone_pivot_groups: app-service-cli-portal
1010
---
@@ -54,7 +54,7 @@ ASE_ID=$(az appservice ase show --name $ASE_NAME --resource-group $ASE_RG --quer
5454

5555
## 2. Validate that migration is supported
5656

57-
The following command checks whether your App Service Environment is supported for migration. If you receive an error or if your App Service Environment is in an unhealthy or suspended state, you can't migrate at this time. See the [troubleshooting](migrate.md#troubleshooting) section for descriptions of the potential error messages that you can get. If your environment [isn't supported for migration using the in-place migration feature](migrate.md#supported-scenarios) or you want to migrate to App Service Environment v3 without using the in-place migration feature, see the [manual migration options](migration-alternatives.md).
57+
The following command checks whether your App Service Environment is supported for migration. If you receive an error or if your App Service Environment is in an unhealthy or suspended state, you can't migrate at this time. See the [troubleshooting](migrate.md#troubleshooting) section for descriptions of the potential error messages that you can get. If your environment [isn't supported for migration using the in-place migration feature](migrate.md#supported-scenarios) or you want to migrate to App Service Environment v3 without using the in-place migration feature, see the [manual migration options](migration-alternatives.md). This command also validates that your App Service Environment is on the supported build version for migration. If your App Service Environment isn't on the supported build version, an upgrade automatically starts. For more information on the premigration upgrade, see [Validate that migration is supported using the in-place migration feature for your App Service Environment](migrate.md#validate-that-migration-is-supported-using-the-in-place-migration-feature-for-your-app-service-environment).
5858

5959
```azurecli
6060
az rest --method post --uri "${ASE_ID}/migrate?api-version=2021-02-01&phase=validation"

articles/app-service/environment/how-to-side-by-side-migrate.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ description: Learn how to migrate your App Service Environment v2 to App Service
44
author: seligj95
55
ms.topic: tutorial
66
ms.custom: devx-track-azurecli
7-
ms.date: 3/22/2024
7+
ms.date: 3/26/2024
88
ms.author: jordanselig
9-
# zone_pivot_groups: app-service-cli-portal
109
---
1110
# Use the side-by-side migration feature to migrate App Service Environment v2 to App Service Environment v3 (Preview)
1211

@@ -63,7 +62,7 @@ ASE_ID=$(az appservice ase show --name $ASE_NAME --resource-group $ASE_RG --quer
6362

6463
## 3. Validate migration is supported
6564

66-
The following command checks whether your App Service Environment is supported for migration. If you receive an error or if your App Service Environment is in an unhealthy or suspended state, you can't migrate at this time. See the [troubleshooting](side-by-side-migrate.md#troubleshooting) section for descriptions of the potential error messages that you can get. If your environment [isn't supported for migration using the side-by-side migration feature](side-by-side-migrate.md#supported-scenarios) or you want to migrate to App Service Environment v3 without using the side-by-side migration feature, see the [manual migration options](migration-alternatives.md).
65+
The following command checks whether your App Service Environment is supported for migration. If you receive an error or if your App Service Environment is in an unhealthy or suspended state, you can't migrate at this time. See the [troubleshooting](side-by-side-migrate.md#troubleshooting) section for descriptions of the potential error messages that you can get. If your environment [isn't supported for migration using the side-by-side migration feature](side-by-side-migrate.md#supported-scenarios) or you want to migrate to App Service Environment v3 without using the side-by-side migration feature, see the [manual migration options](migration-alternatives.md). This command also validates that your App Service Environment is on the supported build version for migration. If your App Service Environment isn't on the supported build version, an upgrade automatically starts. For more information on the premigration upgrade, see [Validate that migration is supported using the side-by-side migration feature for your App Service Environment](side-by-side-migrate.md#validate-that-migration-is-supported-using-the-side-by-side-migration-feature-for-your-app-service-environment).
6766

6867
```azurecli
6968
az rest --method post --uri "${ASE_ID}/NoDowntimeMigrate?phase=Validation&api-version=2022-03-01"
@@ -213,7 +212,7 @@ Run the following command to check the status of your migration:
213212
az rest --method get --uri "${ASE_ID}?api-version=2022-03-01" --query properties.subStatus
214213
```
215214

216-
After you get a status of `MigrationPendingDnsChange`, migration is done, and you have an App Service Environment v3 resource. Your apps are now running in your new environment as well as in your old environment.
215+
After you get a status of `MigrationPendingDnsChange`, migration is done, and you have an App Service Environment v3 resource. Your apps are now running in your new environment and in your old environment.
217216

218217
Get the details of your new environment by running the following command:
219218

articles/app-service/environment/migrate.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Migrate to App Service Environment v3 by using the in-place migration fea
33
description: Overview of the in-place migration feature for migration to App Service Environment v3.
44
author: seligj95
55
ms.topic: article
6-
ms.date: 03/1/2024
6+
ms.date: 03/26/2024
77
ms.author: jordanselig
88
ms.custom: references_regions
99
---
@@ -15,7 +15,7 @@ ms.custom: references_regions
1515
1616
App Service can automate migration of your App Service Environment v1 and v2 to an [App Service Environment v3](overview.md). There are different migration options. Review the [migration path decision tree](upgrade-to-asev3.md#migration-path-decision-tree) to decide which option is best for your use case. App Service Environment v3 provides [advantages and feature differences](overview.md#feature-differences) over earlier versions. Make sure to review the [supported features](overview.md#feature-differences) of App Service Environment v3 before migrating to reduce the risk of an unexpected application issue.
1717

18-
The in-place migration feature automates your migration to App Service Environment v3 by upgrading your existing App Service Environment in the same subnet. This migration option is best for customers who want to migrate to App Service Environment v3 with minimal changes to their networking configurations and can support about one hour of application downtime. If you can't support downtime, see the [side migration feature](side-by-side-migrate.md) or the [manual migration options](migration-alternatives.md).
18+
The in-place migration feature automates your migration to App Service Environment v3 by upgrading your existing App Service Environment in the same subnet. This migration option is best for customers who want to migrate to App Service Environment v3 with minimal changes to their networking configurations. You must also be able to support about one hour of application downtime. If you can't support downtime, see the [side migration feature](side-by-side-migrate.md) or the [manual migration options](migration-alternatives.md).
1919

2020
> [!IMPORTANT]
2121
> It is recommended to use this feature for dev environments first before migrating any production environments to ensure there are no unexpected issues. Please provide any feedback related to this article or the feature using the buttons at the bottom of the page.
@@ -97,6 +97,12 @@ If your App Service Environment doesn't pass the validation checks or you try to
9797

9898
In-place migration consists of a series of steps that must be followed in order. Key points are given for a subset of the steps. It's important to understand what happens during these steps and how your environment and apps are impacted. After reviewing the following information and when you're ready to migrate, follow the [step-by-step guide](how-to-migrate.md).
9999

100+
### Validate that migration is supported using the in-place migration feature for your App Service Environment
101+
102+
The platform validates that your App Service Environment can be migrated using the in-place migration feature. If your App Service Environment doesn't pass all validation checks, you can't migrate at this time using the in-place migration feature. See the [troubleshooting](#troubleshooting) section for details of the possible causes of validation failure. If your environment is in an unhealthy or suspended state, you can't migrate until you make the needed updates. If you can't migrate using the in-place migration feature, see the [manual migration options](migration-alternatives.md).
103+
104+
The validation also checks if your App Service Environment is on the minimum build required for migration. The minimum build is updated periodically to ensure the latest bug fixes and improvements are available. If your App Service Environment isn't on the minimum build, an upgrade is automatically started. Your App Service Environment won't be impacted, but you won't be able to scale or make changes to your App Service Environment while the upgrade is in progress. You won't be able to migrate until the upgrade finishes. Upgrades can take 8-12 hours to complete or longer depending on the size of your environment. If you plan a specific time window for your migration, you should run the validation check 24-48 hours before your planned migration time to ensure you have time for an upgrade if one is needed.
105+
100106
### Generate IP addresses for your new App Service Environment v3
101107

102108
The platform creates the [new inbound IP (if you're migrating an ELB App Service Environment) and the new outbound IP](networking.md#addresses) addresses. While these IPs are getting created, activity with your existing App Service Environment isn't interrupted, however, you can't scale or make changes to your existing environment. This process takes about 15 minutes to complete.

0 commit comments

Comments
 (0)