Skip to content

Commit 44b3734

Browse files
authored
Merge pull request #223435 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 8ba6d81 + 3f19fc2 commit 44b3734

File tree

10 files changed

+38
-28
lines changed

10 files changed

+38
-28
lines changed

articles/active-directory-b2c/configure-tokens.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ The following values are set in the previous example:
9494

9595
- **token_lifetime_secs** - Access token lifetimes (seconds). The default is 3,600 (1 hour). The minimum is 300 (5 minutes). The maximum is 86,400 (24 hours).
9696
- **id_token_lifetime_secs** - ID token lifetimes (seconds). The default is 3,600 (1 hour). The minimum is 300 (5 minutes). The maximum is 86,400 (24 hours).
97-
- **refresh_token_lifetime_secs** Refresh token lifetimes (seconds). The default is 120,9600 (14 days). The minimum is 86,400 (24 hours). The maximum is 7,776,000 (90 days).
97+
- **refresh_token_lifetime_secs** Refresh token lifetimes (seconds). The default is 1,209,600 (14 days). The minimum is 86,400 (24 hours). The maximum is 7,776,000 (90 days).
9898
- **rolling_refresh_token_lifetime_secs** - Refresh token sliding window lifetime (seconds). The default is 7,776,000 (90 days). The minimum is 86,400 (24 hours). The maximum is 31,536,000 (365 days). If you don't want to enforce a sliding window lifetime, set the value of `allow_infinite_rolling_refresh_token` to `true`.
9999
- **allow_infinite_rolling_refresh_token** - Refresh token sliding window lifetime never expires.
100100

@@ -238,4 +238,4 @@ When using the [OAuth 2.0 authorization code flow](authorization-code-flow.md),
238238
## Next steps
239239

240240
- Learn more about how to [request access tokens](access-tokens.md).
241-
- Learn how to build [Resilience through developer best practices](../active-directory/fundamentals/resilience-b2c-developer-best-practices.md?bc=%2fazure%2factive-directory-b2c%2fbread%2ftoc.json&toc=%2fazure%2factive-directory-b2c%2fTOC.json).
241+
- Learn how to build [Resilience through developer best practices](../active-directory/fundamentals/resilience-b2c-developer-best-practices.md?bc=%2fazure%2factive-directory-b2c%2fbread%2ftoc.json&toc=%2fazure%2factive-directory-b2c%2fTOC.json).

articles/active-directory/verifiable-credentials/issuance-request-api.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ The Request Service REST API issuance request supports the following HTTP method
3030

3131
The Request Service REST API issuance request requires the following HTTP headers:
3232

33-
| Method |Value |
33+
| Name |Value |
3434
|---------|---------|
3535
|`Authorization`| Attach the access token as a bearer token to the authorization header in an HTTP request. For example, `Authorization: Bearer <token>`.|
36-
|`Content-Type`| `Application/json`|
36+
|`Content-Type`| `application/json`|
3737

3838
Construct an HTTP POST request to the Request Service REST API.
3939

@@ -46,18 +46,18 @@ The following HTTP request demonstrates a request to the Request Service REST AP
4646
```http
4747
POST https://verifiedid.did.msidentity.com/v1.0/verifiableCredentials/createIssuanceRequest
4848
Content-Type: application/json
49-
Authorization: Bearer <token>
49+
Authorization: Bearer <token>
5050
5151
{
52-
"includeQRCode": true,
53-
"callback": {
54-
"url": "https://wwww.contoso.com/vc/callback",
55-
"state": "Aaaabbbb11112222",
56-
"headers": {
57-
"api-key": "an-api-key-can-go-here"
58-
   }
59-
},
60-
...
52+
"includeQRCode": true,
53+
"callback": {
54+
"url": "https://wwww.contoso.com/vc/callback",
55+
"state": "Aaaabbbb11112222",
56+
"headers": {
57+
"api-key": "an-api-key-can-go-here"
58+
}
59+
},
60+
...
6161
}
6262
```
6363

@@ -182,7 +182,7 @@ When your app receives the response, the app needs to present the QR code to the
182182

183183
## Error response
184184

185-
If there is an error with the request, an [error responses](error-codes.md) will be returned and should be handled appropriately by the app.
185+
If there is an error with the request, an [error response](error-codes.md) will be returned and should be handled appropriately by the app.
186186

187187
## Callback events
188188

articles/azure-monitor/alerts/alerts-troubleshoot-metric.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,10 @@ Metric alerts are stateful by default, so other alerts aren't fired if there's a
113113
- If you create the alert rule programmatically, for example, via [Azure Resource Manager](./alerts-metric-create-templates.md), [PowerShell](/powershell/module/az.monitor/), [REST](/rest/api/monitor/metricalerts/createorupdate), or the [Azure CLI](/cli/azure/monitor/metrics/alert), set the `autoMitigate` property to `False`.
114114
- If you create the alert rule via the Azure portal, clear the **Automatically resolve alerts** option under the **Alert rule details** section.
115115

116-
<sup>1</sup> For stateless metric alert rules, an alert triggers once every 10 minutes at a minimum, even if the frequency of evaluation is equal or less than 5 minutes and the condition is still being met.
116+
<sup>1</sup>The frequency of notifications for stateless metric alerts differs based on the alert rule's configured frequency:
117+
118+
- **Alert frequency of less than 5 minutes**: While the condition continues to be met, a notification is sent somewhere between one and six minutes.
119+
- **Alert frequency of more than 5 minutes**: While the condition continues to be met, a notification is sent between the configured frequency and double the frequency. For example, for an alert rule with a frequency of 15 minutes, a notification is sent somewhere between 15 to 30 minutes.
117120

118121
> [!NOTE]
119122
> Making a metric alert rule stateless prevents fired alerts from becoming resolved. So, even after the condition isn't met anymore, the fired alerts remain in a fired state until the 30-day retention period.

articles/azure-vmware/attach-azure-netapp-files-to-azure-vmware-solution-hosts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Attach Azure NetApp Files datastores to Azure VMware Solution hosts
3-
description: Learn how to create Azure NetApp Files-based NSF datastores for Azure VMware Solution hosts.
3+
description: Learn how to create Azure NetApp Files-based NFS datastores for Azure VMware Solution hosts.
44
ms.topic: how-to
55
ms.service: azure-vmware
66
ms.date: 01/09/2023

articles/cosmos-db/monitor-resource-logs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Platform metrics and the Activity logs are collected automatically, whereas you
4444
| **MongoRequests** | Mongo | Logs user-initiated requests from the front end to serve requests to Azure Cosmos DB for MongoDB. When you enable this category, make sure to disable DataPlaneRequests. | `Requestcharge`, `opCode`, `retryCount`, `piiCommandText` |
4545
| **CassandraRequests** | Cassandra | Logs user-initiated requests from the front end to serve requests to Azure Cosmos DB for Cassandra. When you enable this category, make sure to disable DataPlaneRequests. | `operationName`, `requestCharge`, `piiCommandText` |
4646
| **GremlinRequests** | Gremlin | Logs user-initiated requests from the front end to serve requests to Azure Cosmos DB for Gremlin. When you enable this category, make sure to disable DataPlaneRequests. | `operationName`, `requestCharge`, `piiCommandText`, `retriedDueToRateLimiting` |
47-
| **QueryRuntimeStatistics** | SQL | This table details query operations executed against an API for NoSQL account. By default, the query text and its parameters are obfuscated to avoid logging personal data with full text query logging available by request. | `databasename`, `partitionkeyrangeid`, `querytext` |
47+
| **QueryRuntimeStatistics** | NoSQL | This table details query operations executed against an API for NoSQL account. By default, the query text and its parameters are obfuscated to avoid logging personal data with full text query logging available by request. | `databasename`, `partitionkeyrangeid`, `querytext` |
4848
| **PartitionKeyStatistics** | All APIs | Logs the statistics of logical partition keys by representing the estimated storage size (KB) of the partition keys. This table is useful when troubleshooting storage skews. This PartitionKeyStatistics log is only emitted if the following conditions are true: 1. At least 1% of the documents in the physical partition have same logical partition key. 2. Out of all the keys in the physical partition, the top three keys with largest storage size are captured by the PartitionKeyStatistics log. </li></ul> If the previous conditions aren't met, the partition key statistics data isn't available. It's okay if the above conditions aren't met for your account, which typically indicates you have no logical partition storage skew. **Note**: The estimated size of the partition keys is calculated using a sampling approach that assumes the documents in the physical partition are roughly the same size. If the document sizes aren't uniform in the physical partition, the estimated partition key size may not be accurate. | `subscriptionId`, `regionName`, `partitionKey`, `sizeKB` |
4949
| **PartitionKeyRUConsumption** | API for NoSQL | Logs the aggregated per-second RU/s consumption of partition keys. This table is useful for troubleshooting hot partitions. Currently, Azure Cosmos DB reports partition keys for API for NoSQL accounts only and for point read/write and stored procedure operations. | `subscriptionId`, `regionName`, `partitionKey`, `requestCharge`, `partitionKeyRangeId` |
5050
| **ControlPlaneRequests** | All APIs | Logs details on control plane operations, which include, creating an account, adding or removing a region, updating account replication settings etc. | `operationName`, `httpstatusCode`, `httpMethod`, `region` |

articles/cosmos-db/nosql/query/object-array.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,16 +115,16 @@ The results are:
115115
],
116116
[
117117
{
118-
"familyName": "Merriam",
119-
"givenName": "Jesse",
120-
"gender": "female",
121-
"grade": 1
118+
"familyName": "Merriam",
119+
"givenName": "Jesse",
120+
"gender": "female",
121+
"grade": 1
122122
},
123123
{
124-
"familyName": "Miller",
125-
"givenName": "Lisa",
126-
"gender": "female",
127-
"grade": 8
124+
"familyName": "Miller",
125+
"givenName": "Lisa",
126+
"gender": "female",
127+
"grade": 8
128128
}
129129
]
130130
]

articles/defender-for-cloud/defender-for-devops-introduction.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ Defender for DevOps uses a central console to empower security teams with the ab
2121
Defender for DevOps helps unify, strengthen and manage multi-pipeline DevOps security.
2222

2323
## Availability
24+
> [!Note]
25+
> During the preview, the maximum number of repositories that can be onboarded to Microsoft Defender for Cloud is 2,000. If you try to connect more than 2,000 repositories, only the first 2,000 repositories, sorted alphabetically, will be onboarded.
26+
>
27+
> If your organization is interested in onboarding more than 2,000 repositories, please complete [this survey](https://aka.ms/dfd-forms/onboarding).
2428
2529
| Aspect | Details |
2630
|--|--|

articles/service-fabric/service-fabric-managed-disk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ To use managed data disks on a node type, configure the underlying virtual machi
2727
* Add a managed disk in data disks section of the template for the virtual machine scale set.
2828
* Update the Service Fabric extension for the virtual machine scale set with following settings:
2929
* For Windows: **useManagedDataDisk: true** and **dataPath: 'K:\\\\SvcFab'**. Note that drive K is just a representation. You can use any drive letter lexicographically greater than all the drive letters present in the virtual machine scale set SKU.
30-
* For Linux: **useManagedDataDisk:true** and **dataPath: '\mnt\sfdataroot'**.
30+
* For Linux: **useManagedDataDisk:true** and **dataPath: '/mnt/sfroot'**.
3131

3232
Here's an Azure Resource Manager template for a Service Fabric extension:
3333

articles/static-web-apps/front-end-frameworks.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The following table lists the settings for a series of frameworks and libraries<
1919

2020
The intent of the table columns is explained by the following items:
2121

22-
- **Output location**: Lists the value for `output_location`, which is the [folder for built versions of application files](build-configuration.md).
22+
- **App artifact location (output location)**: Lists the value for `output_location`, which is the [folder for built versions of application files](build-configuration.md).
2323

2424
- **Custom build command**: When the framework requires a command different from `npm run build` or `npm run azure:build`, you can define a [custom build command](build-configuration.md#custom-build-commands).
2525

@@ -37,6 +37,7 @@ The intent of the table columns is explained by the following items:
3737
| [Framework7](https://framework7.io/) | `www` | `npm run build-prod` |
3838
| [Glimmer](https://glimmerjs.com/) | `dist` | n/a |
3939
| [HTML](https://developer.mozilla.org/docs/Web/HTML) | `/` | n/a |
40+
| [Hugo](https://gohugo.io/) | `public` | n/a |
4041
| [Hyperapp](https://hyperapp.dev/) | `/` | n/a |
4142
| [JavaScript](https://developer.mozilla.org/docs/Web/javascript) | `/` | n/a |
4243
| [jQuery](https://jquery.com/) | `/` | n/a |

articles/vpn-gateway/vpn-gateway-troubleshoot-site-to-site-cannot-connect.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@ If the Internet-facing IP address of the VPN device is included in the **Local n
106106

107107
The perfect forward secrecy feature can cause disconnection problems. If the VPN device has perfect forward secrecy enabled, disable the feature. Then update the VPN gateway IPsec policy.
108108

109+
> [!Note]
110+
> VPN gateways do not reply to ICMP on their local address.
109111
## Next steps
110112

111113
- [Configure a site-to-site connection to a virtual network](./tutorial-site-to-site-portal.md)

0 commit comments

Comments
 (0)