Skip to content

Commit 65bb4e4

Browse files
TimShererWithAquentTimShererWithAquent
authored
Merge pull request #290260 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents b11b806 + 088f4a0 commit 65bb4e4

File tree

5 files changed

+89
-18
lines changed

5 files changed

+89
-18
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/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/sentinel/threat-intelligence-integration.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,11 @@ To connect to TIP feeds, see [Connect threat intelligence platforms to Microsoft
117117

118118
- EclecticIQ Platform integrates with Microsoft Sentinel to enhance threat detection, hunting, and response. Learn more about the [benefits and use cases](https://www.eclecticiq.com/resources/microsoft-sentinel-and-eclecticiq-intelligence-center) of this two-way integration.
119119

120+
### Filigran OpenCTI
121+
122+
- [Filigran OpenCTI](https://filigran.io/solutions/open-cti/) can send threat intelligence to Microsoft Sentinel via either a [dedicated connector](https://filigran.notion.site/Microsoft-Sentinel-Intel-11c8fce17f2a80209a60e8914e6d1009) which runs in realtime, or by acting as a TAXII 2.1 server that Sentinel will poll regularly. It can also receive structured incidents from Sentinel via the [Microsoft Sentinel Incident connector](https://filigran.notion.site/Microsoft-Sentinel-Incidents-11c8fce17f2a80f1b461c6379265d5d3).
123+
124+
120125
### GroupIB Threat Intelligence and Attribution
121126

122127
- To connect [GroupIB Threat Intelligence and Attribution](https://www.group-ib.com/products/threat-intelligence/) to Microsoft Sentinel, GroupIB makes use of Logic Apps. See the [specialized instructions](https://techcommunity.microsoft.com/t5/azure-sentinel/group-ib-threat-intelligence-and-attribution-connector-azure/ba-p/2252904) that are necessary to take full advantage of the complete offering.

‎articles/virtual-network-manager/faq.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,11 @@ No. Azure Virtual Network Manager doesn't store any customer data.
9595

9696
No. Azure Virtual Network Manager doesn't currently support that capability. If you need to move an instance, you can consider deleting it and using the Azure Resource Manager template to create another one in another location.
9797

98+
### Can I move a subscription with an Azure Virtual Network Manager to another tenant?
99+
Yes, but there are some considerations to keep in mind:
100+
- The target tenant cannot have an Azure Virtual Network Manager created.
101+
- The spokes virtual networks in the network group may lose their reference when changing tenants, thus losing connectivity to the hub vnet. To resolve this, after moving the subscription to another tenant, you must manually add the spokes vnets to the network group of Azure Virtual Network Manager.
102+
98103
### How can I see what configurations are applied to help me troubleshoot?
99104

100105
You can view Azure Virtual Network Manager settings under **Network Manager** for a virtual network. The settings show both connectivity and security admin configurations that are applied. For more information, see [View configurations applied by Azure Virtual Network Manager](how-to-view-applied-configurations.md).

0 commit comments

Comments
 (0)