Skip to content

Commit 05850e8

Browse files
authored
Merge pull request #289837 from MicrosoftDocs/main
11/4/2024 PM Publish
2 parents 8737e03 + 3ce5d70 commit 05850e8

File tree

810 files changed

+3275
-4211
lines changed

Some content is hidden

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

810 files changed

+3275
-4211
lines changed

.openpublishing.redirection.json

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,105 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/lab-services/class-type-adobe-creative-cloud.md",
5+
"redirect_url": "/previous-versions/azure/lab-services/class-type-adobe-creative-cloud",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/lab-services/class-type-arcgis.md",
10+
"redirect_url": "/previous-versions/azure/lab-services/class-type-arcgis",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/lab-services/class-type-autodesk.md",
15+
"redirect_url": "/previous-versions/azure/lab-services/class-type-autodesk",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "articles/lab-services/class-type-big-data-analytics.md",
20+
"redirect_url": "/previous-versions/azure/lab-services/class-type-big-data-analytics",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "articles/lab-services/class-type-database-management.md",
25+
"redirect_url": "/previous-versions/azure/lab-services/class-type-database-management",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "articles/lab-services/class-type-deep-learning-natural-language-processing.md",
30+
"redirect_url": "/previous-versions/azure/lab-services/class-type-deep-learning-natural-language-processing",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path": "articles/lab-services/class-type-ethical-hacking.md",
35+
"redirect_url": "/previous-versions/azure/lab-services/class-type-ethical-hacking",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path": "articles/lab-services/class-type-matlab.md",
40+
"redirect_url": "/previous-versions/azure/lab-services/class-type-matlab",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path": "articles/lab-services/class-type-jupyter-notebook.md",
45+
"redirect_url": "/previous-versions/azure/lab-services/class-type-jupyter-notebook",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path": "articles/lab-services/class-type-networking-gns3.md",
50+
"redirect_url": "/previous-versions/azure/lab-services/class-type-networking-gns3",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path": "articles/lab-services/class-type-pltw.md",
55+
"redirect_url": "/previous-versions/azure/lab-services/class-type-pltw",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path": "articles/lab-services/class-type-react-linux.md",
60+
"redirect_url": "/previous-versions/azure/lab-services/class-type-react-linux",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path": "articles/lab-services/class-type-react-windows.md",
65+
"redirect_url": "/previous-versions/azure/lab-services/class-type-react-windows",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path": "articles/lab-services/class-type-rstudio-linux.md",
70+
"redirect_url": "/previous-versions/azure/lab-services/class-type-rstudio-linux",
71+
"redirect_document_id": false
72+
},
73+
{
74+
"source_path": "articles/lab-services/class-type-rstudio-windows.md",
75+
"redirect_url": "/previous-versions/azure/lab-services/class-type-rstudio-windows",
76+
"redirect_document_id": false
77+
},
78+
{
79+
"source_path": "articles/lab-services/class-type-shell-scripting-linux.md",
80+
"redirect_url": "/previous-versions/azure/lab-services/class-type-shell-scripting-linux",
81+
"redirect_document_id": false
82+
},
83+
{
84+
"source_path": "articles/lab-services/class-type-solidworks.md",
85+
"redirect_url": "/previous-versions/azure/lab-services/class-type-solidworks",
86+
"redirect_document_id": false
87+
},
88+
{
89+
"source_path": "articles/lab-services/class-type-sql-server.md",
90+
"redirect_url": "/previous-versions/azure/lab-services/class-type-sql-server",
91+
"redirect_document_id": false
92+
},
93+
{
94+
"source_path": "articles/lab-services/class-types.md",
95+
"redirect_url": "/previous-versions/azure/lab-services/class-types",
96+
"redirect_document_id": false
97+
},
98+
{
99+
"source_path": "articles/lab-services/how-to-create-lab-accounts.md",
100+
"redirect_url": "/previous-versions/azure/lab-services/how-to-create-lab-accounts",
101+
"redirect_document_id": false
102+
},
3103
{
4104
"source_path": "articles/devtest-labs/devtest-lab-integrate-ci-cd.md",
5105
"redirect_url": "/previous-versions/azure/devtest-labs/devtest-lab-integrate-ci-cd",
@@ -3330,6 +3430,11 @@
33303430
"redirect_url": "/azure/vpn-gateway/add-remove-site-to-site-connections",
33313431
"redirect_document_id": false
33323432
},
3433+
{
3434+
"source_path_from_root": "/articles/vpn-gateway/vpn-gateway-howto-point-to-site-resource-manager-portal.md",
3435+
"redirect_url": "/azure/vpn-gateway/point-to-site-certificate-gateway",
3436+
"redirect_document_id": false
3437+
},
33333438
{
33343439
"source_path_from_root": "/articles/vpn-gateway/vpn-gateway-howto-openvpn-clients.md",
33353440
"redirect_url": "/azure/vpn-gateway/point-to-site-vpn-client-cert-windows",

articles/app-service/configure-gateway-required-vnet-integration.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ You can't use gateway-required virtual network integration:
3535

3636
To create a gateway:
3737

38-
1. [Create the VPN gateway and subnet](../vpn-gateway/vpn-gateway-howto-point-to-site-resource-manager-portal.md#creategw). Select a route-based VPN type.
38+
1. [Create the VPN gateway and subnet](../vpn-gateway/point-to-site-certificate-gateway.md#creategw). Select a route-based VPN type.
3939

40-
1. [Set the point-to-site addresses](../vpn-gateway/vpn-gateway-howto-point-to-site-resource-manager-portal.md#addresspool). If the gateway isn't in the basic SKU, then IKEV2 must be disabled in the point-to-site configuration and SSTP must be selected. The point-to-site address space must be in the RFC 1918 address blocks 10.0.0.0/8, 172.16.0.0/12, and 192.168.0.0/16.
40+
1. [Set the point-to-site addresses](../vpn-gateway/point-to-site-certificate-gateway.md#addresspool). If the gateway isn't in the basic SKU, then IKEV2 must be disabled in the point-to-site configuration and SSTP must be selected. The point-to-site address space must be in the RFC 1918 address blocks 10.0.0.0/8, 172.16.0.0/12, and 192.168.0.0/16.
4141

4242
If you create the gateway for use with gateway-required virtual network integration, you don't need to upload a certificate. Creating the gateway can take 30 minutes. You won't be able to integrate your app with your virtual network until the gateway is created.
4343

articles/azure-government/azure-secure-isolation-guidance.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ TLS provides strong authentication, message privacy, and integrity. [Perfect For
576576
**In-transit encryption for VMs** – Remote sessions to Windows and Linux VMs deployed in Azure can be conducted over protocols that ensure data encryption in transit. For example, the [Remote Desktop Protocol (RDP)](/windows/win32/termserv/remote-desktop-protocol) initiated from your client computer to Windows and Linux VMs enables TLS protection for data in transit. You can also use [Secure Shell](/azure/virtual-machines/linux/ssh-from-windows) (SSH) to connect to Linux VMs running in Azure. SSH is an encrypted connection protocol available by default for remote management of Linux VMs hosted in Azure.
577577

578578
> [!IMPORTANT]
579-
> You should review best practices for network security, including guidance for **[disabling RDP/SSH access to Virtual Machines](../security/fundamentals/network-best-practices.md#disable-rdpssh-access-to-virtual-machines)** from the Internet to mitigate brute force attacks to gain access to Azure Virtual Machines. Accessing VMs for remote management can then be accomplished via **[point-to-site VPN](../vpn-gateway/vpn-gateway-howto-point-to-site-resource-manager-portal.md)**, **[site-to-site VPN](../vpn-gateway/tutorial-site-to-site-portal.md)**, or **[Azure ExpressRoute](../expressroute/expressroute-howto-linkvnet-portal-resource-manager.md)**.
579+
> You should review best practices for network security, including guidance for **[disabling RDP/SSH access to Virtual Machines](../security/fundamentals/network-best-practices.md#disable-rdpssh-access-to-virtual-machines)** from the Internet to mitigate brute force attacks to gain access to Azure Virtual Machines. Accessing VMs for remote management can then be accomplished via **[point-to-site VPN](../vpn-gateway/point-to-site-about.md)**, **[site-to-site VPN](../vpn-gateway/tutorial-site-to-site-portal.md)**, or **[Azure ExpressRoute](../expressroute/expressroute-howto-linkvnet-portal-resource-manager.md)**.
580580
581581
**Azure Storage transactions** – When interacting with Azure Storage through the Azure portal, all transactions take place over HTTPS. Moreover, you can configure your storage accounts to accept requests only from secure connections by setting the “[secure transfer required](../storage/common/storage-require-secure-transfer.md)” property for the storage account. The “secure transfer required” option is enabled by default when creating a Storage account in the Azure portal.
582582

@@ -586,7 +586,7 @@ TLS provides strong authentication, message privacy, and integrity. [Perfect For
586586
**VPN encryption**[Virtual Network](../virtual-network/virtual-networks-overview.md) (VNet) provides a means for Azure Virtual Machines (VMs) to act as part of your internal (on-premises) network. With VNet, you choose the address ranges of non-globally-routable IP addresses to be assigned to the VMs so that they won't collide with addresses you're using elsewhere. You have options to securely connect to a VNet from your on-premises infrastructure or remote locations.
587587

588588
- **Site-to-Site** (IPsec/IKE VPN tunnel) – A cryptographically protected “tunnel” is established between Azure and your internal network, allowing an Azure VM to connect to your back-end resources as though it was directly on that network. This type of connection requires a [VPN device](../vpn-gateway/vpn-gateway-vpn-faq.md#s2s) located on-premises that has an externally facing public IP address assigned to it. You can use Azure [VPN Gateway](../vpn-gateway/vpn-gateway-about-vpngateways.md) to send encrypted traffic between your VNet and your on-premises infrastructure across the public Internet, for example, a [site-to-site VPN](../vpn-gateway/tutorial-site-to-site-portal.md) relies on IPsec for transport encryption. VPN Gateway supports many encryption algorithms that are FIPS 140 validated. Moreover, you can configure VPN Gateway to use [custom IPsec/IKE policy](../vpn-gateway/vpn-gateway-about-compliance-crypto.md) with specific cryptographic algorithms and key strengths instead of relying on the default Azure policies. IPsec encrypts data at the IP level (Network Layer 3).
589-
- **Point-to-Site** (VPN over SSTP, OpenVPN, and IPsec) – A secure connection is established from your individual client computer to your VNet using Secure Socket Tunneling Protocol (SSTP), OpenVPN, or IPsec. As part of the [Point-to-Site VPN](../vpn-gateway/vpn-gateway-howto-point-to-site-resource-manager-portal.md) configuration, you need to install a certificate and a VPN client configuration package, which allow the client computer to connect to any VM within the VNet. [Point-to-Site VPN](../vpn-gateway/point-to-site-about.md) connections don't require a VPN device or a public facing IP address.
589+
- **Point-to-Site** (VPN over SSTP, OpenVPN, and IPsec) – A secure connection is established from your individual client computer to your VNet using Secure Socket Tunneling Protocol (SSTP), OpenVPN, or IPsec. As part of the [Point-to-Site VPN](../vpn-gateway/point-to-site-certificate-gateway.md) configuration, you need to install a certificate and a VPN client configuration package, which allow the client computer to connect to any VM within the VNet. [Point-to-Site VPN](../vpn-gateway/point-to-site-about.md) connections don't require a VPN device or a public facing IP address.
590590

591591
In addition to controlling the type of algorithm that is supported for VPN connections, Azure provides you with the ability to enforce that all traffic leaving a VNet may only be routed through a VNet Gateway (for example, Azure VPN Gateway). This enforcement allows you to ensure that traffic may not leave a VNet without being encrypted. A VPN Gateway can be used for [VNet-to-VNet](../vpn-gateway/vpn-gateway-howto-vnet-vnet-resource-manager-portal.md) connections while also providing a secure tunnel with IPsec/IKE. Azure VPN uses [Pre-Shared Key (PSK) authentication](../vpn-gateway/vpn-gateway-vpn-faq.md#how-is-my-vpn-tunnel-authenticated) whereby Microsoft generates the PSK when the VPN tunnel is created. You can change the autogenerated PSK to your own.
592592

articles/azure-resource-manager/bicep/bicep-functions-scope.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ It returns:
8181
"version": "1"
8282
},
8383
"displayName": "Example MG 1",
84-
"tenantId": "00000000-0000-0000-0000-000000000000"
84+
"tenantId": "aaaabbbb-0000-cccc-1111-dddd2222eeee"
8585
},
8686
"type": "/providers/Microsoft.Management/managementGroups"
8787
}
@@ -311,7 +311,7 @@ It returns:
311311
"countryCode": "US",
312312
"displayName": "Contoso",
313313
"id": "/tenants/00000000-0000-0000-0000-000000000000",
314-
"tenantId": "00000000-0000-0000-0000-000000000000"
314+
"tenantId": "aaaabbbb-0000-cccc-1111-dddd2222eeee"
315315
}
316316
}
317317
```

articles/azure-resource-manager/bicep/deploy-github-actions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ Create secrets for your Azure credentials, resource group, and subscriptions. Yo
122122
123123
1. Create another secret named `AZURE_RG`. Add the name of your resource group to the secret's value field (`exampleRG`).
124124
125-
1. Create another secret named `AZURE_SUBSCRIPTION`. Add your subscription ID to the secret's value field (example: `90fd3f9d-4c61-432d-99ba-1273f236afa2`).
125+
1. Create another secret named `AZURE_SUBSCRIPTION`. Add your subscription ID to the secret's value field (example: `aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e`).
126126
127127
# [Open ID Connect](#tab/openid)
128128

articles/azure-resource-manager/bicep/deployment-script-bicep.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ The output of the list command is similar to this example:
317317
},
318318
"environmentVariables": null,
319319
"forceUpdateTag": null,
320-
"id": "/subscriptions/01234567-89AB-CDEF-0123-456789ABCDEF/resourceGroups/dsDemo/providers/Microsoft.Resources/deploymentScripts/inlineCLI",
320+
"id": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/dsDemo/providers/Microsoft.Resources/deploymentScripts/inlineCLI",
321321
"identity": null,
322322
"kind": "AzureCLI",
323323
"location": "centralus",
@@ -331,12 +331,12 @@ The output of the list command is similar to this example:
331331
"retentionInterval": "1:00:00",
332332
"scriptContent": "echo \"The argument is John Dole.\"; jq -n -c --arg st \"Hello John Dole\" '{\"text\": $st}' > $AZ_SCRIPTS_OUTPUT_PATH",
333333
"status": {
334-
"containerInstanceId": "/subscriptions/01234567-89AB-CDEF-0123-456789ABCDEF/resourceGroups/dsDemo/providers/Microsoft.ContainerInstance/containerGroups/jgczqtxom5oreazscripts",
334+
"containerInstanceId": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/dsDemo/providers/Microsoft.ContainerInstance/containerGroups/jgczqtxom5oreazscripts",
335335
"endTime": "2023-12-11T20:20:12.149468+00:00",
336336
"error": null,
337337
"expirationTime": "2023-12-11T21:20:12.149468+00:00",
338338
"startTime": "2023-12-11T20:18:26.674492+00:00",
339-
"storageAccountId": "/subscriptions/01234567-89AB-CDEF-0123-456789ABCDEF/resourceGroups/dsDemo/providers/Microsoft.Storage/storageAccounts/jgczqtxom5oreazscripts"
339+
"storageAccountId": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/dsDemo/providers/Microsoft.Storage/storageAccounts/jgczqtxom5oreazscripts"
340340
},
341341
"storageAccountSettings": null,
342342
"supportingScriptUris": null,
@@ -367,10 +367,10 @@ The `Get-AzDeploymentScript` output is similar to this example:
367367

368368
```output
369369
Name : inlinePS
370-
Id : /subscriptions/01234567-89AB-CDEF-0123-456789ABCDEF/resourceGroups/dsDemo/providers/Microsoft.Resources/deploymentScripts/inlinePS
370+
Id : /subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/dsDemo/providers/Microsoft.Resources/deploymentScripts/inlinePS
371371
ResourceGroupName : dsDemo
372372
Location : centralus
373-
SubscriptionId : 01234567-89AB-CDEF-0123-456789ABCDEF
373+
SubscriptionId : aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e
374374
ProvisioningState : Succeeded
375375
Identity :
376376
ScriptKind : AzurePowerShell
@@ -379,8 +379,8 @@ StartTime : 12/11/2023 9:45:50 PM
379379
EndTime : 12/11/2023 9:46:59 PM
380380
ExpirationDate : 12/11/2023 10:46:59 PM
381381
CleanupPreference : OnExpiration
382-
StorageAccountId : /subscriptions/01234567-89AB-CDEF-0123-456789ABCDEF/resourceGroups/dsDemo/providers/Microsoft.Storage/storageAccounts/ee5o4rmoo6ilmazscripts
383-
ContainerInstanceId : /subscriptions/01234567-89AB-CDEF-0123-456789ABCDEF/resourceGroups/dsDemo/providers/Microsoft.ContainerInstance/containerGroups/ee5o4rmoo6ilmazscripts
382+
StorageAccountId : /subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/dsDemo/providers/Microsoft.Storage/storageAccounts/ee5o4rmoo6ilmazscripts
383+
ContainerInstanceId : /subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/dsDemo/providers/Microsoft.ContainerInstance/containerGroups/ee5o4rmoo6ilmazscripts
384384
Outputs :
385385
Key Value
386386
================== ==================
@@ -406,7 +406,7 @@ The following example uses [ARMClient](https://github.com/projectkudu/ARMClient)
406406

407407
```azurepowershell
408408
armclient login
409-
armclient get /subscriptions/01234567-89AB-CDEF-0123-456789ABCDEF/resourcegroups/myrg/providers/microsoft.resources/deploymentScripts/myDeployementScript?api-version=2020-10-01
409+
armclient get /subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourcegroups/myrg/providers/microsoft.resources/deploymentScripts/myDeployementScript?api-version=2020-10-01
410410
```
411411

412412
The output is similar to this example:
@@ -435,19 +435,19 @@ The output is similar to this example:
435435
"containerGroupName": null
436436
},
437437
"status": {
438-
"containerInstanceId": "/subscriptions/01234567-89AB-CDEF-0123-456789ABCDEF/resourceGroups/dsDemo/providers/Microsoft.ContainerInstance/containerGroups/jgczqtxom5oreazscripts",
438+
"containerInstanceId": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/dsDemo/providers/Microsoft.ContainerInstance/containerGroups/jgczqtxom5oreazscripts",
439439
"endTime": "2023-12-11T20:20:12.149468+00:00",
440440
"error": null,
441441
"expirationTime": "2023-12-11T21:20:12.149468+00:00",
442442
"startTime": "2023-12-11T20:18:26.674492+00:00",
443-
"storageAccountId": "/subscriptions/01234567-89AB-CDEF-0123-456789ABCDEF/resourceGroups/dsDemo/providers/Microsoft.Storage/storageAccounts/jgczqtxom5oreazscripts"
443+
"storageAccountId": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/dsDemo/providers/Microsoft.Storage/storageAccounts/jgczqtxom5oreazscripts"
444444
},
445445
"outputs": {
446446
"text": "Hello John Dole"
447447
},
448448
"cleanupPreference": "OnSuccess"
449449
},
450-
"id": "/subscriptions/01234567-89AB-CDEF-0123-456789ABCDEF/resourceGroups/dsDemo/providers/Microsoft.Resources/deploymentScripts/inlineCLI",
450+
"id": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/dsDemo/providers/Microsoft.Resources/deploymentScripts/inlineCLI",
451451
"type": "Microsoft.Resources/deploymentScripts",
452452
"name": "inlineCLI",
453453
}

articles/azure-resource-manager/bicep/deployment-script-develop.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ You can also specify `subnetId` values for running the deployment script in a pr
731731

732732
```bicep
733733
param containerGroupName string = 'mycustomaci'
734-
param subnetId string = '/subscriptions/01234567-89AB-CDEF-0123-456789ABCDEF/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet'
734+
param subnetId string = '/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet'
735735
736736
resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = {
737737
...
@@ -803,4 +803,4 @@ The two automatically created supporting resources can never outlive the `deploy
803803
In this article, you learned how to create deployment script resources. To learn more:
804804

805805
> [!div class="nextstepaction"]
806-
> [Use deployment scripts in Bicep](./deployment-script-bicep.md)
806+
> [Use deployment scripts in Bicep](./deployment-script-bicep.md)

0 commit comments

Comments
 (0)