Skip to content

Commit c5256be

Browse files
authored
Merge pull request #206184 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 0e6c46e + fbe2028 commit c5256be

File tree

7 files changed

+12
-7
lines changed

7 files changed

+12
-7
lines changed

articles/active-directory/develop/id-tokens.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ The table below shows the claims that are in most ID tokens by default (except w
8484
|`roles`| Array of strings | The set of roles that were assigned to the user who is logging in. |
8585
|`rh` | Opaque String |An internal claim used by Azure to revalidate tokens. Should be ignored. |
8686
|`sub` | String | The principal about which the token asserts information, such as the user of an app. This value is immutable and cannot be reassigned or reused. The subject is a pairwise identifier - it is unique to a particular application ID. If a single user signs into two different apps using two different client IDs, those apps will receive two different values for the subject claim. This may or may not be wanted depending on your architecture and privacy requirements. |
87-
|`tid` | String, a GUID | Represents the tenant that the user is signing in to. For work and school accounts, the GUID is the immutable tenant ID of the organization that the user is signing in to. For sign-ins to the personal Microsoft account tenant (services like Xbox, Teams for Life, or Outlook), the value is `9188040d-6c67-4c5b-b112-36a304b66dad`. To receive this claim, your app must request the `profile` scope. |
87+
|`tid` | String, a GUID | Represents the tenant that the user is signing in to. For work and school accounts, the GUID is the immutable tenant ID of the organization that the user is signing in to. For sign-ins to the personal Microsoft account tenant (services like Xbox, Teams for Life, or Outlook), the value is `9188040d-6c67-4c5b-b112-36a304b66dad`.|
8888
| `unique_name` | String | Only present in v1.0 tokens. Provides a human readable value that identifies the subject of the token. This value is not guaranteed to be unique within a tenant and should be used only for display purposes. |
8989
| `uti` | String | Token identifier claim, equivalent to `jti` in the JWT specification. Unique, per-token identifier that is case-sensitive.|
9090
|`ver` | String, either 1.0 or 2.0 | Indicates the version of the id_token. |

articles/app-service/configure-connect-to-azure-storage.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ The following features are supported for Linux containers:
106106
- Mapping `/mounts`, `mounts/foo/bar`, `/`, and `/mounts/foo.bar/` to custom-mounted storage is not supported (you can only use /mounts/pathname for mounting custom storage to your web app.)
107107
- Storage mounts cannot be used together with clone settings option during [deployment slot](deploy-staging-slots.md) creation.
108108
- Storage mounts are not backed up when you [back up your app](manage-backup.md). Be sure to follow best practices to back up the Azure Storage accounts.
109+
- Only Azure Files [SMB](/azure/storage/files/files-smb-protocol) are supported. Azure Files [NFS](/azure/storage/files/files-nfs-protocol) is not currently supported for Linux App Services.
109110

110111
::: zone-end
111112

articles/azure-arc/data/active-directory-prerequisites.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ Whether you have created a new account for the DSA or are using an existing Acti
120120
- **Write all properties**
121121
- **Create User objects**
122122
- **Delete User objects**
123-
- **Reset Password for Descendant User objects**
124123

125124
- Select **OK**.
126125

articles/cognitive-services/QnAMaker/How-To/get-analytics-knowledge-base.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,10 @@ traces | extend id = operation_ParentId
114114
| order by timestamp desc
115115
```
116116

117+
> **NOTE**
118+
> If you cannot get properly the log by using Application Insight, please confirm the Application Insights settings on the App Service resource.
119+
> Open App Service resource and go to Application Insights. And then please check whether it is Enabled or Disabled. If it is disabled, please enable it and then apply there.
120+
117121
## Next steps
118122

119123
> [!div class="nextstepaction"]

articles/defender-for-cloud/multi-factor-authentication-enforcement.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,12 @@ Defender for Cloud's MFA recommendations refer to [Azure RBAC](../role-based-acc
102102
Defender for Cloud's MFA recommendations currently don't support PIM accounts. You can add these accounts to a CA Policy in the Users/Group section.
103103
104104
### Can I exempt or dismiss some of the accounts?
105-
The capability to exempt some accounts that don’t use MFA isn't currently supported.
105+
The capability to exempt some accounts that don’t use MFA isn't currently supported. There are plans to add this capability, and the information can be viewed in our [Important upcoming changes](/azure/defender-for-cloud/upcoming-changes#multiple-changes-to-identity-recommendations) page.
106106
107107
### Are there any limitations to Defender for Cloud's identity and access protections?
108108
There are some limitations to Defender for Cloud's identity and access protections:
109109
110-
- Identity recommendations aren't available for subscriptions with more than 600 accounts. In such cases, these recommendations will be listed under "unavailable assessments".
110+
- Identity recommendations aren't available for subscriptions with more than 6,000 accounts. In these cases, these types of subscriptions will be listed under Not applicable tab.
111111
- Identity recommendations aren't available for Cloud Solution Provider (CSP) partner's admin agents.
112112
- Identity recommendations don’t identify accounts that are managed with a privileged identity management (PIM) system. If you're using a PIM tool, you might see inaccurate results in the **Manage access and permissions** control.
113113

articles/frontdoor/front-door-faq.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,8 @@ sections:
262262
- question: |
263263
Can I set alerts with Azure Front Door?
264264
answer: |
265-
Yes, Azure Front Door does support alerts. Alerts are configured on metrics.
265+
Yes, Azure Front Door does support alerts. Alerts are configured on metrics. For reference to create alerts, please check [Configure alerts](/azure/frontdoor/standard-premium/how-to-monitor-metrics#configure-alerts-in-azure-portal).
266+
And for more information about metrics available on Front Door diagnostic monitoring refer to [Front Door metrics](/azure/frontdoor/front-door-diagnostics#metrics).
266267
267268
additionalContent: |
268269

articles/storage/files/storage-files-monitoring-reference.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ This table shows [Azure Files metrics](../../azure-monitor/essentials/metrics-su
4242

4343
| Metric | Description |
4444
| ------------------- | ----------------- |
45-
| FileCapacity | The amount of File storage used by the storage account. <br/><br/> Unit: Bytes <br/> Aggregation Type: Average <br/> Value example: 1024 |
46-
| FileCount | The number of files in the storage account. <br/><br/> Unit: Count <br/> Aggregation Type: Average <br/> Value example: 1024 |
45+
| FileCapacity | The amount of File storage used by the storage account. <br/><br/> Unit: Bytes <br/> Aggregation Type: Average <br/> Dimensions: FileShare, Tier <br/> Value example: 1024 |
46+
| FileCount | The number of files in the storage account. <br/><br/> Unit: Count <br/> Aggregation Type: Average <br/> Dimensions: FileShare, Tier <br/> Value example: 1024 |
4747
| FileShareCapacityQuota | The upper limit on the amount of storage that can be used by Azure Files Service in bytes. <br/><br/> Unit: Bytes <br/> Aggregation Type: Average <br/> Value example: 1024|
4848
| FileShareCount | The number of file shares in the storage account. <br/><br/> Unit: Count <br/> Aggregation Type: Average <br/> Value example: 1024 |
4949
| FileShareProvisionedIOPS | The number of provisioned IOPS on a file share. This metric is applicable to premium file storage only. <br/><br/> Unit: CountPerSecond <br/> Aggregation Type: Average |

0 commit comments

Comments
 (0)