Skip to content

Commit ca9d772

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into heidist-fix
2 parents f58a68c + 65a4814 commit ca9d772

File tree

292 files changed

+1587
-1515
lines changed

Some content is hidden

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

292 files changed

+1587
-1515
lines changed

articles/active-directory/cloud-infrastructure-entitlement-management/partner-list.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Microsoft verified partners can help you onboard Microsoft Entra Permissions Man
3131
* **Onboarding and Deployment Support**
3232

3333
Partners can guide you through the entire onboarding and deployment process for
34-
ermissions Management across AWS, Azure, and GCP.
34+
Permissions Management across AWS, Azure, and GCP.
3535

3636

3737
## Partner list

articles/active-directory/conditional-access/concept-conditional-access-grant.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ To apply this grant control, the device must be registered in Azure AD, which re
9494
The following client apps support this setting, this list isn't exhaustive and is subject to change::
9595

9696
- Microsoft Azure Information Protection
97-
- Microsoft Bookings
9897
- Microsoft Cortana
9998
- Microsoft Dynamics 365
10099
- Microsoft Edge
@@ -114,7 +113,6 @@ The following client apps support this setting, this list isn't exhaustive and i
114113
- Microsoft PowerPoint
115114
- Microsoft SharePoint
116115
- Microsoft Skype for Business
117-
- Microsoft StaffHub
118116
- Microsoft Stream
119117
- Microsoft Teams
120118
- Microsoft To-Do

articles/active-directory/conditional-access/location-condition.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Location condition in Azure Active Directory Conditional Access
3-
description: Use the location condition to control access based on user physical or network location.
3+
description: Learn about creating location-based Conditional Access policies using Azure AD.
44

55
services: active-directory
66
ms.service: active-directory

articles/active-directory/develop/msal-net-aad-b2c-considerations.md

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: active-directory
99
ms.subservice: develop
1010
ms.topic: conceptual
1111
ms.workload: identity
12-
ms.date: 05/07/2020
12+
ms.date: 02/21/2023
1313
ms.author: henrymbugua
1414
ms.reviewer: saeeda, jeferrie
1515
ms.custom: "devx-track-csharp, aaddev"
@@ -29,9 +29,9 @@ This article applies to MSAL.NET 3.x. For MSAL.NET 2.x, see [Azure AD B2C specif
2929

3030
The authority format for Azure AD B2C is: `https://{azureADB2CHostname}/tfp/{tenant}/{policyName}`
3131

32-
- `azureADB2CHostname` - The name of the Azure AD B2C tenant plus the host. For example, *contosob2c.b2clogin.com*.
33-
- `tenant` - The domain name or the directory (tenant) ID of the Azure AD B2C tenant. For example, *contosob2c.onmicrosoft.com* or a GUID, respectively.
34-
- `policyName` - The name of the user flow or custom policy to apply. For example, a sign-up/sign-in policy like *b2c_1_susi*.
32+
- `azureADB2CHostname` - The name of the Azure AD B2C tenant plus the host. For example, _contosob2c.b2clogin.com_.
33+
- `tenant` - The domain name or the directory (tenant) ID of the Azure AD B2C tenant. For example, _contosob2c.onmicrosoft.com_ or a GUID, respectively.
34+
- `policyName` - The name of the user flow or custom policy to apply. For example, a sign-up/sign-in policy like _b2c_1_susi_.
3535

3636
For more information about Azure AD B2C authorities, see [Set redirect URLs to b2clogin.com](../../active-directory-b2c/b2clogin.md).
3737

@@ -77,7 +77,7 @@ catch (MsalUiRequiredException ex)
7777
.WithAccount(account)
7878
.WithParentActivityOrWindow(ParentActivityOrWindow)
7979
.ExecuteAsync();
80-
}
80+
}
8181
```
8282

8383
In the preceding code snippet:
@@ -116,12 +116,12 @@ private async void EditProfileButton_Click(object sender, RoutedEventArgs e)
116116

117117
For more information on the ROPC flow, see [Sign in with resource owner password credentials grant](v2-oauth-ropc.md).
118118

119-
The ROPC flow is **not recommended** because asking a user for their password in your application is not secure. For more information about this problem, see [What’s the solution to the growing problem of passwords?](https://news.microsoft.com/features/whats-solution-growing-problem-passwords-says-microsoft/).
119+
The ROPC flow is **not recommended** because asking a user for their password in your application isn't secure. For more information about this problem, see [What’s the solution to the growing problem of passwords?](https://news.microsoft.com/features/whats-solution-growing-problem-passwords-says-microsoft/).
120120

121121
By using username/password in an ROPC flow, you sacrifice several things:
122122

123123
- Core tenets of modern identity: The password can be fished or replayed because the shared secret can be intercepted. By definition, ROPC is incompatible with passwordless flows.
124-
- Users who need to do MFA won't be able to sign in (as there is no interaction).
124+
- Users who use multi-factor authentication (MFA) won't be able to sign in as there's no interaction.
125125
- Users won't be able to use single sign-on (SSO).
126126

127127
### Configure the ROPC flow in Azure AD B2C
@@ -137,21 +137,19 @@ AcquireTokenByUsernamePassword(
137137
SecureString password)
138138
```
139139

140-
This `AcquireTokenByUsernamePassword` method takes the following parameters:
140+
The `AcquireTokenByUsernamePassword` method takes the following parameters:
141141

142-
- The *scopes* for which to obtain an access token.
143-
- A *username*.
144-
- A SecureString *password* for the user.
142+
- The _scopes_ for which to obtain an access token.
143+
- A _username_.
144+
- A SecureString _password_ for the user.
145145

146146
### Limitations of the ROPC flow
147147

148148
The ROPC flow **only works for local accounts**, where your users have registered with Azure AD B2C using an email address or username. This flow doesn't work when federating to an external identity provider supported by Azure AD B2C (Facebook, Google, etc.).
149149

150150
## Google auth and embedded webview
151151

152-
If you're using Google as an identity provider, we recommend you use the system browser as Google doesn't allow [authentication from embedded webviews](https://developers.googleblog.com/2016/08/modernizing-oauth-interactions-in-native-apps.html). Currently, `login.microsoftonline.com` is a trusted authority with Google and will work with embedded webview. However, `b2clogin.com` is not a trusted authority with Google, so users will not be able to authenticate.
153-
154-
We'll provide an update to this [issue](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/issues/688) if things change.
152+
If you're using Google as an identity provider, we recommend you use the system browser as Google doesn't allow [authentication from embedded webviews](https://developers.googleblog.com/2016/08/modernizing-oauth-interactions-in-native-apps.html). Currently, `login.microsoftonline.com` is a trusted authority with Google and will work with embedded webview. However, `b2clogin.com` isn't a trusted authority with Google, so users won't be able to authenticate.
155153

156154
## Token caching in MSAL.NET
157155

@@ -186,6 +184,6 @@ For more information about specifying which claims are returned by your user flo
186184

187185
More details about acquiring tokens interactively with MSAL.NET for Azure AD B2C applications are provided in the following sample.
188186

189-
| Sample | Platform | Description|
190-
|------ | -------- | -----------|
191-
|[active-directory-b2c-xamarin-native](https://github.com/Azure-Samples/active-directory-b2c-xamarin-native) | Xamarin iOS, Xamarin Android, UWP | A Xamarin Forms app that uses MSAL.NET to authenticate users via Azure AD B2C and then access a web API with the tokens returned.|
187+
| Sample | Platform | Description |
188+
| ----------------------------------------------------------------------------------------------------------- | --------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- |
189+
| [active-directory-b2c-xamarin-native](https://github.com/Azure-Samples/active-directory-b2c-xamarin-native) | Xamarin iOS, Xamarin Android, UWP | A Xamarin Forms app that uses MSAL.NET to authenticate users via Azure AD B2C and then access a web API with the tokens returned. |

articles/active-directory/enterprise-users/licensing-service-plan-reference.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -424,10 +424,8 @@ The following service plans cannot be assigned together:
424424
| Service Plan Name | GUID |
425425
| --- | --- |
426426
| EXCHANGE_B_STANDARD | 90927877-dcff-4af6-b346-2332c0b15bb7 |
427-
| EXCHANGE_L_STANDARD | d42bdbd6-c335-4231-ab3d-c8f348d5aff5 |
428427
| EXCHANGE_S_ARCHIVE | da040e0a-b393-4bea-bb76-928b3fa1cf5a |
429428
| EXCHANGE_S_DESKLESS | 4a82b400-a79f-41a4-b4e2-e94f5787b113 |
430-
| EXCHANGE_S_ENTERPRISE | efb87545-963c-4e0d-99df-69c6916d9eb0 |
431429
| EXCHANGE_S_ESSENTIALS | 1126bef5-da20-4f07-b45e-ad25d2581aa8 |
432430
| EXCHANGE_S_STANDARD | 9aaf7827-d63c-4b61-89c3-182f06f82e5c |
433431
| EXCHANGE_S_STANDARD_MIDMARKET | fc52cc4b-ed7d-472d-bbe7-b081c23ecc56 |

articles/active-directory/governance/customize-workflow-schedule.md

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,31 +14,30 @@ ms.reviewer: krbain
1414
ms.collection: M365-identity-device-management
1515
---
1616

17-
# Customize the schedule of workflows (Preview)
17+
# Customize the schedule of workflows
1818

1919
Workflows created using Lifecycle Workflows can be fully customized to match the schedule that fits your organization's needs. By default, workflows are scheduled to run every 3 hours, but the interval can be set as frequent as 1 hour, or as infrequent as 24 hours.
2020

2121

22-
## Customize the schedule of workflows using Microsoft Graph
22+
## Customize the schedule of workflows using the Azure portal
23+
24+
Workflows created within Lifecycle Workflows follow the same schedule that you define within the **Workflow Settings** page. To adjust the schedule, you'd follow these steps:
2325

26+
1. Sign in to the [Azure portal](https://portal.azure.com).
2427

25-
First, to view the current schedule interval of your workflows, run the following get call:
28+
1. Select **Identity Governance** on the search bar near the top of the page.
2629

27-
```http
28-
GET https://graph.microsoft.com/beta/identityGovernance/lifecycleWorkflows/settings
29-
```
30+
1. In the left menu, select **Lifecycle workflows (Preview)**.
3031

32+
1. Select **Workflow settings (Preview)** from the Lifecycle workflows overview page.
3133

32-
To customize a workflow in Microsoft Graph, use the following request and body:
33-
```http
34-
PATCH https://graph.microsoft.com/beta/identityGovernance/lifecycleWorkflows/settings
35-
Content-type: application/json
34+
1. On the workflow settings page you can set the schedule of workflows from an interval between 1-24.
35+
:::image type="content" source="media/customize-workflow-schedule/workflow-schedule-settings.png" alt-text="Screenshot of the settings for workflow schedule.":::
36+
1. After setting the workflow schedule, select save.
3637

37-
{
38-
"workflowScheduleIntervalInHours":<Interval between 0-24>
39-
}
38+
## Customize the schedule of workflows using Microsoft Graph
4039

41-
```
40+
To schedule workflow settings using API via Microsoft Graph, see: Update lifecycleManagementSettings [tenant settings for Lifecycle Workflows](/graph/api/resources/identitygovernance-lifecyclemanagementsettings).
4241

4342
## Next steps
4443

65.4 KB
Loading

articles/aks/faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ Starting with version 1.2.0, Azure CNI sets Transparent mode as default for sing
233233

234234
### Bridge mode
235235

236-
As the name suggests, bridge mode Azure CNI, in a "just in time" fashion, will create a L2 bridge named "azure0". All the host side pod `veth` pair interfaces will be connected to this bridge. So Pod-Pod intra VM communication and the remaining traffic goes through this bridge. The bridge in question is a layer 2 virtual device that on its own cannot receive or transmit anything unless you bind one or more real devices to it. For this reason, eth0 of the Linux VM has to be converted into a subordinate to "azure0" bridge. This creates a complex network topology within the Linux VM and as a symptom CNI had to take care of other networking functions like DNS server update and so on.
236+
As the name suggests, bridge mode Azure CNI, in a "just in time" fashion, will create an L2 bridge named "azure0". All the host side pod `veth` pair interfaces will be connected to this bridge. So Pod-Pod intra VM communication and the remaining traffic goes through this bridge. The bridge in question is a layer 2 virtual device that on its own cannot receive or transmit anything unless you bind one or more real devices to it. For this reason, eth0 of the Linux VM has to be converted into a subordinate to "azure0" bridge. This creates a complex network topology within the Linux VM and as a symptom CNI had to take care of other networking functions like DNS server update and so on.
237237

238238
:::image type="content" source="media/faq/bridge-mode.png" alt-text="Bridge mode topology":::
239239

articles/azure-arc/data/create-data-controller-direct-cli.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,14 +170,14 @@ The following command creates the Arc data services extension.
170170
##### [Linux](#tab/linux)
171171

172172
```azurecli
173-
az k8s-extension create --cluster-name ${clusterName} --resource-group ${resourceGroup} --name ${adsExtensionName} --cluster-type connectedClusters --extension-type microsoft.arcdataservices --auto-upgrade false --scope cluster --release-namespace ${namespace} --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper
173+
az k8s-extension create --cluster-name ${clusterName} --resource-group ${resourceGroup} --name ${adsExtensionName} --cluster-type connectedClusters --extension-type microsoft.arcdataservices --auto-upgrade false --auto-upgrade-minor-version false --scope cluster --release-namespace ${namespace} --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper
174174
az k8s-extension show --resource-group ${resourceGroup} --cluster-name ${resourceName} --name ${adsExtensionName} --cluster-type connectedclusters
175175
```
176176

177177
##### [Windows (PowerShell)](#tab/windows)
178178

179179
```azurecli
180-
az k8s-extension create --cluster-name $ENV:clusterName --resource-group $ENV:resourceGroup --name $ENV:adsExtensionName --cluster-type connectedClusters --extension-type microsoft.arcdataservices --auto-upgrade false --scope cluster --release-namespace $ENV:namespace --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper
180+
az k8s-extension create --cluster-name $ENV:clusterName --resource-group $ENV:resourceGroup --name $ENV:adsExtensionName --cluster-type connectedClusters --extension-type microsoft.arcdataservices --auto-upgrade false --auto-upgrade-minor-version false --scope cluster --release-namespace $ENV:namespace --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper
181181
az k8s-extension show --resource-group $ENV:resourceGroup --cluster-name $ENV:clusterName --name $ENV:adsExtensionName --cluster-type connectedclusters
182182
```
183183

@@ -188,13 +188,13 @@ az k8s-extension show --resource-group $ENV:resourceGroup --cluster-name $ENV:cl
188188
Use the below command if you are deploying from your private repository:
189189

190190
```azurecli
191-
az k8s-extension create --cluster-name "<connected cluster name>" --resource-group "<resource group>" --name "<extension name>" --cluster-type connectedClusters --extension-type microsoft.arcdataservices --scope cluster --release-namespace "<namespace>" --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper --config imageCredentials.registry=<registry info> --config imageCredentials.username=<username> --config systemDefaultValues.image=<registry/repo/arc-bootstrapper:<imagetag>> --config-protected imageCredentials.password=$ENV:DOCKER_PASSWORD --debug
191+
az k8s-extension create --cluster-name "<connected cluster name>" --resource-group "<resource group>" --name "<extension name>" --cluster-type connectedClusters -auto-upgrade false --auto-upgrade-minor-version false --extension-type microsoft.arcdataservices --scope cluster --release-namespace "<namespace>" --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper --config imageCredentials.registry=<registry info> --config imageCredentials.username=<username> --config systemDefaultValues.image=<registry/repo/arc-bootstrapper:<imagetag>> --config-protected imageCredentials.password=$ENV:DOCKER_PASSWORD --debug
192192
```
193193

194194
For example:
195195

196196
```azurecli
197-
az k8s-extension create --cluster-name "my-connected-cluster" --resource-group "my-resource-group" --name "arc-data-services" --cluster-type connectedClusters --extension-type microsoft.arcdataservices --scope cluster --release-namespace "arc" --config Microsoft.CustomLocation.ServiceAccount=sa-bootstrapper --config imageCredentials.registry=mcr.microsoft.com --config imageCredentials.username=arcuser --config systemDefaultValues.image=mcr.microsoft.com/arcdata/arc-bootstrapper:latest --config-protected imageCredentials.password=$ENV:DOCKER_PASSWORD --debug
197+
az k8s-extension create --cluster-name "my-connected-cluster" --resource-group "my-resource-group" --name "arc-data-services" --cluster-type connectedClusters -auto-upgrade false --auto-upgrade-minor-version false --extension-type microsoft.arcdataservices --scope cluster --release-namespace "arc" --config Microsoft.CustomLocation.ServiceAccount=sa-bootstrapper --config imageCredentials.registry=mcr.microsoft.com --config imageCredentials.username=arcuser --config systemDefaultValues.image=mcr.microsoft.com/arcdata/arc-bootstrapper:latest --config-protected imageCredentials.password=$ENV:DOCKER_PASSWORD --debug
198198
```
199199

200200

articles/azure-arc/kubernetes/validation-program.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ The following Microsoft-provided Kubernetes distributions and infrastructure pro
1818
| Cluster API Provider on Azure | Release version: [0.4.12](https://github.com/kubernetes-sigs/cluster-api-provider-azure/releases/tag/v0.4.12); Kubernetes version: [1.18.2](https://github.com/kubernetes/kubernetes/releases/tag/v1.18.2) |
1919
| AKS on Azure Stack HCI | Release version: [December 2020 Update](https://github.com/Azure/aks-hci/releases/tag/AKS-HCI-2012); Kubernetes version: [1.18.8](https://github.com/kubernetes/kubernetes/releases/tag/v1.18.8) |
2020
| K8s on Azure Stack Edge | Release version: Azure Stack Edge 2207 (2.2.2037.5375); Kubernetes version: [1.22.6](https://github.com/kubernetes/kubernetes/releases/tag/v1.22.6) |
21+
| AKS Edge Essentials | Release version [1.0.406.0]( https://github.com/Azure/AKS-Edge/releases/tag/1.0.406.0); Kubernetes version [1.24.3](https://github.com/kubernetes/kubernetes/releases/tag/v1.24.3) |
2122

2223
The following providers and their corresponding Kubernetes distributions have successfully passed the conformance tests for Azure Arc-enabled Kubernetes:
2324

0 commit comments

Comments
 (0)