Skip to content

Commit 2bf9661

Browse files
Merge pull request #270489 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 05bf27f + b8c9cdc commit 2bf9661

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

articles/azure-vmware/deploy-vsan-stretched-clusters.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Next, repeat the process to [peer ExpressRoute Global Reach](./tutorial-expressr
3939

4040
## Storage policies supported
4141

42-
The following SPBM policies are supported with a PFTT of "Dual Site Mirroring" and SFTT of "RAID 1 (Mirroring)" enabled as the default policies for the cluster:
42+
The following SPBM policies are supported with a Primary Failures To Tolerate (PFTT) of "Dual Site Mirroring" and Secondary Failures To Tolerate (SFTT) of "RAID 1 (Mirroring)" enabled as the default policies for the cluster:
4343

4444
- Site disaster tolerance settings (PFTT):
4545
- Dual site mirroring

articles/cosmos-db/how-to-setup-customer-managed-keys.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,8 @@ You can also follow similar steps with a user-assigned managed identity.
399399
},
400400
// ...
401401
"properties": {
402-
"defaultIdentity": "UserAssignedIdentity=<identity-resource-id>""keyVaultKeyUri": "<key-vault-key-uri>"
402+
"defaultIdentity": "UserAssignedIdentity=<identity-resource-id>",
403+
"keyVaultKeyUri": "<key-vault-key-uri>"
403404
// ...
404405
}
405406
}

includes/application-insights-limits.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ There are some limits on the number of metrics and events per application, that
1414

1515
| Resource | Default limit| Maximum limit | Notes |
1616
|---|---|---|---|
17-
| Total data per day | 100 GB | [Contact support.](https://azure.microsoft.com/support/options/) | You can set a cap to reduce data. If you need more data, you can increase the limit in the portal, up to 1,000 GB. For capacities greater than 1,000 GB, send email to [email protected].
18-
| Throttling | 32,000 events/second | [Contact support.](https://azure.microsoft.com/support/options/) | The limit is measured over a minute.
19-
| Data retention logs | [30 to 730 days](../articles/azure-monitor/logs/data-retention-archive.md) | 730 days | This resource is for [Logs](../articles/azure-monitor/logs/log-query-overview.md).
20-
| Data retention metrics | 90 days | 90 days | This resource is for [Metrics Explorer](../articles/azure-monitor/essentials/metrics-charts.md).
21-
| [Availability multistep test](/previous-versions/azure/azure-monitor/app/availability-multistep) detailed results retention | 90 days | 90 days | This resource provides detailed results of each step.
17+
| Total data per day | 100 GB | [Contact support.](https://azure.microsoft.com/support/options/) | You can set a cap to reduce data. If you need more data, you can increase the limit in the portal, up to 1,000 GB. For capacities greater than 1,000 GB, send email to [email protected].|
18+
| Throttling | 32,000 events/second | [Contact support.](https://azure.microsoft.com/support/options/) | The limit is measured over a minute.|
19+
| Data retention logs | [30 to 730 days](../articles/azure-monitor/logs/data-retention-archive.md) | 730 days | This resource is for [Logs](../articles/azure-monitor/logs/log-query-overview.md).|
20+
| Data retention metrics | 90 days | 90 days | This resource is for [Metrics Explorer](../articles/azure-monitor/essentials/metrics-charts.md).|
21+
| [Availability multistep test](/previous-versions/azure/azure-monitor/app/availability-multistep) detailed results retention | 90 days | 90 days | This resource provides detailed results of each step.|
2222
| Maximum telemetry item size | 64 KB | 64 KB | |
2323
| Maximum telemetry items per batch | 64,000 | 64,000 | |
24-
| Property and metric name length | 150 | 150 | See [type schemas](../articles/azure-monitor/app/data-model.md).
25-
| Property value string length | 8,192 | 8,192 | See [type schemas](../articles/azure-monitor/app/data-model.md).
26-
| Trace and exception message length | 32,768 | 32,768 | See [type schemas](../articles/azure-monitor/app/data-model.md).
27-
| [Availability tests](/previous-versions/azure/azure-monitor/app/monitor-web-app-availability) count per app | 100 | 100 | |
24+
| Property and metric name length | 150 | 150 | See [type schemas](../articles/azure-monitor/app/data-model.md).|
25+
| Property value string length | 8,192 | 8,192 | See [type schemas](../articles/azure-monitor/app/data-model.md).|
26+
| Trace and exception message length | 32,768 | 32,768 | See [type schemas](../articles/azure-monitor/app/data-model.md).|
27+
| [Availability tests](/previous-versions/azure/azure-monitor/app/monitor-web-app-availability) count per Application Insights resource | 100 | 100 | |
2828
| [Profiler](../articles/azure-monitor/app/profiler.md) and [Snapshot](../articles/azure-monitor/app/snapshot-debugger.md) data retention | Two weeks | [Contact support.](https://azure.microsoft.com/support/options/) Maximum retention limit is six months. | |
2929
| [Profiler](../articles/azure-monitor/app/profiler.md) data sent per day | No limit | No limit. | |
3030
| [Snapshot](../articles/azure-monitor/app/snapshot-debugger.md) data sent per day | 30 snapshots per day per monitored app | No limit. | The number of snapshots collected per application can be modified through [configuration](../articles/azure-monitor/app/snapshot-debugger-vm.md). |

0 commit comments

Comments
 (0)