Skip to content

Commit 9908ab5

Browse files
TaojunshenTaojunshen
authored
Merge pull request #272947 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 84988ba + c70e15d commit 9908ab5

File tree

6 files changed

+25
-25
lines changed

6 files changed

+25
-25
lines changed

‎articles/aks/monitor-control-plane-metrics.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ Perform the following steps to collect all metrics from all targets on the clust
131131

132132
1. Set `minimalingestionprofile = true` and verify the targets under `default-scrape-settings-enabled` that you want to scrape are set to `true`. The only targets you can specify are: `controlplane-apiserver`, `controlplane-cluster-autoscaler`, `controlplane-kube-scheduler`, `controlplane-kube-controller-manager`, and `controlplane-etcd`.
133133

134-
1. Under the `default-target-metrics-list`, specify the list of metrics for the `true` targets. For example,
134+
1. Under the `default-targets-metrics-keep-list`, specify the list of metrics for the `true` targets. For example,
135135

136136
```yaml
137137
controlplane-apiserver= "apiserver_admission_webhook_admission_duration_seconds| apiserver_longrunning_requests"
@@ -151,7 +151,7 @@ Perform the following steps to collect all metrics from all targets on the clust
151151

152152
1. Set `minimalingestionprofile = false` and verify the targets under `default-scrape-settings-enabled` that you want to scrape are set to `true`. The only targets you can specify here are `controlplane-apiserver`, `controlplane-cluster-autoscaler`, `controlplane-kube-scheduler`,`controlplane-kube-controller-manager`, and `controlplane-etcd`.
153153

154-
1. Under the `default-target-metrics-list`, specify the list of metrics for the `true` targets. For example,
154+
1. Under the `default-targets-metrics-keep-list`, specify the list of metrics for the `true` targets. For example,
155155

156156
```yaml
157157
controlplane-apiserver= "apiserver_admission_webhook_admission_duration_seconds| apiserver_longrunning_requests"

‎articles/azure-functions/migrate-dotnet-to-isolated-model.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ namespace Company.Function
368368

369369
Upgrading your function app to the isolated model consists of two steps:
370370

371-
1. Change the configuration of the function app to use the isolated model by setting the `FUNCTIONS_WORKER_RUNTIME` application setting to "dotnet-isolated". Make sure that any deployment automation is similarly updated.
371+
1. Change the configuration of the function app to use the isolated model by setting the `FUNCTIONS_WORKER_RUNTIME` application setting to `dotnet-isolated`. Make sure that any deployment automation is similarly updated.
372372
2. Publish your migrated project to the updated function app.
373373

374374
When you use Visual Studio to publish an isolated worker model project to an existing function app that uses the in-process model, you're prompted to let Visual Studio update the function app during deployment. This accomplishes both steps at once.

‎articles/azure-functions/security-concepts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ For more information, see [Secure connections (TLS)](../app-service/overview-sec
4747

4848
#### System key
4949

50-
Specific extensions may require a system-managed key to access webhook endpoints. System keys are designed for extension-specific function endpoints that called by internal components. For example, the [Event Grid trigger](functions-bindings-event-grid-trigger.md) requires that the subscription use a system key when calling the trigger endpoint. Durable Functions also uses system keys to call [Durable Task extension APIs](durable/durable-functions-http-api.md).
50+
Specific extensions may require a system-managed key to access webhook endpoints. System keys are designed for extension-specific function endpoints that get called by internal components. For example, the [Event Grid trigger](functions-bindings-event-grid-trigger.md) requires that the subscription use a system key when calling the trigger endpoint. Durable Functions also uses system keys to call [Durable Task extension APIs](durable/durable-functions-http-api.md).
5151

5252
The scope of system keys is determined by the extension, but it generally applies to the entire function app. System keys can only be created by specific extensions, and you can't explicitly set their values. Like other keys, you can generate a new value for the key from the portal or by using the key APIs.
5353

‎articles/container-apps/opentelemetry-agents.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ Before you run this command, replace placeholders surrounded by `<>` with your v
8787
```azurecli
8888
az containerapp env telemetry app-insights set \
8989
--connection-string <YOUR_APP_INSIGHTS_CONNECTION_STRING> \
90-
--EnableOpenTelemetryTraces true \
91-
--EnableOpenTelemetryLogs true
90+
--enable-open-telemetry-traces true \
91+
--enable-open-telemetry-logs true
9292
```
9393

9494
---
@@ -142,8 +142,8 @@ Before you run this command, replace placeholders surrounded by `<>` with your v
142142
az containerapp env telemetry data-dog set \
143143
--site "<YOUR_DATADOG_SUBDOMAIN>.datadoghq.com" \
144144
--key <YOUR_DATADOG_KEY> \
145-
--EnableOpenTelemetryTraces true \
146-
--EnableOpenTelemetryMetrics true
145+
--enable-open-telemetry-traces true \
146+
--enable-open-telemetry-metrics true
147147
```
148148

149149
---
@@ -204,14 +204,14 @@ az containerap env telemetry otlp add \
204204
--endpoint "ENDPOINT_URL_1" \
205205
--insecure false \
206206
--headers "api-key-1=key" \
207-
--EnableOpenTelemetryTraces true \
208-
--EnableOpenTelemetryMetrics true
207+
--enable-open-telemetry-traces true \
208+
--enable-open-telemetry-metrics true
209209
az containerap env telemetry otlp add \
210210
--name "otlp2"
211211
--endpoint "ENDPOINT_URL_2" \
212212
--insecure true \
213-
--EnableOpenTelemetryTraces true \
214-
--EnableOpenTelemetryLogs true
213+
--enable-open-telemetry-traces true \
214+
--enable-open-telemetry-logs true
215215
```
216216

217217
---
@@ -366,4 +366,4 @@ See the destination service for their billing structure and terms. For example,
366366
## Next steps
367367

368368
> [!div class="nextstepaction"]
369-
> [Learn about monitoring and health](observability.md)
369+
> [Learn about monitoring and health](observability.md)

‎articles/cosmos-db/hierarchical-partition-keys.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,8 @@ For example, assume that you have a hierarchical partition key that's composed o
204204
```bicep
205205
partitionKey: {
206206
paths: [
207-
'/TenantId',
208-
'/UserId',
207+
'/TenantId'
208+
'/UserId'
209209
'/SessionId'
210210
]
211211
kind: 'MultiHash'

‎articles/virtual-machines/dasv6-dadsv6-series.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,16 @@ Daldsv6-series virtual machines support Standard SSD, Standard HDD, and Premium
6767
[Ephemeral OS Disks](/azure/virtual-machines/ephemeral-os-disks): Not Supported for Preview 
6868
[Nested Virtualization](/virtualization/hyper-v-on-windows/user-guide/nested-virtualization): Supported 
6969

70-
| Size | vCPU | Memory: GiB | Local NVMe Temporary storage (SSD) | Max data disks | Max uncached Premium SSD disk throughput: IOPS/MBps | Max burst uncached Premium SSD disk throughput: IOPS/MBps<sup>1</sup> | Max uncached Ultra Disk and Premium SSD V2 disk throughput: IOPS/MBps | Max burst uncached Ultra Disk and Premium SSD V2 disk throughput: IOPS/MBps<sup>1</sup> | Max NICs | Max network bandwidth (Mbps) | Max network bandwidth (Mbps) | Max temp storage read throughput: IOPS / MBps |
71-
|--------------------|------|-------------|------------------------------------|----------------|-----------------------------------------------------|------------------------------------------------------------|-----------------------------------------------------------------------|------------------------------------------------------------------------------|----------|------------------------------|------------------------------|-----------------------------------------------|
72-
| Standard_D2ads_v6 | 2 | 8 | 1x110 GiB | 4 | 4000/90 | 20000/1250 | 4000/90 | 20000/1250 | 2 | 12500 | 12500 | 37500/180 |
73-
| Standard_D4ads_v6 | 4 | 16 | 1x220 GiB | 8 | 7600/180 | 20000/1250 | 7600/180 | 20000/1250 | 2 | 12500 | 12500 | 75000/360 |
74-
| Standard_D8ads_v6 | 8 | 32 | 1x440 GiB | 16 | 15200/360 | 20000/1250 | 15200/360 | 20000/1250 | 4 | 12500 | 12500 | 150000/720 |
75-
| Standard_D16ads_v6 | 16 | 64 | 2x440 GiB | 32 | 30400/720 | 40000/1250 | 30400/720 | 40000/1250 | 8 | 16000 | 12500 | 300000/1440 |
76-
| Standard_D32ads_v6 | 32 | 128 | 4x440 GiB | 32 | 57600/1440 | 80000/1700 | 57600/1440 | 80000/1700 | 8 | 20000 | 16000 | 600000/2880 |
77-
| Standard_D48ads_v6 | 48 | 192 | 6x440 GiB | 32 | 86400/2160 | 90000/2550 | 86400/2160 | 90000/2550 | 8 | 28000 | 24000 | 900000/4320 |
78-
| Standard_D64ads_v6 | 64 | 256 | 4x880 GiB | 32 | 115200/2880 | 120000/3400 | 115200/2880 | 120000/3400 | 8 | 36000 | 32000 | 1200000/5760 |
79-
| Standard_D96ads_v6 | 96 | 384 | 6x880 GiB | 32 | 175000/4320 | 175000/5090 | 175000/4320 | 175000/5090 | 8 | 40000 | 40000 | 1800000/8640 |
70+
| Size | vCPU | Memory: GiB | Local NVMe Temporary storage (SSD) | Max data disks | Max uncached Premium SSD disk throughput: IOPS/MBps | Max burst uncached Premium SSD disk throughput: IOPS/MBps<sup>1</sup> | Max uncached Ultra Disk and Premium SSD V2 disk throughput: IOPS/MBps | Max burst uncached Ultra Disk and Premium SSD V2 disk throughput: IOPS/MBps<sup>1</sup> | Max NICs | Max network bandwidth (Mbps) | Max temp storage read throughput: IOPS / MBps |
71+
|--------------------|------|-------------|------------------------------------|----------------|-----------------------------------------------------|------------------------------------------------------------|-----------------------------------------------------------------------|------------------------------------------------------------------------------|----------|------------------------------|-----------------------------------------------|
72+
| Standard_D2ads_v6 | 2 | 8 | 1x110 GiB | 4 | 4000/90 | 20000/1250 | 4000/90 | 20000/1250 | 2 | 12500 | 37500/180 |
73+
| Standard_D4ads_v6 | 4 | 16 | 1x220 GiB | 8 | 7600/180 | 20000/1250 | 7600/180 | 20000/1250 | 2 | 12500 | 75000/360 |
74+
| Standard_D8ads_v6 | 8 | 32 | 1x440 GiB | 16 | 15200/360 | 20000/1250 | 15200/360 | 20000/1250 | 4 | 12500 | 150000/720 |
75+
| Standard_D16ads_v6 | 16 | 64 | 2x440 GiB | 32 | 30400/720 | 40000/1250 | 30400/720 | 40000/1250 | 8 | 16000 | 300000/1440 |
76+
| Standard_D32ads_v6 | 32 | 128 | 4x440 GiB | 32 | 57600/1440 | 80000/1700 | 57600/1440 | 80000/1700 | 8 | 20000 | 600000/2880 |
77+
| Standard_D48ads_v6 | 48 | 192 | 6x440 GiB | 32 | 86400/2160 | 90000/2550 | 86400/2160 | 90000/2550 | 8 | 28000 | 900000/4320 |
78+
| Standard_D64ads_v6 | 64 | 256 | 4x880 GiB | 32 | 115200/2880 | 120000/3400 | 115200/2880 | 120000/3400 | 8 | 36000 | 1200000/5760 |
79+
| Standard_D96ads_v6 | 96 | 384 | 6x880 GiB | 32 | 175000/4320 | 175000/5090 | 175000/4320 | 175000/5090 | 8 | 40000 | 1800000/8640 |
8080

8181
<sup>1</sup> Dadsv6-series VMs can [burst](disk-bursting.md) their disk performance and get up to their bursting max for up to 30 minutes at a time.
8282

0 commit comments

Comments
 (0)