Skip to content

Commit fbfd1eb

Browse files
committed
Merge remote-tracking branch 'upstream/main' into preview-api-lifecycle
2 parents ef9c338 + f3639b6 commit fbfd1eb

File tree

8 files changed

+22
-30
lines changed

8 files changed

+22
-30
lines changed

articles/automation/add-user-assigned-identity.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ PATCH
120120
"identity": {
121121
"type": "SystemAssigned, UserAssigned",
122122
"userAssignedIdentities": {
123-
"/subscriptions/ffffffff-eeee-dddd-cccc-bbbbbbbbbbb0/resourceGroups/resource-group-name/providers/Microsoft.ManagedIdentity/userAssignedIdentities/firstIdentity": {},
124-
"/subscriptions/ffffffff-eeee-dddd-cccc-bbbbbbbbbbb0/resourceGroups/resource-group-name/providers/Microsoft.ManagedIdentity/userAssignedIdentities/secondIdentity": {}
123+
"/subscriptions/00a000aa-00a0-00aa-00aa-0a0aa000aa00/resourceGroups/resource-group-name/providers/Microsoft.ManagedIdentity/userAssignedIdentities/firstIdentity": {},
124+
"/subscriptions/00a000aa-00a0-00aa-00aa-0a0aa000aa00/resourceGroups/resource-group-name/providers/Microsoft.ManagedIdentity/userAssignedIdentities/secondIdentity": {}
125125
}
126126
}
127127
}
@@ -130,7 +130,7 @@ PATCH
130130
The syntax of the API is as follows:
131131

132132
```http
133-
https://management.azure.com/subscriptions/ffffffff-eeee-dddd-cccc-bbbbbbbbbbb0/resourceGroups/resource-group-name/providers/Microsoft.Automation/automationAccounts/automation-account-name?api-version=2020-01-13-preview
133+
https://management.azure.com/subscriptions/00a000aa-00a0-00aa-00aa-0a0aa000aa00/resourceGroups/resource-group-name/providers/Microsoft.Automation/automationAccounts/automation-account-name?api-version=2020-01-13-preview
134134
```
135135

136136
#### Example
@@ -176,15 +176,15 @@ Perform the following steps.
176176
```json
177177
{
178178
"type": "SystemAssigned, UserAssigned",
179-
"principalId": "ffffffff-eeee-dddd-cccc-bbbbbbbbbbb0",
180-
"tenantId": "ffffffff-eeee-dddd-cccc-bbbbbbbbbbb0",
179+
"principalId": "00a000aa-00a0-00aa-00aa-0a0aa000aa00",
180+
"tenantId": "00a000aa-00a0-00aa-00aa-0a0aa000aa00",
181181
"userAssignedIdentities": {
182182
"/subscriptions/ContosoID/resourcegroups/ContosoLab/providers/Microsoft.ManagedIdentity/userAssignedIdentities/ContosoUAMI1": {
183-
"PrincipalId": "ffffffff-eeee-dddd-cccc-bbbbbbbbbbb0",
183+
"PrincipalId": "00a000aa-00a0-00aa-00aa-0a0aa000aa00",
184184
"ClientId": "00001111-aaaa-2222-bbbb-3333cccc4444"
185185
},
186186
"/subscriptions/ContosoID/resourcegroups/ContosoLab/providers/Microsoft.ManagedIdentity/userAssignedIdentities/ContosoUAMI2": {
187-
"PrincipalId": "ffffffff-eeee-dddd-cccc-bbbbbbbbbbb0",
187+
"PrincipalId": "00a000aa-00a0-00aa-00aa-0a0aa000aa00",
188188
"ClientId": "00001111-aaaa-2222-bbbb-3333cccc4444"
189189
}
190190
}

articles/automation/enable-managed-identity-for-automation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,8 @@ Perform the following steps.
185185
186186
```json
187187
{
188-
"PrincipalId": "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
189-
"TenantId": "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb",
188+
"PrincipalId": "00a000aa-00a0-00aa-00aa-0a0aa000aa00",
189+
"TenantId": "00a000aa-00a0-00aa-00aa-0a0aa000aa00",
190190
"Type": 0,
191191
"UserAssignedIdentities": null
192192
}

articles/azure-resource-manager/management/move-support-resources.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Azure resource types for move operations
33
description: Lists the Azure resource types that can be moved to a new resource group, subscription, or region.
44
ms.topic: conceptual
5-
ms.date: 01/23/2025
5+
ms.date: 04/29/2025
66
ms.custom: tbd
77
---
88

@@ -460,7 +460,7 @@ Review the [Checklist before moving resources](./move-resource-group-and-subscri
460460
> | sharedvmextensions | No | No | No |
461461
> | sharedvmimages | No | No | No |
462462
> | sharedvmimages / versions | No | No | No |
463-
> | snapshots | **Yes** - Full <br> No - Incremental | **Yes** - Full <br> No - Incremental | No - Full <br> **Yes** - Incremental |
463+
> | snapshots | **Yes** - Full <br> No - Incremental | **Yes** - Full <br> No - Incremental | No - Full <br> No - Incremental |
464464
> | sshpublickeys | No | No | No |
465465
> | virtualmachines | **Yes** | **Yes** | **Yes** <br/><br/> Use [Azure Resource Mover](../../resource-mover/tutorial-move-region-virtual-machines.md) to move Azure Virtual Machines. |
466466
> | virtualmachines / extensions | **Yes** | **Yes** | No |

articles/container-apps/metrics.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: container-apps
55
author: craigshoemaker
66
ms.service: azure-container-apps
77
ms.topic: how-to
8-
ms.date: 11/01/2024
8+
ms.date: 04/28/2025
99
ms.author: cshoe
1010
---
1111

@@ -26,7 +26,7 @@ Container Apps provides these basic metrics.
2626
| Network In Bytes | Replica, Revision | Network received bytes | `RxBytes` | Bytes |
2727
| Network Out Bytes | Replica, Revision | Network transmitted bytes | `TxBytes` | Bytes |
2828
| Replica count | Revision | Number of active replicas | `Replicas` | Count |
29-
| Replica Restart Count | Replica, Revision | Restarts count of container app replicas | `RestartCount` | Count |
29+
| Total Replica Restart Count | Replica, Revision | Total number of restarts since the replica came online | `RestartCount` | Count |
3030
| Requests | Replica, Revision, Status Code, Status Code Category | Requests processed | `Requests` | Count |
3131
| Reserved Cores | Revision | Number of reserved cores for container app revisions | `CoresQuotaUsed` | Count |
3232
| Resiliency Connection Timeouts | Revision | Total connection timeouts | `ResiliencyConnectTimeouts` | Count |
@@ -42,9 +42,6 @@ Container Apps provides these basic metrics.
4242

4343
The metrics namespace is `Microsoft.App/containerapps`.
4444

45-
> [!NOTE]
46-
> Replica restart count is the aggregate restart count over the specified time range, not the number of restarts that occurred at a point in time.
47-
4845
Container Apps environments provides this basic metric. You can only view this metric in [Azure Monitor metrics](https://ms.portal.azure.com/?feature.allrts=true#view/Microsoft_Azure_Monitoring/AzureMonitoringBrowseBlade/~/metrics).
4946

5047
| Title | Dimensions | Description | Metric ID | Unit |

articles/event-hubs/event-hubs-quickstart-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Run the following command to create an Event Hubs namespace in the resource grou
4343

4444
```azurepowershell-interactive
4545
$namespaceName="myNamespace$(Get-Random)"
46-
New-AzEventHubNamespace -ResourceGroupName $rgName -NamespaceName $namespaceName -Location $region
46+
New-AzEventHubNamespace -ResourceGroupName $rgName -Name $namespaceName -Location $region
4747
```
4848

4949
You see the output similar to the following one. You see the name of the namespace in the `Name` field.

articles/governance/machine-configuration/how-to/assign-configuration/terraform.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@ ms.custom: devx-track-terraform
1111

1212
You can use [Terraform][01] to [deploy][02] machine configuration assignments.
1313

14-
> [!IMPORTANT]
15-
> The Terraform provider [azurerm_policy_virtual_machine_configuration_assignment][03] hasn't been
16-
> updated to support the **assignmentType** property so only configurations that perform audits are
17-
> supported.
18-
1914
## Assign a custom configuration
2015

2116
The following example assigns a custom configuration.

articles/iot-edge/tutorial-develop-for-linux-on-windows.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ In this tutorial, you learn how to:
3030
>
3131
> * Set up your development machine.
3232
> * Use IoT Edge development tools to create a new project.
33-
> * Build your project as a container and store it in an Azure container registry.
33+
> * Build your project as a container and store it in an Azure Container Registry.
3434
> * Deploy your code to an IoT Edge device.
3535
3636
## Prerequisites
@@ -424,14 +424,14 @@ Use the module's Dockerfile to build the module's Docker image:
424424
docker build --rm -f "<DockerFilePath>" -t <ImageNameAndTag> "<ContextPath>"
425425
```
426426

427-
For example, assume that your command shell is in your project directory and your module name is `IotEdgeModule1`. To build the image for the local registry or an Azure container registry, use the following commands:
427+
For example, assume that your command shell is in your project directory and your module name is `IotEdgeModule1`. To build the image for the local registry or an Azure Container Registry, use the following commands:
428428

429429
```bash
430430
# Build the image for the local registry
431431

432432
docker build --rm -f "./IotEdgeModule1/Dockerfile.amd64.debug" -t localhost:5000/iotedgemodule1:0.0.1-amd64 "./IotEdgeModule1"
433433

434-
# Or build the image for an Azure container registry
434+
# Or build the image for an Azure Container Registry
435435

436436
docker build --rm -f "./IotEdgeModule1/Dockerfile.amd64.debug" -t myacr.azurecr.io/iotedgemodule1:0.0.1-amd64 "./IotEdgeModule1"
437437
```
@@ -449,7 +449,7 @@ For example:
449449

450450
docker push localhost:5000/iotedgemodule1:0.0.1-amd64
451451

452-
# Or push the Docker image to an Azure container registry
452+
# Or push the Docker image to an Azure Container Registry
453453
az acr login --name myacr
454454
docker push myacr.azurecr.io/iotedgemodule1:0.0.1-amd64
455455
```
@@ -460,7 +460,7 @@ In Visual Studio, open the `deployment.debug.template.json` deployment manifest
460460

461461
Before deployment, you need to update your Azure Container Registry credentials, your module images, and the proper `createOptions` values. For more information about `createOption` values, see [How to configure container create options for IoT Edge modules](how-to-use-create-options.md).
462462

463-
1. If you're using an Azure container registry to store your module image, add your credentials to `deployment.debug.template.json` in the `edgeAgent` settings. For example:
463+
1. If you're using an Azure Container Registry to store your module image, add your credentials to `deployment.debug.template.json` in the `edgeAgent` settings. For example:
464464

465465
```json
466466
"modulesContent": {

articles/load-testing/resource-limits-quotas-capacity.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ The following limits apply on a per-region, per-subscription basis.
5151

5252
### Notifications
5353
The following limits apply on a per-region, per-subscription basis.
54-
| Resource | Default limit | Maximum limit |
55-
|---------| ---------: | ---------: |
56-
|Tests per notification rule | 20 | |
54+
| Resource | Default limit |
55+
|---------| ---------: |
56+
|Tests per notification rule | 20 |
5757
|Action groups per notification rule| 5|
5858

5959
### Data retention

0 commit comments

Comments
 (0)