Skip to content

Commit f859217

Browse files
dominicbettsdominicbetts
committed
Merge branch 'main' into release-aio-ga-fix-release
2 parents 0dac597 + e57e5b1 commit f859217

File tree

34 files changed

+111
-37
lines changed

34 files changed

+111
-37
lines changed

‎articles/api-management/api-management-howto-disaster-recovery-backup-restore.md

Lines changed: 62 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: dlepow
77

88
ms.service: azure-api-management
99
ms.topic: how-to
10-
ms.date: 01/31/2023
10+
ms.date: 09/06/2024
1111
ms.author: danlep
1212
ms.custom: devx-track-azurepowershell
1313
---
@@ -129,6 +129,38 @@ Backup-AzApiManagement -ResourceGroupName $apiManagementResourceGroup -Name $api
129129

130130
Backup is a long-running operation that may take several minutes to complete. During this time the API gateway continues to handle requests, but the state of the service is Updating.
131131

132+
### [CLI](#tab/cli)
133+
134+
[Sign in](/cli/azure/authenticate-azure-cli) with Azure CLI.
135+
136+
In the following examples:
137+
138+
* An API Management instance named *myapim* is in resource group *apimresourcegroup*.
139+
* A storage account named *backupstorageaccount* is in resource group *storageresourcegroup*. The storage account has a container named *backups*.
140+
* A backup blob will be created with name *ContosoBackup.apimbackup*.
141+
142+
Set variables in Bash:
143+
144+
```azurecli-interactive
145+
apiManagementName="myapim";
146+
apiManagementResourceGroup="apimresourcegroup";
147+
storageAccountName="backupstorageaccount";
148+
storageResourceGroup="storageresourcegroup";
149+
containerName="backups";
150+
backupName="ContosoBackup.apimbackup";
151+
```
152+
153+
### Access using storage access key
154+
155+
```azurecli-interactive
156+
storageKey=$(az storage account keys list --resource-group $storageResourceGroup --account-name $storageAccountName --query [0].value --output tsv)
157+
158+
az apim backup --resource-group $apiManagementResourceGroup --name $apiManagementName \
159+
--storage-account-name $storageAccountName --storage-account-key $storageKey --storage-account-container $containerName --backup-name $backupName
160+
```
161+
162+
Backup is a long-running operation that may take several minutes to complete. During this time the API gateway continues to handle requests, but the state of the service is Updating.
163+
132164
### [REST](#tab/rest)
133165

134166
See [Azure REST API reference](/rest/api/azure/) for information about authenticating and calling Azure REST APIs.
@@ -261,6 +293,35 @@ Restore-AzApiManagement -ResourceGroupName $apiManagementResourceGroup -Name $ap
261293

262294
Restore is a long-running operation that may take up to 45 minutes or more to complete.
263295

296+
### [CLI](#tab/cli)
297+
298+
In the following examples,
299+
300+
* An API Management instance named *myapim* is restored from the backup blob named *ContosoBackup.apimbackup* in storage account *backupstorageaccount*.
301+
* The backup blob is in a container named *backups*.
302+
303+
Set variables in Bash:
304+
305+
```azurecli-interactive
306+
apiManagementName="myapim";
307+
apiManagementResourceGroup="apimresourcegroup";
308+
storageAccountName="backupstorageaccount";
309+
storageResourceGroup="storageresourcegroup";
310+
containerName="backups";
311+
backupName="ContosoBackup.apimbackup"
312+
```
313+
314+
### Access using storage access key
315+
316+
```azurecli-interactive
317+
storageKey=$(az storage account keys list --resource-group $storageResourceGroup --account-name $storageAccountName --query [0].value --output tsv)
318+
319+
az apim restore --resource-group $apiManagementResourceGroup --name $apiManagementName \
320+
--storage-account-name $storageAccountName --storage-account-key $storageKey --storage-account-container $containerName --backup-name $backupName
321+
```
322+
323+
Restore is a long-running operation that may take up to 45 minutes or more to complete.
324+
264325
### [REST](#tab/rest)
265326

266327
To restore an API Management service from a previously created backup, make the following HTTP request:

‎articles/backup/blob-backup-support-matrix.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Support matrix for Azure Blobs backup
33
description: Provides a summary of support settings and limitations when backing up Azure Blobs.
44
ms.topic: reference
5-
ms.date: 09/11/2024
5+
ms.date: 11/11/2024
66
ms.custom: references_regions, engagement-fy24
77
ms.service: azure-backup
88
author: AbhishekMallick-MS
@@ -41,6 +41,7 @@ Operational backup of blobs uses blob point-in-time restore, blob versioning, so
4141
- Operational backup supports block blobs in standard general-purpose v2 storage accounts only. Storage accounts with hierarchical namespace enabled (that is, ADLS Gen2 accounts) aren't supported. <br><br> Also, any page blobs, append blobs, and premium blobs in your storage account won't be restored and only block blobs will be restored.
4242

4343
- Blob backup is also supported when the storage account has private endpoints.
44+
- The backup operation isn't supported for blobs that are uploaded by using [Data Lake Storage APIs](/rest/api/storageservices/data-lake-storage-gen2).
4445

4546
**Other limitations**:
4647

‎articles/cdn/cdn-app-dev-net.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,8 +347,6 @@ We can then confirm the prompts to run the rest of the program.
347347

348348
## Next Steps
349349

350-
To see the completed project from this walkthrough, [download the sample](https://code.msdn.microsoft.com/Azure-CDN-Management-1f2fba2c).
351-
352350
To find more documentation on the Azure CDN Management Library for .NET, view the [reference on MSDN](/dotnet/api/overview/azure/cdn).
353351

354352
Manage your CDN resources with [PowerShell](cdn-manage-powershell.md).

‎articles/frontdoor/front-door-cdn-comparison.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ The following table provides a comparison between Azure Front Door and Azure CDN
8080
| Azure Policy integration | &check; | &check; | &check; | | | |
8181
| Azure Advisory integration | &check; | &check; | | &check; | &check; | &check; |
8282
| Managed Identities with Azure Key Vault | &check; | &check; | | &check; | | |
83-
| **Pricing** | | | | | | |
83+
| **Pricing** | [Azure Front Door pricing](https://azure.microsoft.com/pricing/details/frontdoor/) | | | [Azure CDN pricing](https://azure.microsoft.com/pricing/details/cdn/) | | |
8484
| Simplified pricing | &check; | &check; | | &check; | &check; | &check; |
8585

8686
## Services on retirement path

‎articles/networking/azure-network-latency.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Use the following tabs to view latency statistics for each region.
8787
| North Europe | 156 | 152 |
8888
| Norway East | 172 | 171 |
8989
| Norway West | 167 | 167 |
90-
| Poland North | 175 | 177 |
90+
| Poland Central | 175 | 177 |
9191
| Qatar Central | 264 | 254 |
9292
| South Africa North | 294 | 291 |
9393
| South Africa West | 278 | 275 |
@@ -139,7 +139,7 @@ Use the following tabs to view latency statistics for each region.
139139
| North Europe | 112 | 104 | 122 | 132 |
140140
| Norway East | 136 | 127 | 136 | 150 |
141141
| Norway West | 129 | 118 | 133 | 145 |
142-
| Poland North | 141 | 129 | 141 | 155 |
142+
| Poland Central | 141 | 129 | 141 | 155 |
143143
| Qatar Central | 226 | 214 | 224 | 240 |
144144
| South Africa North | 257 | 245 | 255 | 271 |
145145
| South Africa West | 241 | 228 | 239 | 255 |
@@ -190,7 +190,7 @@ Use the following tabs to view latency statistics for each region.
190190
| North Europe | 88 | 95 |
191191
| Norway East | 108 | 110 |
192192
| Norway West | 102 | 103 |
193-
| Poland North | 113 | 112 |
193+
| Poland Central | 113 | 112 |
194194
| Qatar Central | 196 | 199 |
195195
| South Africa North | 227 | 230 |
196196
| South Africa West | 210 | 214 |
@@ -240,7 +240,7 @@ Use the following tabs to view latency statistics for each region.
240240
| North Europe | 187 | 99 | 106 |
241241
| Norway East | 211 | 114 | 124 |
242242
| Norway West | 199 | 110 | 115 |
243-
| Poland North | 210 | 123 | 129 |
243+
| Poland Central | 210 | 123 | 129 |
244244
| Qatar Central | 296 | 208 | 213 |
245245
| South Africa North | 326 | 239 | 244 |
246246
| South Africa West | 311 | 223 | 228 |
@@ -291,7 +291,7 @@ Use the following tabs to view latency statistics for each region.
291291
| North Europe | 296 | 283 | 290 | 281 |
292292
| Norway East | 309 | 300 | 303 | 290 |
293293
| Norway West | 305 | 294 | 307 | 286 |
294-
| Poland North | 306 | 297 | 303 | 286 |
294+
| Poland Central | 306 | 297 | 303 | 286 |
295295
| Qatar Central | 184 | 182 | 182 | 170 |
296296
| South Africa North | 280 | 278 | 279 | 266 |
297297
| South Africa West | 295 | 294 | 295 | 282 |
@@ -342,7 +342,7 @@ Use the following tabs to view latency statistics for each region.
342342
| North Europe | 252 | 257 |
343343
| Norway East | 272 | 276 |
344344
| Norway West | 264 | 269 |
345-
| Poland North | 277 | 279 |
345+
| Poland Central | 277 | 279 |
346346
| Qatar Central | 155 | 161 |
347347
| South Africa North | 252 | 259 |
348348
| South Africa West | 268 | 274 |
@@ -392,7 +392,7 @@ Use the following tabs to view latency statistics for each region.
392392
| North Europe | 19 | 28 | 41 | 19 |
393393
| Norway East | 32 | 41 | 39 | 25 |
394394
| Norway West | 25 | 35 | 39 | 18 |
395-
| Poland North | 28 | 35 | 34 | 23 |
395+
| Poland Central | 28 | 35 | 34 | 23 |
396396
| Qatar Central | 124 | 114 | 126 | 132 |
397397
| South Africa North | 156 | 154 | 167 | 163 |
398398
| South Africa West | 141 | 138 | 152 | 147 |
@@ -415,7 +415,7 @@ Use the following tabs to view latency statistics for each region.
415415

416416
#### [Central Europe](#tab/CentralEurope/Europe)
417417

418-
| Source | Germany North | Germany West Central | Poland North | Switzerland North | Switzerland West |
418+
| Source | Germany North | Germany West Central | Poland Central | Switzerland North | Switzerland West |
419419
|---------------------|---------------|----------------------|--------------|-------------------|------------------|
420420
| Australia Central | 296 | 292 | 305 | 284 | 284 |
421421
| Australia Central 2 | 288 | 284 | 297 | 278 | 279 |
@@ -443,7 +443,7 @@ Use the following tabs to view latency statistics for each region.
443443
| North Europe | 33 | 28 | 39 | 33 | 27 |
444444
| Norway East | 23 | 27 | 31 | 30 | 33 |
445445
| Norway West | 27 | 27 | 35 | 30 | 33 |
446-
| Poland North | 13 | 22 | | 25 | 27 |
446+
| Poland Central | 13 | 22 | | 25 | 27 |
447447
| Qatar Central | 136 | 131 | 145 | 125 | 122 |
448448
| South Africa North | 170 | 164 | 179 | 165 | 161 |
449449
| South Africa West | 154 | 151 | 163 | 148 | 145 |
@@ -494,7 +494,7 @@ Use the following tabs to view latency statistics for each region.
494494
| North Europe | 39 | 34 | 43 |
495495
| Norway East | | 10 | 11 |
496496
| Norway West | 11 | | 17 |
497-
| Poland North | 29 | 34 | 26 |
497+
| Poland Central | 29 | 34 | 26 |
498498
| Qatar Central | 149 | 144 | 153 |
499499
| South Africa North | 183 | 176 | 186 |
500500
| South Africa West | 167 | 160 | 170 |
@@ -544,7 +544,7 @@ Use the following tabs to view latency statistics for each region.
544544
| North Europe | | 13 | 16 |
545545
| Norway East | 40 | 30 | 34 |
546546
| Norway West | 35 | 25 | 27 |
547-
| Poland North | 41 | 31 | 35 |
547+
| Poland Central | 41 | 31 | 35 |
548548
| Qatar Central | 140 | 130 | 133 |
549549
| South Africa North | 172 | 162 | 165 |
550550
| South Africa West | 158 | 147 | 151 |
@@ -597,7 +597,7 @@ Use the following tabs to view latency statistics for each region.
597597
| North Europe | 261 | 254 |
598598
| Norway East | 271 | 265 |
599599
| Norway West | 267 | 260 |
600-
| Poland North | 267 | 261 |
600+
| Poland Central | 267 | 261 |
601601
| Qatar Central | 152 | 145 |
602602
| South Africa North | 250 | 241 |
603603
| South Africa West | 265 | 257 |
@@ -648,7 +648,7 @@ Use the following tabs to view latency statistics for each region.
648648
| North Europe | 146 | 160 | 164 |
649649
| Norway East | 154 | 170 | 176 |
650650
| Norway West | 148 | 162 | 172 |
651-
| Poland North | 151 | 165 | 173 |
651+
| Poland Central | 151 | 165 | 173 |
652652
| Qatar Central | 41 | 55 | 65 |
653653
| South Africa North | 138 | 153 | 158 |
654654
| South Africa West | 153 | 168 | 174 |
@@ -702,7 +702,7 @@ Use the following tabs to view latency statistics for each region.
702702
| North Europe | 229 | 198 |
703703
| Norway East | 240 | 208 |
704704
| Norway West | 236 | 204 |
705-
| Poland North | 237 | 205 |
705+
| Poland Central | 237 | 205 |
706706
| Qatar Central | 121 | 90 |
707707
| South Africa North | 218 | 188 |
708708
| South Africa West | 233 | 203 |
@@ -752,7 +752,7 @@ Use the following tabs to view latency statistics for each region.
752752
| North Europe | 70 | 139 | 127 | 129 |
753753
| Norway East | 83 | 150 | 138 | 140 |
754754
| Norway West | 81 | 146 | 134 | 136 |
755-
| Poland North | 69 | 146 | 134 | 136 |
755+
| Poland Central | 69 | 146 | 134 | 136 |
756756
| Qatar Central | 153 | | 16 | 17 |
757757
| South Africa North | 195 | 117 | 105 | 102 |
758758
| South Africa West | 183 | 132 | 121 | 118 |
@@ -803,7 +803,7 @@ Use the following tabs to view latency statistics for each region.
803803
| North Europe | 172 | 155 |
804804
| Norway East | 184 | 167 |
805805
| Norway West | 177 | 160 |
806-
| Poland North | 180 | 163 |
806+
| Poland Central | 180 | 163 |
807807
| Qatar Central | 118 | 131 |
808808
| South Africa North | | 20 |
809809
| South Africa West | 21 | |

‎articles/openshift/howto-infrastructure-nodes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ spec:
142142
userDataSecret:
143143
name: worker-user-data
144144
vmSize: <Standard_E4s_v5, Standard_E8s_v5, Standard_E16s_v5>
145-
vnet: aro-vnet
145+
vnet: <VNET_NAME>
146146
zone: <ZONE>
147147
taints:
148148
- key: node-role.kubernetes.io/infra

‎articles/reliability/migrate-sql-database.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,13 +215,13 @@ To disable zone-redundancy for a single database or an elastic pool, you can use
215215
# [PowerShell](#tab/powershell)
216216

217217
```powershell
218-
set-azsqlDatabase -ResourceGroupName "<Resource-Group-Name>" -DatabaseName "<Database-Name>" -ServerName "<Server-Name>" -ZoneRedundant:$false
218+
set-azsqlDatabase -ResourceGroupName "<Resource-Group-Name>" -DatabaseName "<Server-Name>" -ServerName "<Server-Name>" -ZoneRedundant:$false
219219
```
220220

221221
# [CLI](#tab/cli)
222222

223223
```azurecli
224-
az sql db update --resource-group "RSETLEM-AzureSQLDB" --server "rs-az-testserver1" --name "TestDB1" --zone-redundant false
224+
az sql db update --resource-group "<Resource-Group-Name>" --server "<Server-Name>" --name "<Server-Name>" --zone-redundant false
225225
```
226226

227227
# [ARM](#tab/arm)
@@ -251,7 +251,7 @@ Set-AzSqlElasticpool -ResourceGroupName "<Resource-Group-Name>" -ServerName "<S
251251
# [CLI](#tab/cli)
252252

253253
```azurecli
254-
az sql elastic-pool update --resource-group "RSETLEM-AzureSQLDB" --server "rs-az-testserver1" --name "testep10" --zone-redundant false
254+
az sql elastic-pool update --resource-group "<Resource-Group-Name>" --server "<Server-Name>" --name "<Server-Name>" --zone-redundant false
255255
```
256256

257257

‎articles/resource-mover/media/move-region-within-resource-group/select-move-region.png

-8.22 KB
Loading

‎articles/resource-mover/media/remove-move-resources/remove-portal.png

450 Bytes
Loading

‎articles/resource-mover/media/tutorial-move-region-encrypted-virtual-machines/key-vault-access-policies.png

-4.43 KB
Loading

0 commit comments

Comments
 (0)