Skip to content

Commit 2a7dca4

Browse files
authored
Merge pull request #271267 from MicrosoftDocs/main
04/04 PM Publishing
2 parents b719a29 + 4242e47 commit 2a7dca4

File tree

80 files changed

+1769
-647
lines changed

Some content is hidden

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

80 files changed

+1769
-647
lines changed

articles/ai-services/document-intelligence/faq.yml

Lines changed: 183 additions & 186 deletions
Large diffs are not rendered by default.

articles/ai-services/openai/concepts/models.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ titleSuffix: Azure OpenAI
44
description: Learn about the different model capabilities that are available with Azure OpenAI.
55
ms.service: azure-ai-openai
66
ms.topic: conceptual
7-
ms.date: 03/14/2024
7+
ms.date: 04/04/2024
88
ms.custom: references_regions, build-2023, build-2023-dataai, refefences_regions
99
manager: nitinme
1010
author: mrbullwinkle #ChrisHMSFT
@@ -189,6 +189,14 @@ See [model versions](../concepts/model-versions.md) to learn about how Azure Ope
189189

190190
**<sup>1</sup>** This model will accept requests > 4,096 tokens. It is not recommended to exceed the 4,096 input token limit as the newer version of the model are capped at 4,096 tokens. If you encounter issues when exceeding 4,096 input tokens with this model this configuration is not officially supported.
191191

192+
#### Azure Government regions
193+
194+
The following GPT-3.5 turbo models are available with [Azure Government](/azure/azure-government/documentation-government-welcome):
195+
196+
|Model ID | Model Availability |
197+
|--|--|
198+
| `gpt-35-turbo` (1106-Preview) | US Gov Virginia |
199+
192200
### Embeddings models
193201

194202
These models can only be used with Embedding API requests.

articles/aks/app-routing.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ With the retirement of [Open Service Mesh][open-service-mesh-docs] (OSM) by the
4343
- All global Azure DNS zones integrated with the add-on have to be in the same resource group.
4444
- All private Azure DNS zones integrated with the add-on have to be in the same resource group.
4545
- Editing the ingress-nginx `ConfigMap` in the `app-routing-system` namespace isn't supported.
46+
- The following snippet annotations are blocked and will prevent an Ingress from being configured: `load_module`, `lua_package`, `_by_lua`, `location`, `root`, `proxy_pass`, `serviceaccount`, `{`, `}`, `'`.
4647

4748
## Enable application routing using Azure CLI
4849

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

Lines changed: 73 additions & 64 deletions
Large diffs are not rendered by default.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "Deploy Quarkus on Azure Kubernetes Service"
33
description: Shows how to quickly stand up Quarkus on Azure Kubernetes Service.
4-
author: edburns
4+
author: KarlErickson
55
ms.author: edburns
66
ms.service: azure-kubernetes-service
77
ms.topic: how-to
@@ -60,7 +60,7 @@ Instead of `quarkus dev`, you can accomplish the same thing with Maven by using
6060

6161
You may be asked if you want to send telemetry of your usage of Quarkus dev mode. If so, answer as you like.
6262

63-
Quarkus dev mode enables live reload with background compilation. If you modify any aspect of your app source code and refresh your browser, you can see the changes. If there are any issues with compilation or deployment, an error page lets you know. Quarkus dev mode listens for a debugger on port 5005. If you want to wait for the debugger to attach before running, pass `-Dsuspend` on the command line. If you dont want the debugger at all, you can use `-Ddebug=false`.
63+
Quarkus dev mode enables live reload with background compilation. If you modify any aspect of your app source code and refresh your browser, you can see the changes. If there are any issues with compilation or deployment, an error page lets you know. Quarkus dev mode listens for a debugger on port 5005. If you want to wait for the debugger to attach before running, pass `-Dsuspend` on the command line. If you don't want the debugger at all, you can use `-Ddebug=false`.
6464

6565
The output should look like the following example:
6666

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "Deploy WebLogic Server on Azure Kubernetes Service using the Azure portal"
33
description: Shows how to quickly stand up WebLogic Server on Azure Kubernetes Service.
4-
author: edburns
4+
author: KarlErickson
55
ms.author: edburns
66
ms.topic: how-to
77
ms.date: 02/09/2024
@@ -454,7 +454,7 @@ Use the following steps to build the image:
454454
=> => naming to docker.io/library/model-in-image:WLS-v1 0.2s
455455
```
456456
457-
1. If you have successfully created the image, then it should now be in your local machines Docker repository. You can verify the image creation by using the following command:
457+
1. If you have successfully created the image, then it should now be in your local machine's Docker repository. You can verify the image creation by using the following command:
458458
459459
```text
460460
docker images model-in-image:WLS-v1

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

Lines changed: 7 additions & 7 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: 4/1/2024
7+
ms.date: 4/4/2024
88
ms.author: jordanselig
99
---
1010
# Use the side-by-side migration feature to migrate App Service Environment v2 to App Service Environment v3 (Preview)
@@ -232,7 +232,7 @@ az appservice ase show --name $ASE_NAME --resource-group $ASE_RG
232232
233233
## 10. Get the inbound IP addresses for your new App Service Environment v3 and update dependent resources
234234

235-
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 inbound 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. You should account for both the old and new inbound IP at this point. You can remove the dependencies on the previous IP address after you complete the next step.
235+
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 inbound 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. This step is where you can validate your new environment and make any remaining necessary updates to your dependent resources.
236236

237237
> [!IMPORTANT]
238238
> During the preview, the new inbound IP might be returned incorrectly due to a known bug. Open a support ticket to receive the correct IP addresses for your App Service Environment v3.
@@ -252,11 +252,13 @@ For ELB App Service Environments, get the public inbound IP address by running t
252252
az rest --method get --uri "${ASE_ID}?api-version=2022-03-01" --query properties.networkingConfiguration.externalInboundIpAddresses
253253
```
254254

255-
## 11. Redirect customer traffic and complete migration
255+
## 11. Redirect customer traffic, validate your App Service Environment v3, and complete migration
256256

257-
This step is your opportunity to test and validate your new App Service Environment v3. Your App Service Environment v2 front ends are still running, but the backing compute is an App Service Environment v3. If you're able to access your apps without issues, that means you're ready to complete the migration.
257+
This step is your opportunity to test and validate your new App Service Environment v3. Your App Service Environment v2 front ends are still running, but the backing compute is an App Service Environment v3. If you're able to access your apps without issues that means you're ready to complete the migration. If you want to test your App Service Environment v3 front ends, you can do so by using the inbound IP address you got in the previous step.
258258

259-
Once you confirm your apps are working as expected, you can redirect customer traffic to your new App Service Environment v3 front ends by running the following command. This command also deletes your old environment.
259+
Once you confirm your apps are working as expected, you can redirect customer traffic to your new App Service Environment v3 by running the following command. This command also deletes your old environment.
260+
261+
If you find any issues or decide at this point that you no longer want to proceed with the migration, contact support to revert the migration. Don't run the DNS change command if you need to revert the migration. For more information, see [Revert migration](./side-by-side-migrate.md#redirect-customer-traffic-validate-your-app-service-environment-v3-and-complete-migration).
260262

261263
```azurecli
262264
az rest --method post --uri "${ASE_ID}/NoDowntimeMigrate?phase=DnsChange&api-version=2022-03-01"
@@ -270,8 +272,6 @@ az rest --method get --uri "${ASE_ID}?api-version=2022-03-01" --query properties
270272

271273
During this step, you get a status of `CompletingMigration`. When you get a status of `MigrationCompleted`, the traffic redirection step is done and your migration is complete.
272274

273-
If you find any issues or decide at this point that you no longer want to proceed with the migration, contact support to revert the migration. Don't run the above command if you need to revert the migration. For more information, see [Revert migration](side-by-side-migrate.md#redirect-customer-traffic-and-complete-migration).
274-
275275
## Next steps
276276

277277
> [!div class="nextstepaction"]

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Migrate to App Service Environment v3 by using the side-by-side migration
33
description: Overview of the side-by-side migration feature for migration to App Service Environment v3.
44
author: seligj95
55
ms.topic: article
6-
ms.date: 3/28/2024
6+
ms.date: 4/4/2024
77
ms.author: jordanselig
88
ms.custom: references_regions
99
---
@@ -143,7 +143,7 @@ The platform creates the [the new outbound IP addresses](networking.md#addresses
143143

144144
When completed, the new outbound IPs that your future App Service Environment v3 uses are created. These new IPs have no effect on your existing environment.
145145

146-
You receive the new inbound IP address once migration is complete but before you make the [DNS change to redirect customer traffic to your new App Service Environment v3](#redirect-customer-traffic-and-complete-migration). You don't get the inbound IP at this point in the process because there are dependencies on App Service Environment v3 resources that get created during the migration step. You have a chance to update any resources that are dependent on the new inbound IP before you redirect traffic to your new App Service Environment v3.
146+
You receive the new inbound IP address once migration is complete but before you make the [DNS change to redirect customer traffic to your new App Service Environment v3](#redirect-customer-traffic-validate-your-app-service-environment-v3-and-complete-migration). You don't get the inbound IP at this point in the process because there are dependencies on App Service Environment v3 resources that get created during the migration step. You have a chance to update any resources that are dependent on the new inbound IP before you redirect traffic to your new App Service Environment v3.
147147

148148
This step is also where you decide if you want to enable zone redundancy for your new App Service Environment v3. Zone redundancy can be enabled as long as your App Service Environment v3 is [in a region that supports zone redundancy](./overview.md#regions).
149149

@@ -188,17 +188,19 @@ Side-by-side migration requires a three to six hour service window for App Servi
188188
- The new App Service Environment v3 is created in the subnet you selected.
189189
- Your new App Service plans are created in the new App Service Environment v3 with the corresponding Isolated v2 tier.
190190
- Your apps are created in the new App Service Environment v3.
191-
- The underlying compute for your apps is moved to the new App Service Environment v3. Your App Service Environment v2 front ends are still serving traffic. The migration process doesn't redirect to the App Service Environment v3 front ends until you complete the final step of the migration.
191+
- The underlying compute for your apps is moved to the new App Service Environment v3. Your App Service Environment v2 front ends are still serving traffic. Your old inbound IP address remains in use.
192+
- For ILB App Service Environments, your App Service Environment v3 front ends aren't used until you update your private DNS zones with the new inbound IP address.
193+
- For ELB App Service Environments, the migration process doesn't redirect to the App Service Environment v3 front ends until you complete the final step of the migration.
192194

193195
When this step completes, your application traffic is still going to your old App Service Environment front ends and the inbound IP that was assigned to it. However, you also now have an App Service Environment v3 with all of your apps.
194196

195197
### Get the inbound IP address for your new App Service Environment v3 and update dependent resources
196198

197-
The new inbound IP address is given so that you can set up new endpoints with services like [Traffic Manager](../../traffic-manager/traffic-manager-overview.md) or [Azure Front Door](../../frontdoor/front-door-overview.md) and update any of your private DNS zones. Don't move on to the next step until you account for these changes. There's downtime if you don't update dependent resources with the new inbound IP. **It's your responsibility to update any and all resources that are impacted by the IP address change associated with the new App Service Environment v3. Don't move on to the next step until you've made all required updates.**
199+
The new inbound IP address is given so that you can set up new endpoints with services like [Traffic Manager](../../traffic-manager/traffic-manager-overview.md) or [Azure Front Door](../../frontdoor/front-door-overview.md) and update any of your private DNS zones. Don't move on to the next step until you make these changes. There's downtime if you don't update dependent resources with the new inbound IP. **It's your responsibility to update any and all resources that are impacted by the IP address change associated with the new App Service Environment v3. Don't move on to the next step until you've made all required updates.**
198200

199-
### Redirect customer traffic and complete migration
201+
### Redirect customer traffic, validate your App Service Environment v3, and complete migration
200202

201-
The final step is to redirect traffic to your new App Service Environment v3 and complete the migration. The platform does this change for you, but only when you initiate it. Before you do this step, you should review your new App Service Environment v3 and perform any needed testing to validate that it's functioning as intended. Your App Service Environment v2 front ends are still running, but the backing compute is an App Service Environment v3. If you're able to access your apps without issues, that means you're ready to complete the migration.
203+
The final step is to redirect traffic to your new App Service Environment v3 and complete the migration. The platform does this change for you, but only when you initiate it. Before you do this step, you should review your new App Service Environment v3 and perform any needed testing to validate that it's functioning as intended. Your App Service Environment v2 front ends are still running, but the backing compute is an App Service Environment v3. If you're using an ILB App Service Environment v3, you can test your App Service Environment v3 front ends by updating your private DNS zones with the new inbound IP address. Testing this change allows you to fully validate your App Service Environment v3 before initiating the final step of the migration where your old App Service Environment is deleted.
202204

203205
Once you're ready to redirect traffic, you can complete the final step of the migration. This step updates internal DNS records to point to the load balancer IP address of your new App Service Environment v3 and the front ends that were created during the migration. Changes are effective within a couple minutes. If you run into issues, check your cache and TTL settings. This step also shuts down your old App Service Environment and deletes it. Your new App Service Environment v3 is now your production environment.
204206

articles/app-service/environment/upgrade-to-asev3.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ This page is your one-stop shop for guidance and resources to help you upgrade s
2323
|----|------|---------|
2424
|**1**|**Pre-flight check**|Determine if your environment meets the prerequisites to automate your upgrade using one of the automated migration features. Decide whether an in-place or side-by-side migration is right for your use case.<br><br>- [Migration path decision tree](#migration-path-decision-tree)<br>- [Automated upgrade using the in-place migration feature](migrate.md)<br>- [Automated upgrade using the side-by-side migration feature](side-by-side-migrate.md)<br><br>If not, you can upgrade manually.<br><br>- [Manual migration](migration-alternatives.md)|
2525
|**2**|**Migrate**|Based on results of your review, either upgrade using one of the automated migration features or follow the manual steps.<br><br>- [Use the in-place automated migration feature](how-to-migrate.md)<br>- [Use the side-by-side automated migration feature](how-to-side-by-side-migrate.md)<br>- [Migrate manually](migration-alternatives.md)|
26-
|**3**|**Testing and troubleshooting**|Upgrading using one of the automated migration features requires a 3-6 hour service window. If you use the side-by-side migration feature, you have the opportunity to [test and validate your App Service Environment v3](side-by-side-migrate.md#redirect-customer-traffic-and-complete-migration) before completing the upgrade. Support teams are monitoring upgrades to ensure success. If you have a support plan and you need technical help, create a [support request](https://portal.azure.com/#blade/Microsoft_Azure_Support/HelpAndSupportBlade/newsupportrequest).|
26+
|**3**|**Testing and troubleshooting**|Upgrading using one of the automated migration features requires a 3-6 hour service window. If you use the side-by-side migration feature, you have the opportunity to [test and validate your App Service Environment v3](./side-by-side-migrate.md#redirect-customer-traffic-validate-your-app-service-environment-v3-and-complete-migration) before completing the upgrade. Support teams are monitoring upgrades to ensure success. If you have a support plan and you need technical help, create a [support request](https://portal.azure.com/#blade/Microsoft_Azure_Support/HelpAndSupportBlade/newsupportrequest).|
2727
|**4**|**Optimize your App Service plans**|Once your upgrade is complete, you can optimize the App Service plans for additional benefits.<br><br>Review the autoselected Isolated v2 SKU sizes and scale up or scale down your App Service plans as needed.<br><br>- [Scale down your App Service plans](../manage-scale-up.md)<br>- [App Service Environment post-migration scaling guidance](migrate.md#pricing)<br><br>Explore reserved instance pricing, savings plans, and check out the pricing estimates if needed.<br><br>- [App Service pricing page](https://azure.microsoft.com/pricing/details/app-service/windows/)<br>- [How reservation discounts apply to Isolated v2 instances](../../cost-management-billing/reservations/reservation-discount-app-service.md#how-reservation-discounts-apply-to-isolated-v2-instances)<br>- [Azure pricing calculator](https://azure.microsoft.com/pricing/calculator)|
2828
|**5**|**Learn more**|On-demand: [Learn Live webinar with Azure FastTrack Architects](https://www.youtube.com/watch?v=lI9TK_v-dkg&ab_channel=MicrosoftDeveloper).<br><br>Need more help? [Submit a request](https://cxp.azure.com/nominationportal/nominationform/fasttrack) to contact FastTrack.<br><br>[Frequently asked questions](migrate.md#frequently-asked-questions)<br><br>[Community support](https://aka.ms/asev1v2retirement)|
2929

articles/application-gateway/ipv6-application-gateway-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Learn how to configure Application Gateway with a frontend public I
55
services: application-gateway
66
author: greg-lindsay
77
ms.topic: how-to
8-
ms.date: 03/17/2024
8+
ms.date: 04/04/2024
99
ms.author: greglin
1010
ms.service: application-gateway
1111
ms.custom: mvc, mode-ui

0 commit comments

Comments
 (0)