Skip to content

Commit 05a7e0b

Browse files
authored
Merge pull request #266852 from MicrosoftDocs/main
2/21/2024 AM Publish
2 parents 39d3e11 + 7437bd9 commit 05a7e0b

File tree

58 files changed

+187
-199
lines changed

Some content is hidden

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

58 files changed

+187
-199
lines changed

articles/ai-services/speech-service/speech-services-quotas-and-limits.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ You can use real-time speech to text with the [Speech SDK](speech-sdk.md) or the
4646

4747
| Quota | Free (F0) | Standard (S0) |
4848
|-----|-----|-----|
49-
| [Speech to text REST API](rest-speech-to-text.md) limit | Not available for F0 | 300 requests per minute |
49+
| [Speech to text REST API](rest-speech-to-text.md) limit | Not available for F0 | 100 requests per 10 seconds (600 requests per minute) |
5050
| Max audio input file size | N/A | 1 GB |
5151
| Max number of blobs per container | N/A | 10000 |
5252
| Max number of files per transcription request (when you're using multiple content URLs as input). | N/A | 1000 |
@@ -58,7 +58,7 @@ The limits in this table apply per Speech resource when you create a custom spee
5858

5959
| Quota | Free (F0) | Standard (S0) |
6060
|-----|-----|-----|
61-
| REST API limit | 300 requests per minute | 300 requests per minute |
61+
| REST API limit | 100 requests per 10 seconds (600 requests per minute) | 100 requests per 10 seconds (600 requests per minute) |
6262
| Max number of speech datasets | 2 | 500 |
6363
| Max acoustic dataset file size for data import | 2 GB | 2 GB |
6464
| Max language dataset file size for data import | 200 MB | 1.5 GB |

articles/ai-studio/concepts/content-filtering.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ The default content filtering configuration is set to filter at the medium sever
6868
| High | If approved<sup>1</sup>| If approved<sup>1</sup> | Content detected at severity levels low and medium isn't filtered. Only content at severity level high is filtered. Requires approval<sup>1</sup>.|
6969
| No filters | If approved<sup>1</sup>| If approved<sup>1</sup>| No content is filtered regardless of severity level detected. Requires approval<sup>1</sup>.|
7070

71-
<sup>1</sup> For Azure Open AI models, only customers who have been approved for modified content filtering have full content filtering control, including configuring content filters at severity level high only or turning off content filters. Apply for modified content filters via this form: [Azure OpenAI Limited Access Review: Modified Content Filters and Abuse Monitoring (microsoft.com)](https://customervoice.microsoft.com/Pages/ResponsePage.aspx?id=v4j5cvGGr0GRqy180BHbR7en2Ais5pxKtso_Pz4b1_xURE01NDY1OUhBRzQ3MkQxMUhZSE1ZUlJKTiQlQCN0PWcu)
71+
<sup>1</sup> For Azure OpenAI models, only customers who have been approved for modified content filtering have full content filtering control, including configuring content filters at severity level high only or turning off content filters. Apply for modified content filters via this form: [Azure OpenAI Limited Access Review: Modified Content Filters and Abuse Monitoring (microsoft.com)](https://customervoice.microsoft.com/Pages/ResponsePage.aspx?id=v4j5cvGGr0GRqy180BHbR7en2Ais5pxKtso_Pz4b1_xURE01NDY1OUhBRzQ3MkQxMUhZSE1ZUlJKTiQlQCN0PWcu)
7272

7373
### More filters for Gen-AI scenarios
7474
You could also enable filters for Gen-AI scenarios: jailbreak risk detection and protected material detection.
@@ -87,4 +87,4 @@ Now, you can go to the playground to test whether the content filter works as ex
8787

8888
- Learn more about the [underlying models that power Azure OpenAI](../../ai-services/openai/concepts/models.md).
8989
- Azure AI Studio content filtering is powered by [Azure AI Content Safety](/azure/ai-services/content-safety/overview).
90-
- Learn more about understanding and mitigating risks associated with your application: [Overview of Responsible AI practices for Azure OpenAI models](/legal/cognitive-services/openai/overview?context=/azure/ai-services/context/context).
90+
- Learn more about understanding and mitigating risks associated with your application: [Overview of Responsible AI practices for Azure OpenAI models](/legal/cognitive-services/openai/overview?context=/azure/ai-services/context/context).

articles/aks/azure-ad-integration-cli.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ description: Learn how to use the Azure CLI to create and Microsoft Entra ID-ena
44
author: TomGeske
55
ms.topic: article
66
ms.custom: devx-track-azurecli
7-
ms.date: 08/15/2023
7+
ms.date: 02/21/2024
88
ms.author: miwithro
99
---
1010

1111
# Integrate Microsoft Entra ID with Azure Kubernetes Service (AKS) using the Azure CLI (legacy)
1212

1313
> [!WARNING]
14-
> The feature described in this document, Microsoft Entra Integration (legacy) was **deprecated on June 1st, 2023**. At this time, no new clusters can be created with Microsoft Entra Integration (legacy). All Microsoft Entra Integration (legacy) AKS clusters will be migrated to AKS-managed Microsoft Entra ID automatically starting from December 1st, 2023.
14+
> The feature described in this document, Microsoft Entra Integration (legacy) was **deprecated on June 1st, 2023**. At this time, no new clusters can be created with Microsoft Entra Integration (legacy).
1515
>
1616
> AKS has a new improved [AKS-managed Microsoft Entra ID][managed-aad] experience that doesn't require you to manage server or client applications. If you want to migrate follow the instructions [here][managed-aad-migrate].
1717

articles/aks/howto-deploy-java-liberty-app.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -270,17 +270,17 @@ You can now run the `docker build` command to build the image.
270270
#### [Bash](#tab/in-bash)
271271

272272
```bash
273-
cd $BASE_DIR/java-app
273+
cd $BASE_DIR/java-app/target
274274

275275
docker buildx build --platform linux/amd64 -t javaee-cafe:v1 --pull --file=Dockerfile .
276276
```
277277

278278
#### [PowerShell](#tab/in-powershell)
279279

280280
```powershell
281-
cd $env:BASE_DIR\java-app
281+
cd $env:BASE_DIR\java-app\target
282282
283-
docker buildx build --platform linux/amd64 -t javaee-cafe:v1 --pull --file=Dockerfile .
283+
docker build -t javaee-cafe:v1 --pull --file=Dockerfile .
284284
```
285285

286286
---

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

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ 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: 2/15/2024
7+
ms.date: 2/21/2024
88
ms.author: jordanselig
99
# zone_pivot_groups: app-service-cli-portal
1010
---
@@ -63,7 +63,7 @@ az rest --method post --uri "${ASE_ID}/NoDowntimeMigrate?phase=Validation&api-ve
6363

6464
If there are no errors, your migration is supported, and you can continue to the next step.
6565

66-
## 4. Generate outbound IP addresses for your new App Service Environment v3
66+
## 4. Generate IP addresses for your new App Service Environment v3
6767

6868
Create a file called *zoneredundancy.json* with the following details for your region and zone redundancy selection.
6969

@@ -90,27 +90,17 @@ Run the following command to check the status of this step:
9090
az rest --method get --uri "${ASE_ID}?api-version=2022-03-01" --query properties.status
9191
```
9292

93-
If the step is in progress, you get a status of `Migrating`. After you get a status of `Ready`, run the following command to view your new outbound IPs. If you don't see the new IPs immediately, wait a few minutes and try again.
93+
If the step is in progress, you get a status of `Migrating`. When the step is complete, you get a status of `Ready`.
9494

95-
```azurecli
96-
az rest --method get --uri "${ASE_ID}?api-version=2022-03-01"
97-
```
98-
99-
## 5. Update dependent resources with new outbound IPs
100-
101-
By using the new IPs, update any of your resources or networking components to ensure that your new environment functions as intended after migration is complete. It's your responsibility to make any necessary updates.
102-
103-
This step is also a good time to review the [inbound and outbound network](networking.md#ports-and-network-restrictions) dependency changes when moving to App Service Environment v3. These changes include the port change for Azure Load Balancer, which now uses port 80. Don't migrate until you complete this step.
104-
105-
## 6. Delegate your App Service Environment subnet
95+
## 5. Delegate your App Service Environment subnet
10696

10797
App Service Environment v3 requires the subnet it's in to have a single delegation of `Microsoft.Web/hostingEnvironments`. Previous versions didn't require this delegation. You need to confirm that your subnet is delegated properly and update the delegation (if necessary) before migrating. You can update the delegation either by running the following command or by going to the subnet in the [Azure portal](https://portal.azure.com).
10898

10999
```azurecli
110100
az network vnet subnet update --resource-group $VNET_RG --name <subnet-name> --vnet-name <vnet-name> --delegations Microsoft.Web/hostingEnvironments
111101
```
112102

113-
## 7. Confirm there are no locks on the virtual network
103+
## 6. Confirm there are no locks on the virtual network
114104

115105
Virtual network locks block platform operations during migration. If your virtual network has locks, you need to remove them before migrating. If necessary, you can add back the locks after migration is complete.
116106

@@ -130,12 +120,12 @@ az lock delete --resource-group $VNET_RG --name <lock-name> --resource <vnet-nam
130120

131121
For related commands to check if your subscription or resource group has locks, see the [Azure CLI reference for locks](../../azure-resource-manager/management/lock-resources.md#azure-cli).
132122

133-
## 8. Prepare your configurations
123+
## 7. Prepare your configurations
134124

135125
If your existing App Service Environment uses a custom domain suffix, you can [configure one for your new App Service Environment v3 resource during the migration process](./side-by-side-migrate.md#add-a-custom-domain-suffix-optional). Configuring a custom domain suffix is optional. If your App Service Environment v2 has a custom domain suffix and you don't want to use it on your new App Service Environment v3, skip this step. If you previously didn't have a custom domain suffix but want one, you can configure one at this point or at any time once migration is complete. For more information on App Service Environment v3 custom domain suffixes, including requirements, step-by-step instructions, and best practices, see [Custom domain suffix for App Service Environments](./how-to-custom-domain-suffix.md).
136126

137127
> [!NOTE]
138-
> If you're configuring a custom domain suffix, when you're adding the network permissions on your Azure key vault, be sure that your key vault allows access from your App Service Environment's new outbound IP addresses that were generated in step 4.
128+
> If you're configuring a custom domain suffix, when you're adding the network permissions on your Azure key vault, be sure that your key vault allows access from your App Service Environment v3's new subnet.
139129
>
140130
141131
To set these configurations, including identifying the subnet you selected earlier, create another file called *parameters.json* with the following details based on your scenario. Be sure to use the new subnet that you selected for your new App Service Environment v3. Don't include the properties for a custom domain suffix if this feature doesn't apply to your migration. Pay attention to the value of the `zoneRedundant` property and set it to the same value you used in the outbound IP generation step. **You must use the same value for zone redundancy that you used in the IP generation step.**
@@ -189,7 +179,7 @@ If you're using a system assigned managed identity for your custom domain suffix
189179
}
190180
```
191181

192-
## 9. Migrate to App Service Environment v3 and check status
182+
## 8. Migrate to App Service Environment v3 and check status
193183

194184
After you complete all of the preceding steps, you can start the migration. Make sure that you understand the [implications of migration](side-by-side-migrate.md#migrate-to-app-service-environment-v3).
195185

@@ -214,17 +204,17 @@ Get the details of your new environment by running the following command or by g
214204
az appservice ase show --name $ASE_NAME --resource-group $ASE_RG
215205
```
216206

217-
## 10. Get the inbound IP address for your new App Service Environment v3 and update dependent resources
207+
## 9. Get the new IP addresses for your new App Service Environment v3 and update dependent resources
218208

219-
You have two App Service Environments at this stage in the migration process. Your apps are running in both environments. You need to update any dependent resources to use the new inbound IP address for your new App Service Environment v3. For internal facing (ILB) App Service Environments, you need to update your private DNS zones to point to the new inbound IP address.
209+
You have two App Service Environments at this stage in the migration process. Your apps are running in both environments. You need to update any dependent resources to use the new IP addresses for your new App Service Environment v3. For internal facing (ILB) App Service Environments, you need to update your private DNS zones to point to the new inbound IP address.
220210

221-
You can get the inbound IP address for your new App Service Environment v3 by running the following command.
211+
You can get the new IP addresses for your new App Service Environment v3 by running the following command. It's your responsibility to make any necessary updates.
222212

223213
```azurecli
224214
az rest --method get --uri "${ASE_ID}?api-version=2022-03-01"
225215
```
226216

227-
## 11. Redirect customer traffic and complete migration
217+
## 10. Redirect customer traffic and complete migration
228218

229219
This step is your opportunity to test and validate your new App Service Environment v3. Once you confirm your apps are working as expected, you can redirect customer traffic to your new environment by running the following command. This command also deletes your old environment.
230220

@@ -243,4 +233,4 @@ If you find any issues or decide at this point that you no longer want to procee
243233
> [App Service Environment v3 networking](networking.md)
244234
245235
> [!div class="nextstepaction"]
246-
> [Custom domain suffix](./how-to-custom-domain-suffix.md)
236+
> [Custom domain suffix](./how-to-custom-domain-suffix.md)

0 commit comments

Comments
 (0)