Skip to content

Commit c2c9041

Browse files
authored
Merge pull request #226001 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 30ce50f + 1bdbfd0 commit c2c9041

File tree

7 files changed

+23
-19
lines changed

7 files changed

+23
-19
lines changed

articles/app-service/deploy-staging-slots.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ The app must be running in the **Standard**, **Premium**, or **Isolated** tier i
6262

6363
6. Select the app URL on the slot's resource page. The deployment slot has its own host name and is also a live app. To limit public access to the deployment slot, see [Azure App Service IP restrictions](app-service-ip-restrictions.md).
6464

65-
The new deployment slot has no content, even if you clone the settings from a different slot. For example, you can [publish to this slot with Git](./deploy-local-git.md). You can deploy to the slot from a different repository branch or a different repository.
65+
The new deployment slot has no content, even if you clone the settings from a different slot. For example, you can [publish to this slot with Git](./deploy-local-git.md). You can deploy to the slot from a different repository branch or a different repository. Get publish profile [from Azure App Service](/visualstudio/azure/how-to-get-publish-profile-from-azure-app-service) can provide required information to deploy to the slot. The profile can be imported by Visual Studio to deploy contents to the slot.
6666

6767
The slot's URL will be of the format `http://sitename-slotname.azurewebsites.net`. To keep the URL length within necessary DNS limits, the site name will be truncated at 40 characters, the slot name will be truncated at 19 characters, and an additional 4 random characters will be appended to ensure the resulting domain name is unique.
6868

@@ -283,7 +283,7 @@ By default, new slots are given a routing rule of `0%`, shown in grey. When you
283283

284284
## Delete a slot
285285

286-
Search for and select your app. Select **Deployment slots** > *\<slot to delete>* > **Overview**. The app type is shown as **App Service (Slot)** to remind you that you're viewing a deployment slot. Select **Delete** on the command bar.
286+
Search for and select your app. Select **Deployment slots** > *\<slot to delete>* > **Overview**. The app type is shown as **App Service (Slot)** to remind you that you're viewing a deployment slot. Before deleting a slot, make sure to stop the slot and set the traffic in the slot to zero. Select **Delete** on the command bar.
287287

288288
![Delete a deployment slot](./media/web-sites-staged-publishing/DeleteStagingSiteButton.png)
289289

articles/devtest-labs/devtest-lab-upload-vhd-using-powershell.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ To upload a VHD file by using PowerShell:
4747

4848
1. In a text editor, paste the generated PowerShell script you copied from the Azure portal.
4949

50-
1. Modify the `-LocalFilePath` parameter of the Add-AzureRmVhd cmdlet to point to the location of the VHD file you want to upload.
50+
1. Modify the `-LocalFilePath` parameter of the Add-AZVHD cmdlet to point to the location of the VHD file you want to upload.
5151

52-
1. At a PowerShell command prompt, run the Add-AzureRmVhd cmdlet with the modified `-LocalFilePath` parameter.
52+
1. At a PowerShell command prompt, run the Add-AZVHD cmdlet with the modified `-LocalFilePath` parameter.
5353

5454
The process of uploading a VHD file might be lengthy depending on the size of the VHD file and your connection speed.
5555

articles/iot-dps/concepts-symmetric-key-attestation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,14 @@ Once a registration ID has been defined for the device, the symmetric key for th
6969

7070
# [Azure CLI](#tab/azure-cli)
7171

72-
The IoT extension for the Azure CLI provides the [`compute-device-key`](/cli/azure/iot/dps#az-iot-dps-compute-device-key) command for generating derived device keys. This command can be used from Windows-based or Linux systems, in PowerShell or a Bash shell.
72+
The IoT extension for the Azure CLI provides the [`compute-device-key`](/cli/azure/iot/dps/enrollment-group#az-iot-dps-enrollment-group-compute-device-key) command for generating derived device keys. This command can be used from Windows-based or Linux systems, in PowerShell or a Bash shell.
7373

7474
Replace the value of `--key` argument with the **Primary Key** from your enrollment group.
7575

7676
Replace the value of `--registration-id` argument with your registration ID.
7777

7878
```azurecli
79-
az iot dps compute-device-key --key 8isrFI1sGsIlvvFSSFRiMfCNzv21fjbE/+ah/lSh3lF8e2YG1Te7w1KpZhJFFXJrqYKi9yegxkqIChbqOS9Egw== --registration-id sn-007-888-abc-mac-a1-b2-c3-d4-e5-f6
79+
az iot dps enrollment-group compute-device-key --key 8isrFI1sGsIlvvFSSFRiMfCNzv21fjbE/+ah/lSh3lF8e2YG1Te7w1KpZhJFFXJrqYKi9yegxkqIChbqOS9Egw== --registration-id sn-007-888-abc-mac-a1-b2-c3-d4-e5-f6
8080
```
8181

8282
Example result:

articles/iot-edge/module-edgeagent-edgehub.md

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,20 @@ The module twin for the IoT Edge agent is called `$edgeAgent` and coordinates th
3434
| runtime.type | Has to be "docker" | Yes |
3535
| runtime.settings.minDockerVersion | Set to the minimum Docker version required by this deployment manifest | Yes |
3636
| runtime.settings.loggingOptions | A stringified JSON containing the logging options for the IoT Edge agent container. [Docker logging options](https://docs.docker.com/engine/admin/logging/overview/) | No |
37-
| runtime.settings.registryCredentials<br>.{registryId}.username | The username of the container registry. For Azure Container Registry, the username is usually the registry name.<br><br> Registry credentials are necessary for any private module images. | No |
38-
| runtime.settings.registryCredentials<br>.{registryId}.password | The password for the container registry. | No |
39-
| runtime.settings.registryCredentials<br>.{registryId}.address | The address of the container registry. For Azure Container Registry, the address is usually *{registry name}.azurecr.io*. | No |
37+
| runtime.settings.registryCredentials.{registryId}.username | The username of the container registry. For Azure Container Registry, the username is usually the registry name.<br><br>Registry credentials are necessary for any private module images. | No |
38+
| runtime.settings.registryCredentials.{registryId}.password | The password for the container registry. | No |
39+
| runtime.settings.registryCredentials.{registryId}.address | The address of the container registry. For Azure Container Registry, the address is usually *{registry name}.azurecr.io*. | No |
4040
| systemModules.edgeAgent.type | Has to be "docker" | Yes |
41+
| systemModules.edgeAgent.startupOrder | An integer value for which spot a module has in the startup order. 0 is first and max integer (4294967295) is last. If a value isn't provided, the default is max integer. | No |
4142
| systemModules.edgeAgent.settings.image | The URI of the image of the IoT Edge agent. Currently, the IoT Edge agent isn't able to update itself. | Yes |
42-
| systemModules.edgeAgent.settings<br>.createOptions | A stringified JSON containing the options for the creation of the IoT Edge agent container. [Docker create options](https://docs.docker.com/engine/api/v1.32/#operation/ContainerCreate) | No |
43+
| systemModules.edgeAgent.settings.createOptions | A stringified JSON containing the options for the creation of the IoT Edge agent container. [Docker create options](https://docs.docker.com/engine/api/v1.32/#operation/ContainerCreate) | No |
4344
| systemModules.edgeAgent.configuration.id | The ID of the deployment that deployed this module. | IoT Hub sets this property when the manifest is applied using a deployment. Not part of a deployment manifest. |
4445
| systemModules.edgeHub.type | Has to be "docker" | Yes |
4546
| systemModules.edgeHub.status | Has to be "running" | Yes |
4647
| systemModules.edgeHub.restartPolicy | Has to be "always" | Yes |
4748
| systemModules.edgeHub.startupOrder | An integer value for which spot a module has in the startup order. 0 is first and max integer (4294967295) is last. If a value isn't provided, the default is max integer. | No |
4849
| systemModules.edgeHub.settings.image | The URI of the image of the IoT Edge hub. | Yes |
49-
| systemModules.edgeHub.settings<br>.createOptions | A stringified JSON containing the options for the creation of the IoT Edge hub container. [Docker create options](https://docs.docker.com/engine/api/v1.32/#operation/ContainerCreate) | No |
50+
| systemModules.edgeHub.settings.createOptions | A stringified JSON containing the options for the creation of the IoT Edge hub container. [Docker create options](https://docs.docker.com/engine/api/v1.32/#operation/ContainerCreate) | No |
5051
| systemModules.edgeHub.configuration.id | The ID of the deployment that deployed this module. | IoT Hub sets this property when the manifest is applied using a deployment. Not part of a deployment manifest. |
5152
| modules.{moduleId}.version | A user-defined string representing the version of this module. | Yes |
5253
| modules.{moduleId}.type | Has to be "docker" | Yes |
@@ -83,17 +84,20 @@ The following table does not include the information that is copied from the des
8384
| runtime.platform.architecture | Reporting the architecture of the CPU on the device |
8485
| systemModules.edgeAgent.runtimeStatus | The reported status of IoT Edge agent: {"running" \| "unhealthy"} |
8586
| systemModules.edgeAgent.statusDescription | Text description of the reported status of the IoT Edge agent. |
87+
| systemModules.edgeAgent.exitCode | The exit code reported by the IoT Edge agent container if the container exits |
88+
| systemModules.edgeAgent.lastStartTimeUtc | Time when IoT Edge agent was last started |
89+
| systemModules.edgeAgent.lastExitTimeUtc | Time when IoT Edge agent last exited |
8690
| systemModules.edgeHub.runtimeStatus | Status of IoT Edge hub: { "running" \| "stopped" \| "failed" \| "backoff" \| "unhealthy" } |
8791
| systemModules.edgeHub.statusDescription | Text description of the status of IoT Edge hub if unhealthy. |
8892
| systemModules.edgeHub.exitCode | The exit code reported by the IoT Edge hub container if the container exits |
89-
| systemModules.edgeHub.startTimeUtc | Time when IoT Edge hub was last started |
93+
| systemModules.edgeHub.lastStartTimeUtc | Time when IoT Edge hub was last started |
9094
| systemModules.edgeHub.lastExitTimeUtc | Time when IoT Edge hub last exited |
9195
| systemModules.edgeHub.lastRestartTimeUtc | Time when IoT Edge hub was last restarted |
9296
| systemModules.edgeHub.restartCount | Number of times this module was restarted as part of the restart policy. |
9397
| modules.{moduleId}.runtimeStatus | Status of the module: { "running" \| "stopped" \| "failed" \| "backoff" \| "unhealthy" } |
9498
| modules.{moduleId}.statusDescription | Text description of the status of the module if unhealthy. |
9599
| modules.{moduleId}.exitCode | The exit code reported by the module container if the container exits |
96-
| modules.{moduleId}.startTimeUtc | Time when the module was last started |
100+
| modules.{moduleId}.lastStartTimeUtc | Time when the module was last started |
97101
| modules.{moduleId}.lastExitTimeUtc | Time when the module last exited |
98102
| modules.{moduleId}.lastRestartTimeUtc | Time when the module was last restarted |
99103
| modules.{moduleId}.restartCount | Number of times this module was restarted as part of the restart policy. |

articles/virtual-wan/nat-rules-vpn-gateway.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Another consideration is the address pool size for translation. If the target ad
6464

6565
**Ingress SNAT rules** are applied on packets that are entering Azure through the Virtual WAN site-to-site VPN gateway. In this scenario, you want to connect two site-to-site VPN branches to Azure. VPN Site 1 connects via Link A, and VPN Site 2 connects via Link B. Each site has the same address space 10.30.0.0/24.
6666

67-
In this example, we'll NAT site1 to 127.30.0.0.0/24. The Virtual WAN spoke virtual networks and branches other will automatically learn this post-NAT address space.
67+
In this example, we'll NAT site1 to 172.30.0.0.0/24. The Virtual WAN spoke virtual networks and branches other will automatically learn this post-NAT address space.
6868

6969
The following diagram shows the projected end result:
7070

@@ -89,7 +89,7 @@ The following diagram shows the projected end result:
8989

9090
1. Ensure the site-to-site VPN gateway is able to peer with the on-premises BGP peer.
9191

92-
In this example, the **Ingress NAT Rule** will need to translate 10.30.0.132 to 127.30.0.132. In order to do that, click 'Edit VPN site' to configure VPN site Link A BGP address to reflect this translated BGP peer address (127.30.0.132).
92+
In this example, the **Ingress NAT Rule** will need to translate 10.30.0.132 to 172.30.0.132. In order to do that, click 'Edit VPN site' to configure VPN site Link A BGP address to reflect this translated BGP peer address (172.30.0.132).
9393

9494
:::image type="content" source="./media/nat-rules-vpn-gateway/edit-site-bgp.png" alt-text="Screenshot showing how to change the BGP peering IP."lightbox="./media/nat-rules-vpn-gateway/edit-site-bgp.png":::
9595

@@ -99,7 +99,7 @@ The following diagram shows the projected end result:
9999
* If **BGP Translation** is enabled, the site-to-site VPN gateway will automatically advertise the **External Mapping** of **Egress NAT rules** to on-premises as well as **External Mapping** of **Ingress NAT rules** to Azure (virtual WAN hub, connected spoke virtual networks, connected VPN/ExpressRoute). If **BGP Translation** is disabled, translated routes aren't automatically advertised to the on-premises. As such, the on-premises BGP speaker must be configured to advertise the post-NAT (**External Mapping**) range of **Ingress NAT** rules associated to that VPN site link connection. Similarly, a route for the post-NAT (**External Mapping**) range of **Egress NAT Rules** must be applied on the on-premises device.
100100
* The site-to-site VPN gateway automatically translates the on-premises BGP peer IP address **if** the on-premises BGP peer IP address is contained within the **Internal Mapping** of an **Ingress NAT Rule**. As a result, the VPN site's **Link Connection BGP address** must reflect the NAT-translated address (part of the External Mapping).
101101

102-
For instance, if the on-premises BGP IP address is 10.30.0.133 and there is an **Ingress NAT Rule** that translates 10.30.0.0/24 to 127.30.0.0/24, the VPN site's **Link Connection BGP Address** must be configured to be the translated address (127.30.0.133).
102+
For instance, if the on-premises BGP IP address is 10.30.0.133 and there is an **Ingress NAT Rule** that translates 10.30.0.0/24 to 172.30.0.0/24, the VPN site's **Link Connection BGP Address** must be configured to be the translated address (172.30.0.133).
103103
* In Dynamic NAT, on-premises BGP peer IP can't be part of the pre-NAT address range (**Internal Mapping**) as IP and port translations aren't fixed. If there is a need to translate the on-premises BGP peering IP, please create a separate **Static NAT Rule** that translates BGP Peering IP address only.
104104

105105
For instance, if the on-premises network has an address space of 10.0.0.0/24 with an on-premises BGP peer IP of 10.0.0.1 and there is an **Ingress Dynamic NAT Rule** to translate 10.0.0.0/24 to 192.198.0.0/32, a separate **Ingress Static NAT Rule** translating 10.0.0.1/32 to 192.168.0.02/32 is required and the corresponding VPN site's **Link Connection BGP address** must be updated to the NAT-translated address (part of the External Mapping).

articles/virtual-wan/scenario-route-through-nva.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ Virtual WAN does not support a scenario where VNets 5,6 connect to virtual hub
117117

118118
> [!NOTE]
119119
> To simplify the routing and to reduce the changes in the Virtual WAN hub route tables, we recommend the new BGP peering with Virtual WAN hub (preview). For more information, see the following articles:
120-
>* [Scenario: BGP peering with a virtual hub (preview)](scenario-bgp-peering-hub.md)
121-
>* [How to create BGP peering with virtual hub (preview) - Azure portal](create-bgp-peering-hub-portal.md)
120+
>* [Scenario: BGP peering with a virtual hub](scenario-bgp-peering-hub.md)
121+
>* [How to create BGP peering with virtual hub - Azure portal](create-bgp-peering-hub-portal.md)
122122
>
123123
124124
3. Configure a static route for VNets 5,6 in VNet 2’s virtual network connection. To set up routing configuration for a virtual network connection, see [virtual hub routing](how-to-virtual-hub-routing.md#routing-configuration).

articles/virtual-wan/virtual-wan-about.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ For available regions and locations, see [Virtual WAN partners, regions, and loc
5353

5454
To configure an end-to-end virtual WAN, you create the following resources:
5555

56-
* **Virtual WAN:** The virtualWAN resource represents a virtual overlay of your Azure network and is a collection of multiple resources. It contains links to all your virtual hubs that you would like to have within the virtual WAN. Virtual WAN resources are isolated from each other and can't contain a common hub. Virtual hubs across Virtual WAN don't communicate with each other.
56+
* **Virtual WAN:** The Virtual WAN resource represents a virtual overlay of your Azure network and is a collection of multiple resources. It contains links to all your virtual hubs that you would like to have within the Virtual WAN. Virtual WANs are isolated from each other and can't contain a common hub. Virtual hubs in different Virtual WANs don't communicate with each other.
5757

5858
* **Hub:** A virtual hub is a Microsoft-managed virtual network. The hub contains various service endpoints to enable connectivity. From your on-premises network (vpnsite), you can connect to a VPN gateway inside the virtual hub, connect ExpressRoute circuits to a virtual hub, or even connect mobile users to a point-to-site gateway in the virtual hub. The hub is the core of your network in a region. Multiple virtual hubs can be created in the same region.
5959

0 commit comments

Comments
 (0)