Skip to content

Commit b62d371

Browse files
committed
resolving merge conflict
2 parents 3132cb9 + 6e85608 commit b62d371

File tree

75 files changed

+676
-677
lines changed

Some content is hidden

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

75 files changed

+676
-677
lines changed

articles/active-directory/authentication/concept-system-preferred-multifactor-authentication.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ When a user signs in, the authentication process checks which authentication met
103103
1. [Telephony](concept-authentication-phone-options.md)<sup>2</sup>
104104

105105
<sup>1</sup> Includes hardware or software TOTP from Microsoft Authenticator, Authenticator Lite, or third-party applications.
106-
<sup>2</sup> Includes SMS and voice calls.
107106

107+
<sup>2</sup> Includes SMS and voice calls.
108108

109109
### How does system-preferred MFA affect AD FS or NPS extension?
110110

@@ -113,6 +113,7 @@ System-preferred MFA doesn't affect users who sign in by using Active Directory
113113
### What happens for users who aren't specified in the Authentication methods policy but enabled in the legacy MFA tenant-wide policy?
114114

115115
The system-preferred MFA also applies for users who are enabled for MFA in the legacy MFA policy.
116+
116117
:::image type="content" border="true" source="./media/how-to-mfa-number-match/legacy-settings.png" alt-text="Screenshot of legacy MFA settings.":::
117118

118119
## Next steps

articles/active-directory/authentication/howto-registration-mfa-sspr-combined.md

Lines changed: 4 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -17,40 +17,15 @@ ms.collection: M365-identity-device-management
1717
---
1818
# Enable combined security information registration in Azure Active Directory
1919

20-
Before combined registration, users registered authentication methods for Azure AD Multi-Factor Authentication and self-service password reset (SSPR) separately. People were confused that similar methods were used for Azure AD Multi-Factor Authentication and SSPR but they had to register for both features. Now, with combined registration, users can register once and get the benefits of both Azure AD Multi-Factor Authentication and SSPR.
20+
Before combined registration, users registered authentication methods for Azure AD Multi-Factor Authentication and self-service password reset (SSPR) separately. Users were confused that similar methods were used for Azure AD Multi-Factor Authentication and SSPR but they had to register for both features. Now, with combined registration, users can register once and get the benefits of both Azure AD Multi-Factor Authentication and SSPR.
2121

2222
> [!NOTE]
23-
> Effective Oct. 1st, 2022, we will begin to enable combined registration for all users in Azure AD tenants created before August 15th, 2020. Tenants created after this date are enabled with combined registration.
23+
> Effective Mar. 14th, 2023 combined registration is now the default MFA and SSPR registration experience for all organizations.
2424
25-
To make sure you understand the functionality and effects before you enable the new experience, see the [Combined security information registration concepts](concept-registration-mfa-sspr-combined.md).
25+
To help you understand the functionality and effects of the new experience, see the [Combined security information registration concepts](concept-registration-mfa-sspr-combined.md).
2626

2727
![Combined security information registration enhanced experience](media/howto-registration-mfa-sspr-combined/combined-security-info-more-required.png)
2828

29-
## Enable combined registration
30-
31-
To enable combined registration, complete these steps:
32-
33-
1. Sign in to the Azure portal as a user administrator or global administrator.
34-
2. Go to **Azure Active Directory** > **User settings** > **Manage user feature settings**.
35-
3. Under **Users can use the combined security information registration experience**, choose to enable for a **Selected** group of users or for **All** users.
36-
37-
![Enable the combined security info experience for users](media/howto-registration-mfa-sspr-combined/enable-the-combined-security-info.png)
38-
39-
> [!IMPORTANT]
40-
> If your Azure tenant has already been enabled for combined registration, you might not see the configuration option for **Users can use the combined security information registration experience** or even see it grayed out.
41-
42-
> [!NOTE]
43-
> After you enable combined registration, users who register or confirm their phone number or mobile app through the new experience can use them for Azure AD Multi-Factor Authentication and SSPR, if those methods are enabled in the Azure AD Multi-Factor Authentication and SSPR policies.
44-
>
45-
> If you then disable this experience, users who go to the previous SSPR registration page at `https://aka.ms/ssprsetup` are required to perform multi-factor authentication before they can access the page.
46-
47-
If you have configured the *Site to Zone Assignment List* in Internet Explorer, the following sites have to be in the same zone:
48-
49-
* *[https://login.microsoftonline.com](https://login.microsoftonline.com)*
50-
* *[https://Login.windows.net](https://login.windows.net)*
51-
* *[https://mysignins.microsoft.com](https://mysignins.microsoft.com)*
52-
* *[https://account.activedirectory.windowsazure.com](https://account.activedirectory.windowsazure.com)*
53-
5429
## Conditional Access policies for combined registration
5530

5631
To secure when and how users register for Azure AD Multi-Factor Authentication and self-service password reset, you can use user actions in Conditional Access policy. This functionality may be enabled in organizations that want users to register for Azure AD Multi-Factor Authentication and SSPR from a central location, such as a trusted network location during HR onboarding.
@@ -91,6 +66,6 @@ Complete the following steps to create a policy that applies to all selected use
9166

9267
If you need help, see [troubleshoot combined security info registration](howto-registration-mfa-sspr-combined-troubleshoot.md) or learn [What is the location condition in Azure AD Conditional Access?](../conditional-access/location-condition.md)
9368

94-
Once users are enabled for combined registration, you can then [enable self-service password reset](tutorial-enable-sspr.md) and [enable Azure AD Multi-Factor Authentication](tutorial-enable-azure-mfa.md).
69+
Review how you can [enable self-service password reset](tutorial-enable-sspr.md) and [enable Azure AD Multi-Factor Authentication](tutorial-enable-azure-mfa.md) in your tenant.
9570

9671
If needed, learn how to [force users to re-register authentication methods](howto-mfa-userdevicesettings.md#manage-user-authentication-options).

articles/aks/enable-host-encryption.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@ This feature can only be set at cluster creation or node pool creation time.
2424
2525
### Prerequisites
2626

27-
- Make sure you have the CLI extension v2.23 or higher version installed.
27+
- Ensure you have the CLI extension v2.23 or higher version installed.
2828

2929
### Limitations
3030

3131
- Can only be enabled on new node pools.
3232
- Can only be enabled in [Azure regions][supported-regions] that support server-side encryption of Azure managed disks and only with specific [supported VM sizes][supported-sizes].
33-
- Requires an AKS cluster and node pool based on Virtual Machine Scale Sets as *VM set type*.
33+
- Requires an AKS cluster and node pool based on Virtual Machine Scale Sets(VMSS) as *VM set type*.
3434

3535
## Use host-based encryption on new clusters
3636

37-
Configure the cluster agent nodes to use host-based encryption when the cluster is created.
37+
Configure the cluster agent nodes to use host-based encryption when the cluster is created.
3838

3939
```azurecli-interactive
4040
az aks create --name myAKSCluster --resource-group myResourceGroup -s Standard_DS2_v2 -l westus2 --enable-encryption-at-host
@@ -52,13 +52,11 @@ az aks nodepool add --name hostencrypt --cluster-name myAKSCluster --resource-gr
5252

5353
If you want to create new node pools without the host-based encryption feature, you can do so by omitting the `--enable-encryption-at-host` parameter.
5454

55-
> [!NOTE]
56-
> Once you've enabled host-based encryption, make sure you provide the proper permissions to grant access to your Azure Key Vault keys. For more information, see [Full control of your keys][full-control-keys] and [Built-in roles for Key Vault data plane operations][akv-built-in-roles].
57-
5855
## Next steps
5956

60-
- Review [best practices for AKS cluster security][best-practices-security].
61-
- Read more about [host-based encryption](../virtual-machines/disk-encryption.md#encryption-at-host---end-to-end-encryption-for-your-vm-data).
57+
Review [best practices for AKS cluster security][best-practices-security]
58+
Read more about [host-based encryption](../virtual-machines/disk-encryption.md#encryption-at-host---end-to-end-encryption-for-your-vm-data).
59+
6260

6361
<!-- LINKS - external -->
6462

articles/aks/node-upgrade-github-actions.md

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ This article also assumes you have a [GitHub][github] account to create your act
4141
`cron` is a utility that allows you to run a set of commands, or job, on an automated schedule. To create job to update your AKS nodes on an automated schedule, you'll need a repository to host your actions. Usually, GitHub actions are configured in the same repository as your application, but you can use any repository. For this article we'll be using your [profile repository][profile-repository]. If you don't have one, create a new repository with the same name as your GitHub username.
4242

4343
1. Navigate to your repository on GitHub
44-
1. Click on the **Actions** tab at the top of the page.
45-
1. If you already set up a workflow in this repository, you'll be directed to the list of completed runs, in this case, click on the **New Workflow** button. If this is your first workflow in the repository, GitHub will present you with some project templates, click on the **Set up a workflow yourself** link below the description text.
46-
1. Change the workflow `name` and `on` tags similar to the below. GitHub Actions use the same [POSIX cron syntax][cron-syntax] as any Linux-based system. In this schedule, we're telling the workflow to run every 15 days at 3am.
44+
2. Select the **Actions** tab at the top of the page.
45+
3. If you already set up a workflow in this repository, you'll be directed to the list of completed runs, in this case, select the **New Workflow** button. If this is your first workflow in the repository, GitHub will present you with some project templates, select the **Set up a workflow yourself** link below the description text.
46+
4. Change the workflow `name` and `on` tags similar to the below. GitHub Actions use the same [POSIX cron syntax][cron-syntax] as any Linux-based system. In this schedule, we're telling the workflow to run every 15 days at 3am.
4747

4848
```yml
4949
name: Upgrade cluster node images
@@ -52,7 +52,7 @@ This article also assumes you have a [GitHub][github] account to create your act
5252
- cron: '0 3 */15 * *'
5353
```
5454
55-
1. Create a new job using the below. This job is named `upgrade-node`, runs on an Ubuntu agent, and will connect to your Azure CLI account to execute the needed steps to upgrade the nodes.
55+
5. Create a new job using the below. This job is named `upgrade-node`, runs on an Ubuntu agent, and will connect to your Azure CLI account to execute the needed steps to upgrade the nodes.
5656

5757
```yml
5858
name: Upgrade cluster node images
@@ -73,15 +73,15 @@ In the `steps` key, you'll define all the work the workflow will execute to upgr
7373
Download and sign in to the Azure CLI.
7474

7575
1. On the right-hand side of the GitHub Actions screen, find the *marketplace search bar* and type **"Azure Login"**.
76-
1. You'll get as a result, an Action called **Azure Login** published **by Azure**:
76+
2. You'll get as a result, an Action called **Azure Login** published **by Azure**:
7777

7878
:::image type="content" source="media/node-upgrade-github-actions/azure-login-search.png" alt-text="Search results showing two lines, the first action is called 'Azure Login' and the second 'Azure Container Registry Login'":::
7979

80-
1. Click on **Azure Login**. On the next screen, click the **copy icon** in the top right of the code sample.
80+
3. Select **Azure Login**. On the next screen, select the **copy icon** in the top right of the code sample.
8181

82-
:::image type="content" source="media/node-upgrade-github-actions/azure-login.png" alt-text="Azure Login action result pane with code sample below, red square around a copy icon highlights the click spot":::
82+
:::image type="content" source="media/node-upgrade-github-actions/azure-login.png" alt-text="Azure Login action result pane with code sample below, red square around a copy icon highlights the select spot":::
8383

84-
1. Paste the following under the `steps` key:
84+
4. Paste the following under the `steps` key:
8585

8686
```yml
8787
name: Upgrade cluster node images
@@ -101,7 +101,10 @@ Download and sign in to the Azure CLI.
101101
creds: ${{ secrets.AZURE_CREDENTIALS }}
102102
```
103103

104-
1. From the Azure CLI, run the following command to generate a new username and password.
104+
5. From the Azure CLI, run the following command to generate a new username and password.
105+
106+
> [!NOTE]
107+
> This example creates the `Contributor` role at the *Subscription* scope. You may provide the role and scope that meets your needs. For more information, see [Azure built-in roles][azure-built-in-roles] and [Azure RBAC scope levels][azure-rbac-scope-levels].
105108

106109
```azurecli-interactive
107110
az ad sp create-for-rbac --role Contributor --scopes /subscriptions/{subscriptionID} -o json
@@ -124,13 +127,13 @@ Download and sign in to the Azure CLI.
124127
}
125128
```
126129

127-
1. **In a new browser window** navigate to your GitHub repository and open the **Settings** tab of the repository. Click **Secrets** then, click on **New Repository Secret**.
128-
1. For *Name*, use `AZURE_CREDENTIALS`.
129-
1. For *Value*, add the entire contents from the output of the previous step where you created a new username and password.
130+
6. **In a new browser window** navigate to your GitHub repository and open the **Settings** tab of the repository. Select **Secrets** then, select **New Repository Secret**.
131+
7. For *Name*, use `AZURE_CREDENTIALS`.
132+
8. For *Value*, add the entire contents from the output of the previous step where you created a new username and password.
130133

131134
:::image type="content" source="media/node-upgrade-github-actions/azure-credential-secret.png" alt-text="Form showing AZURE_CREDENTIALS as secret title, and the output of the executed command pasted as JSON":::
132135

133-
1. Click **Add Secret**.
136+
9. Select **Add Secret**.
134137

135138
The CLI used by your action will be logged to your Azure account and ready to run commands.
136139

@@ -140,7 +143,7 @@ To create the steps to execute Azure CLI commands.
140143

141144
:::image type="content" source="media/node-upgrade-github-actions/azure-cli-action.png" alt-text="Search result for 'Azure CLI Action' with first result being shown as made by Azure":::
142145

143-
1. Click the copy button on the *GitHub marketplace result* and paste the contents of the action in the main editor, below the *Azure Login* step, similar to the following:
146+
1. Select the copy button on the *GitHub marketplace result* and paste the contents of the action in the main editor, below the *Azure Login* step, similar to the following:
144147

145148
```yml
146149
name: Upgrade cluster node images
@@ -168,7 +171,7 @@ To create the steps to execute Azure CLI commands.
168171
> You can decouple the `-g` and `-n` parameters from the command by adding them to secrets similar to the previous steps. Replace the `{resourceGroupName}` and `{aksClusterName}` placeholders by their secret counterparts, for example `${{secrets.RESOURCE_GROUP_NAME}}` and `${{secrets.AKS_CLUSTER_NAME}}`
169172

170173
1. Rename the file to `upgrade-node-images`.
171-
1. Click **Start Commit**, add a message title, and save the workflow.
174+
1. Select **Start Commit**, add a message title, and save the workflow.
172175

173176
Once you create the commit, the workflow will be saved and ready for execution.
174177

@@ -226,4 +229,6 @@ jobs:
226229
[system-pools]: use-system-pools.md
227230
[spot-pools]: spot-node-pool.md
228231
[use-multiple-node-pools]: use-multiple-node-pools.md
229-
[auto-upgrade-node-image]: auto-upgrade-node-image.md
232+
[auto-upgrade-node-image]: auto-upgrade-node-image.md
233+
[azure-built-in-roles]: ../role-based-access-control/built-in-roles.md
234+
[azure-rbac-scope-levels]: ../role-based-access-control/scope-overview.md#scope-format

articles/azure-government/documentation-government-csp-list.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ Below you can find a list of all the authorized Cloud Solution Providers (CSPs),
115115
|[Competitive Innovations, LLC](https://www.cillc.com)|
116116
|[CompuNet Inc.](https://compunet.biz/)|
117117
|[Computer Solutions Inc.](http://cs-inc.co/)|
118-
|[Computex Technology Solutions](http://www.computex-inc.com/)|
119118
|[Communication Square LLC](https://www.communicationsquare.com)|
120119
|[ConvergeOne](https://www.convergeone.com)|
121120
|[Copper River Technologies, LLC](http://www.copperrivertech.com/)|
@@ -149,7 +148,7 @@ Below you can find a list of all the authorized Cloud Solution Providers (CSPs),
149148
|[Dell Federal Services](https://www.dellemc.com/en-us/industry/federal/federal-government-it.htm#)|
150149
|[Dell Marketing LP](https://www.dell.com/)|
151150
|[Delphi Technology Solutions](https://delphi-ts.com/)|
152-
|[Derek Coleman & Associates Corporation](https://www.dcassociatesgroup.com/index.html)|
151+
|[Derek Coleman & Associates Corporation](https://www.dcassociatesgroup.com/)|
153152
|[Developing Today LLC](https://www.developingtoday.net/)|
154153
|[DevHawk, LLC](https://www.devhawk.io)|
155154
|Diamond Capture Associates LLC|
@@ -326,7 +325,6 @@ Below you can find a list of all the authorized Cloud Solution Providers (CSPs),
326325
|[PA-Group](https://pa-group.us/)|
327326
|[Palecek Consulting Group](https://www.pcgit.net)|
328327
|[Pangea Group Inc.](http://www.pangea-group.com)|
329-
|[Parachute Technology](https://www.parachutech.com)|
330328
|[Paragon Software Solutions, Inc.](http://www.paragonhq.com/)|
331329
|[Patrocinium Systems, Inc.](https://www.patrocinium.com)|
332330
|[PCM](https://www.pcm.com/)|
@@ -511,8 +509,6 @@ Below you can find a list of all the authorized Cloud Solution Providers (CSPs),
511509
|[Pax8](https://www.pax8.com/en-us/microsoft/)|
512510
|[Synnex](https://www.synnexcorp.com)|
513511
|[Tech Data Corporation](https://www.techdata.com/)|
514-
|[Tech Data Government Solutions, LLC](https://gov.as.techdata.com/en-us/Pages/default.aspx)|
515-
516512

517513
## Approved LSPs
518514

0 commit comments

Comments
 (0)