Skip to content

Commit 1228fb3

Browse files
authored
Merge pull request #299015 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 d6718f4 + b96009f commit 1228fb3

File tree

5 files changed

+11
-19
lines changed

5 files changed

+11
-19
lines changed

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)