Skip to content

Commit 10d538a

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-aadroles-understand-roles
2 parents fe4ae1f + 40cf32e commit 10d538a

File tree

58 files changed

+133
-85
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+133
-85
lines changed

articles/active-directory/saas-apps/recurly-tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: active-directory
99
ms.subservice: saas-app-tutorial
1010
ms.workload: identity
1111
ms.topic: tutorial
12-
ms.date: 02/08/2022
12+
ms.date: 04/21/2022
1313
ms.author: jeedes
1414

1515
---
@@ -140,7 +140,7 @@ Follow these steps to configure single sign-on for your **Recurly** site.
140140

141141
a. In **PROVIDER NAME**, select **Azure**.
142142

143-
b. In the **SAML ISSUER ID** textbox, paste the **Identifier URL** value which you have copied from the Azure portal.
143+
b. In the **SAML ISSUER ID** textbox, paste the **Application(Client ID)** value from the Azure portal.
144144

145145
c. In the **LOGIN URL** textbox, paste the **Login URL** value which you have copied from the Azure portal.
146146

articles/active-directory/saas-apps/talentlms-tutorial.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: active-directory
99
ms.subservice: saas-app-tutorial
1010
ms.workload: identity
1111
ms.topic: tutorial
12-
ms.date: 09/14/2021
12+
ms.date: 04/21/2022
1313
ms.author: jeedes
1414
---
1515
# Tutorial: Azure AD SSO integration with TalentLMS
@@ -70,7 +70,7 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
7070
4. On the **Basic SAML Configuration** section, perform the following steps:
7171

7272
a. In the **Identifier (Entity ID)** text box, type a URL using the following pattern:
73-
`http://<tenant-name>.talentlms.com`
73+
`<tenant-name>.talentlms.com`
7474

7575
b. In the **Sign on URL** text box, type a URL using the following pattern:
7676
`https://<tenant-name>.TalentLMSapp.com`
@@ -187,4 +187,4 @@ In this section, you test your Azure AD single sign-on configuration with follow
187187

188188
## Next steps
189189

190-
Once you configure TalentLMS you can enforce session control, which protects exfiltration and infiltration of your organization’s sensitive data in real time. Session control extends from Conditional Access. [Learn how to enforce session control with Microsoft Defender for Cloud Apps](/cloud-app-security/proxy-deployment-any-app).
190+
Once you configure TalentLMS you can enforce session control, which protects exfiltration and infiltration of your organization’s sensitive data in real time. Session control extends from Conditional Access. [Learn how to enforce session control with Microsoft Defender for Cloud Apps](/cloud-app-security/proxy-deployment-any-app).

articles/azure-app-configuration/howto-integrate-azure-managed-service-identity.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,11 @@ The following steps describe how to assign the App Configuration Data Reader rol
8484

8585
1. Select **Add** > **Add role assignment**.
8686

87-
![Access control (IAM) page with Add role assignment menu open.](../../includes/role-based-access-control/media/add-role-assignment-menu-generic.png)
87+
:::image type="content" source="../../includes/role-based-access-control/media/add-role-assignment-menu-generic.png" alt-text="Screenshot showing Access control (IAM) page with Add role assignment menu open.":::
8888

8989
1. On the **Role** tab, select the **App Configuration Data Reader** role.
9090

91-
![Add role assignment page with Role tab selected.](./media/add-role-assignment-role.png)
91+
:::image type="content" source="../../includes/role-based-access-control/media/add-role-assignment-role-generic.png" alt-text="Screenshot showing Add role assignment page with Role tab selected.":::
9292

9393
1. On the **Members** tab, select **Managed identity**, and then select **Select members**.
9494

articles/azure-monitor/agents/data-collection-text-log.md

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,6 @@ A [data collection endpoint (DCE)](../essentials/data-collection-endpoint-overvi
105105
},
106106
"location": {
107107
"type": "string",
108-
"defaultValue": "westus2",
109-
"allowedValues": [
110-
"westus2",
111-
"eastus2",
112-
"eastus2euap"
113-
],
114108
"metadata": {
115109
"description": "Specifies the location in which to create the Data Collection Endpoint."
116110
}
@@ -195,12 +189,6 @@ The [data collection rule (DCR)](../essentials/data-collection-rule-overview.md)
195189
},
196190
"location": {
197191
"type": "string",
198-
"defaultValue": "westus2",
199-
"allowedValues": [
200-
"westus2",
201-
"eastus2",
202-
"eastus2euap"
203-
],
204192
"metadata": {
205193
"description": "Specifies the location in which to create the Data Collection Rule."
206194
}
@@ -250,7 +238,7 @@ The [data collection rule (DCR)](../essentials/data-collection-rule-overview.md)
250238
"logFiles ": [
251239
{
252240
"streams": [
253-
"Custom-MyLogFileFormat "
241+
"Custom-MyLogFileFormat"
254242
],
255243
"filePatterns": [
256244
"C:\\JavaLogs\\*.log"
@@ -268,7 +256,7 @@ The [data collection rule (DCR)](../essentials/data-collection-rule-overview.md)
268256
"Custom-MyLogFileFormat"
269257
],
270258
"filePatterns": [
271-
"/var/*.log"
259+
"//var//*.log"
272260
],
273261
"format": "text",
274262
"settings": {
@@ -327,12 +315,6 @@ The [data collection rule (DCR)](../essentials/data-collection-rule-overview.md)
327315
},
328316
"location": {
329317
"type": "string",
330-
"defaultValue": "westus2",
331-
"allowedValues": [
332-
"westus2",
333-
"eastus2",
334-
"eastus2euap"
335-
],
336318
"metadata": {
337319
"description": "Specifies the location in which to create the Data Collection Rule."
338320
}

articles/azure-monitor/azure-monitor-monitoring-reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,4 +474,4 @@ The following schemas are relevant to action groups, which are part of the notif
474474
## See Also
475475

476476
- See [Monitoring Azure Azure Monitor](monitor-azure-monitor.md) for a description of what Azure Monitor monitors in itself.
477-
- See [Monitoring Azure resources with Azure Monitor](/azure/azure-monitor/insights/monitor-azure-resources) for details on monitoring Azure resources.
477+
- See [Monitoring Azure resources with Azure Monitor](/azure/azure-monitor/essentials/monitor-azure-resource) for details on monitoring Azure resources.

articles/azure-netapp-files/faq-smb.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.workload: storage
66
ms.topic: conceptual
77
author: b-hchen
88
ms.author: anfdocs
9-
ms.date: 04/06/2022
9+
ms.date: 04/21/2022
1010
---
1111
# SMB FAQs for Azure NetApp Files
1212

@@ -75,6 +75,22 @@ Azure NetApp Files supports [`CHANGE_NOTIFY` response](/openspecs/windows_protoc
7575

7676
Azure NetApp Files also supports [`LOCK` response](/openspecs/windows_protocols/ms-smb2/e215700a-102c-450a-a598-7ec2a99cd82c). This response is for the client’s request that comes in the form of a [`LOCK` request](/openspecs/windows_protocols/ms-smb2/6178b960-48b6-4999-b589-669f88e9017d).
7777

78+
## What is the password rotation policy for the Active Directory machine account for SMB volumes?
79+
80+
The Azure NetApp Files service has a policy that automatically updates the password on the Active Directory machine account that is created for SMB volumes. This policy has the following properties:
81+
82+
* Schedule interval: 4 weeks
83+
* Schedule randomization period: 120 minutes
84+
* Schedule: Sunday `@0100`
85+
86+
To see when the password was last updated on the Azure NetApp Files SMB machine account, check the `pwdLastSet` property on the computer account using the [Attribute Editor](create-volumes-dual-protocol.md#access-active-directory-attribute-editor) in the **Active Directory Users and Computers** utility:
87+
88+
![Screenshot that shows the Active Directory Users and Computers utility](../media/azure-netapp-files/active-directory-users-computers-utility.png )
89+
90+
>[!NOTE]
91+
> Due to an interoperability issue with the [April 2022 Monthly Windows Update](
92+
https://support.microsoft.com/topic/april-12-2022-kb5012670-monthly-rollup-cae43d16-5b5d-43ea-9c52-9174177c6277), the policy that automatically updates the Active Directory machine account password for SMB volumes has been suspended until a fix is deployed.
93+
7894
## Next steps
7995

8096
- [FAQs about SMB performance for Azure NetApp Files](azure-netapp-files-smb-performance.md)

articles/azure-signalr/signalr-howto-authorize-application.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,13 @@ The following steps describe how to assign a `SignalR App Server` role to a serv
7272
7373
1. From the [Azure portal](https://portal.azure.com/), navigate to your SignalR resource.
7474

75-
1. Select **Access Control (IAM)**.
75+
1. Select **Access control (IAM)**.
7676

7777
1. Select **Add > Add role assignment**.
7878

7979
:::image type="content" source="../../includes/role-based-access-control/media/add-role-assignment-menu-generic.png" alt-text="Screenshot that shows Access control (IAM) page with Add role assignment menu open.":::
8080

81-
1. On the **Roles** tab, select **SignalR App Server**.
81+
1. On the **Role** tab, select **SignalR App Server**.
8282

8383
1. On the **Members** tab, select **User, group, or service principal**, and then select **Select members**.
8484

articles/azure-signalr/signalr-howto-authorize-managed-identity.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,18 @@ The following steps describe how to assign a `SignalR App Server` role to a syst
5252
5353
1. From the [Azure portal](https://portal.azure.com/), navigate to your SignalR resource.
5454

55-
1. Select **Access Control (IAM)**.
55+
1. Select **Access control (IAM)**.
5656

5757
1. Select **Add > Add role assignment**.
5858

5959
:::image type="content" source="../../includes/role-based-access-control/media/add-role-assignment-menu-generic.png" alt-text="Screenshot that shows Access control (IAM) page with Add role assignment menu open.":::
6060

61-
1. On the **Roles** tab, select **SignalR App Server**.
61+
1. On the **Role** tab, select **SignalR App Server**.
6262

6363
1. On the **Members** tab, select **Managed identity**, and then select **Select members**.
6464

65+
1. Select your Azure subscription.
66+
6567
1. Select **System-assigned managed identity**, search for a virtual machine to which would you'd like to assign the role, and then select it.
6668

6769
1. On the **Review + assign** tab, select **Review + assign** to assign the role.

articles/backup/backup-azure-vms-enhanced-policy.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Back up Azure VMs with Enhanced policy (in preview)
33
description: Learn how to configure Enhanced policy to back up VMs.
44
ms.topic: how-to
5-
ms.date: 03/25/2022
5+
ms.date: 04/12/2022
66
ms.reviewer: geg
77
author: v-amallick
88
ms.service: backup
@@ -19,7 +19,7 @@ Azure Backup now supports _Enhanced policy_ that's needed to support new Azure o
1919
2020
You must enable backup of Trusted Launch VM through enhanced policy only. Enhanced policy provides the following features:
2121

22-
- Supports _Multiple Backups Per Day_. To enroll your subscription for this feature, write to us at [[email protected]](mailto:[email protected]).
22+
- Supports *Multiple Backups Per Day* (in preview).
2323
- Instant Restore tier is zonally redundant using Zone-redundant storage (ZRS) resiliency. See the [pricing details for Enhanced policy storage here](https://azure.microsoft.com/pricing/details/managed-disks/).
2424

2525
:::image type="content" source="./media/backup-azure-vms-enhanced-policy/enhanced-backup-policy-settings.png" alt-text="Screenshot showing the enhanced backup policy options.":::
@@ -57,7 +57,7 @@ Follow these steps:
5757

5858
With backup schedule set to **Hourly**, the default selection for start time is **8 AM**, schedule is **Every 4 hours**, and duration is **24 Hours**. Hourly backup has a minimum RPO of 4 hours and a maximum of 24 hours. You can set the backup schedule to 4, 6, 8, 12, and 24 hours respectively.
5959

60-
Note that Hourly backup frequency is in preview. To enroll your subscription for this feature, write to us at [[email protected]](mailto:[email protected]).
60+
Note that Hourly backup frequency is in preview.
6161

6262
- **Instant Restore**: You can set the retention of recovery snapshot from _1_ to _30_ days. The default value is set to _7_.
6363
- **Retention range**: Options for retention range are auto-selected based on backup frequency you choose. The default retention for daily, weekly, monthly, and yearly backup points are set to 180 days, 12 weeks, 60 months, and 10 years respectively. You can customize these values as required.

articles/backup/backup-support-matrix-iaas.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Support matrix for Azure VM backup
33
description: Provides a summary of support settings and limitations when backing up Azure VMs with the Azure Backup service.
44
ms.topic: conceptual
5-
ms.date: 02/18/2022
5+
ms.date: 04/12/2022
66
ms.custom: references_regions
77
ms.reviewer: geg
88
author: v-amallick
@@ -49,7 +49,7 @@ Monthly/yearly backup| Not supported when backing up with Azure VM extension. On
4949
Automatic clock adjustment | Not supported.<br/><br/> Azure Backup doesn't automatically adjust for daylight saving time changes when backing up a VM.<br/><br/> Modify the policy manually as needed.
5050
[Security features for hybrid backup](./backup-azure-security-feature.md) |Disabling security features isn't supported.
5151
Back up the VM whose machine time is changed | Not supported.<br/><br/> If the machine time is changed to a future date-time after enabling backup for that VM, however even if the time change is reverted, successful backup isn't guaranteed.
52-
Multiple Backups Per Day | Supported, using _Enhanced policy_ (in preview). To enroll your subscription for this feature, write to us at [[email protected]](mailto:[email protected]). <br><br> For hourly backup, the minimum RPO is 4 hours and the maximum is 24 hours. You can set the backup schedule to 4, 6, 8, 12, and 24 hours respectively. Learn about how to [back up an Azure VM using Enhanced policy](backup-azure-vms-enhanced-policy.md).
52+
Multiple Backups Per Day | Supported (in preview), using *Enhanced policy* (in preview). <br><br> For hourly backup, the minimum RPO is 4 hours and the maximum is 24 hours. You can set the backup schedule to 4, 6, 8, 12, and 24 hours respectively. Learn about how to [back up an Azure VM using Enhanced policy](backup-azure-vms-enhanced-policy.md).
5353

5454
## Operating system support (Windows)
5555

0 commit comments

Comments
 (0)