Skip to content

Commit baba818

Browse files
authored
Merge pull request #265141 from MicrosoftDocs/main
2/2/2024 PM Publish
2 parents 59bda23 + 87c728e commit baba818

File tree

122 files changed

+1295
-611
lines changed

Some content is hidden

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

122 files changed

+1295
-611
lines changed

.openpublishing.redirection.azure-monitor.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2287,17 +2287,17 @@
22872287
},
22882288
{
22892289
"source_path_from_root": "/articles/azure-monitor/insights/solutions-inventory.md",
2290-
"redirect_url": "/azure/azure-monitor/monitor-reference",
2290+
"redirect_url": "/azure/azure-monitor/overview",
22912291
"redirect_document_id": false
22922292
},
22932293
{
22942294
"source_path_from_root": "/articles/monitoring/monitoring-solutions-inventory.md",
2295-
"redirect_url": "/azure/azure-monitor/monitor-reference",
2295+
"redirect_url": "/azure/azure-monitor/overview",
22962296
"redirect_document_id": false
22972297
},
22982298
{
22992299
"source_path_from_root": "/articles/azure-monitor/platform/data-locations.md",
2300-
"redirect_url": "/azure/azure-monitor/monitor-reference/",
2300+
"redirect_url": "/azure/azure-monitor/overview/",
23012301
"redirect_document_id": false
23022302
},
23032303
{
@@ -6598,6 +6598,11 @@
65986598
"source_path_from_root": "/articles/azure-monitor/app/java-standalone-arguments.md",
65996599
"redirect_url": "/azure/azure-monitor/app/java-get-started-supplemental",
66006600
"redirect_document_id": true
6601+
},
6602+
{
6603+
"source_path_from_root": "/articles/azure-monitor/monitor-reference.md",
6604+
"redirect_url": "/azure/azure-monitor/overview",
6605+
"redirect_document_id": false
66016606
}
66026607
]
66036608
}

articles/ai-services/.openpublishing.redirection.cognitive-services.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5125,7 +5125,7 @@
51255125
},
51265126
{
51275127
"source_path_from_root": "/articles/cognitive-services/text-analytics/migration-guide.md",
5128-
"redirect_url": "/azure/ai-services/language-service/concepts/migrate-from-text-analytics-v2",
5128+
"redirect_url": "/azure/ai-services/language-service/concepts/migrate",
51295129
"redirect_document_id": false
51305130
},
51315131
{

articles/aks/egress-outboundtype.md

Lines changed: 4 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.subservice: aks-networking
66
ms.custom: devx-track-azurecli
77
ms.author: allensu
88
ms.topic: how-to
9-
ms.date: 11/06/2023
9+
ms.date: 02/02/2024
1010
#Customer intent: As a cluster operator, I want to define my own egress paths with user-defined routes. Since I define this up front I do not want AKS provided load balancer configurations.
1111
---
1212

@@ -99,41 +99,11 @@ Migration is only supported between `loadBalancer`, `managedNATGateway` (if usin
9999
100100
[!INCLUDE [preview features callout](includes/preview/preview-callout.md)]
101101

102-
### Install the `aks-preview` Azure CLI extension
103-
104-
`aks-preview` version 0.5.113 is required.
105-
106-
* Install and update the `aks-preview` extension.
107-
108-
```azurecli
109-
# Install aks-preview extension
110-
az extension add --name aks-preview
111-
# Update aks-preview extension
112-
az extension update --name aks-preview
113-
```
114-
115-
### Register the `AKS-OutBoundTypeMigrationPreview` feature flag
116-
117-
1. Register the `AKS-OutBoundTypeMigrationPreview` feature flag using the [`az feature register`][az-feature-register] command. It takes a few minutes for the status to show *Registered*.
118-
119-
```azurecli-interactive
120-
az feature register --namespace "Microsoft.ContainerService" --name "AKS-OutBoundTypeMigrationPreview"
121-
```
122-
123-
2. Verify the registration status using the [`az feature show`][az-feature-show] command.
124-
125-
```azurecli-interactive
126-
az feature show --namespace "Microsoft.ContainerService" --name "AKS-OutBoundTypeMigrationPreview"
127-
```
128-
129-
3. When the status reflects *Registered*, refresh the registration of the *Microsoft.ContainerService* resource provider using the [`az provider register`][az-provider-register] command.
130-
131-
```azurecli-interactive
132-
az provider register --namespace Microsoft.ContainerService
133-
```
134-
135102
### Update cluster to use a new outbound type
136103

104+
> [!NOTE]
105+
> You must use a version >= 2.56 of Azure CLI to migrate outbound type. Use `az upgrade` to update to the latest version of Azure CLI.
106+
137107
* Update the outbound configuration of your cluster using the [`az aks update`][az-aks-update] command.
138108

139109
### Update cluster from loadbalancer to managedNATGateway

articles/app-service/deploy-azure-pipelines.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ To get started:
105105
106106
* **azureSubscription**: Name of the authorized service connection to your Azure subscription.
107107
* **appName**: Name of your existing app.
108-
* **package**: Fike path to the package or a folder containing your app service contents. Wildcards are supported.
108+
* **package**: File path to the package or a folder containing your app service contents. Wildcards are supported.
109109
110110
# [Classic](#tab/classic/)
111111

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

Lines changed: 91 additions & 74 deletions
Large diffs are not rendered by default.

articles/app-service/environment/migrate.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ The following are limitations when using the migration feature:
4646

4747
- Your new App Service Environment v3 is in the existing subnet that was used for your old environment.
4848
- You can't change the region your App Service Environment is located in.
49-
- ELB App Service Environment cant be migrated to ILB App Service Environment v3 and vice versa.
49+
- ELB App Service Environment can't be migrated to ILB App Service Environment v3 and vice versa.
5050
- If your existing App Service Environment uses a custom domain suffix, you have to configure custom domain suffix for your App Service Environment v3 during the migration process.
5151
- If you no longer want to use a custom domain suffix, you can remove it once the migration is complete.
5252

@@ -139,7 +139,7 @@ Migration requires a three to six hour service window for App Service Environmen
139139
- The existing App Service Environment is shut down and replaced by the new App Service Environment v3.
140140
- All App Service plans in the App Service Environment are converted from the Isolated to Isolated v2 SKU.
141141
- All of the apps that are on your App Service Environment are temporarily down. **You should expect about one hour of downtime during this period**.
142-
- If you can't support downtime, see [migration-alternatives](migration-alternatives.md#guidance-for-manual-migration).
142+
- If you can't support downtime, see [migration-alternatives](migration-alternatives.md#migrate-manually).
143143
- The public addresses that are used by the App Service Environment change to the IPs generated during the IP generation step.
144144

145145
The following statuses are available during the migration process:

0 commit comments

Comments
 (0)