Skip to content

Commit 3bfb647

Browse files
authored
Merge pull request #176829 from MicrosoftDocs/master
Merge master to live, 4AM
2 parents c28a528 + f5c97ee commit 3bfb647

File tree

119 files changed

+2552
-2391
lines changed

Some content is hidden

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

119 files changed

+2552
-2391
lines changed

.github/workflows/stale.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ jobs:
1919
close-pr-label: auto-close
2020
exempt-pr-labels: keep-open
2121
operations-per-run: 1200
22-
ascending: false
22+
ascending: true
23+
start-date: '2020-07-09'
2324
stale-pr-message: >
2425
This pull request has been inactive for at least 14 days.
2526
If you are finished with your changes, don't forget to sign off. See the [contributor guide](https://review.docs.microsoft.com/help/contribute/contribute-how-to-write-pull-request-automation) for instructions.

.openpublishing.publish.config.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -833,6 +833,7 @@
833833
".openpublishing.redirection.security-benchmark.json",
834834
".openpublishing.redirection.synapse-analytics.json",
835835
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
836+
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
836837
"articles/azure-relay/.openpublishing.redirection.relay.json",
837838
"articles/communication-services/.openpublishing.redirection.communication-services.json",
838839
"articles/cosmos-db/.openpublishing.redirection.cosmos-db.json",

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44283,6 +44283,16 @@
4428344283
"redirect_url": "/azure/azure-monitor/best-practices-analysis",
4428444284
"redirect_document_id": false
4428544285
},
44286+
{
44287+
"source_path_from_root": "/articles/azure-monitor/logs/powershell-sample-create-workspace.md",
44288+
"redirect_url": "/azure/azure-monitor/logs/powershell-workspace-configuration",
44289+
"redirect_document_id": false
44290+
},
44291+
{
44292+
"source_path_from_root": "/articles/azure-monitor/logs/examples.md",
44293+
"redirect_url": "/azure/data-explorer/kusto/query/samples?pivots=azuremonitor",
44294+
"redirect_document_id": false
44295+
},
4428644296
{
4428744297
"source_path_from_root": "/articles/load-balancer/tutorial-load-balancer-standard-manage-portal.md",
4428844298
"redirect_url": "/azure/load-balancer/quickstart-load-balancer-standard-public-portal",

articles/active-directory/develop/scenario-protected-web-api-verification-scope-app-roles.md

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.service: active-directory
1010
ms.subservice: develop
1111
ms.topic: conceptual
1212
ms.workload: identity
13-
ms.date: 07/15/2020
13+
ms.date: 10/19/2021
1414
ms.author: jmprieur
1515
ms.custom: aaddev
1616
#Customer intent: As an application developer, I want to learn how to write a protected web API using the Microsoft identity platform for developers.
@@ -23,11 +23,10 @@ This article describes how you can add authorization to your web API. This prote
2323
- Applications on behalf of users who have the right scopes.
2424
- Daemon apps that have the right application roles.
2525

26-
> [!NOTE]
27-
> The code snippets in this article are extracted from the following code samples on GitHub:
28-
>
29-
> - [ASP.NET Core web API incremental tutorial](https://github.com/Azure-Samples/active-directory-dotnet-native-aspnetcore-v2/blob/master/1.%20Desktop%20app%20calls%20Web%20API/TodoListService/Controllers/TodoListController.cs)
30-
> - [ASP.NET web API sample](https://github.com/Azure-Samples/ms-identity-aspnet-webapi-onbehalfof/blob/master/TodoListService/Controllers/TodoListController.cs)
26+
The code snippets in this article are extracted from the following code samples on GitHub:
27+
28+
- [ASP.NET Core web API incremental tutorial](https://github.com/Azure-Samples/active-directory-dotnet-native-aspnetcore-v2/blob/master/1.%20Desktop%20app%20calls%20Web%20API/TodoListService/Controllers/TodoListController.cs)
29+
- [ASP.NET web API sample](https://github.com/Azure-Samples/ms-identity-aspnet-webapi-onbehalfof/blob/master/TodoListService/Controllers/TodoListController.cs)
3130

3231
To protect an ASP.NET or ASP.NET Core web API, you must add the `[Authorize]` attribute to one of the following items:
3332

@@ -44,8 +43,8 @@ To protect an ASP.NET or ASP.NET Core web API, you must add the `[Authorize]` at
4443

4544
But this protection isn't enough. It guarantees only that ASP.NET and ASP.NET Core validate the token. Your API needs to verify that the token used to call the API is requested with the expected claims. These claims in particular need verification:
4645

47-
- The *scopes* if the API is called on behalf of a user.
48-
- The *app roles* if the API can be called from a daemon app.
46+
- The _scopes_ if the API is called on behalf of a user.
47+
- The _app roles_ if the API can be called from a daemon app.
4948

5049
## Verify scopes in APIs called on behalf of users
5150

@@ -231,7 +230,7 @@ public class TodoListController : ApiController
231230
}
232231
```
233232

234-
Below is a simplified version of `ValidateScopes`:
233+
Below is a simplified version of `ValidateScopes`:
235234

236235
```csharp
237236
private void ValidateScopes(IEnumerable<string> acceptedScopes)
@@ -251,7 +250,7 @@ private void ValidateScopes(IEnumerable<string> acceptedScopes)
251250
}
252251
```
253252

254-
For a full version of `ValidateScopes` for ASP.NET Core, [*ScopesRequiredHttpContextExtensions.cs*](https://github.com/AzureAD/microsoft-identity-web/blob/master/src/Microsoft.Identity.Web/Resource/ScopesRequiredHttpContextExtensions.cs)
253+
For a full version of `ValidateScopes` for ASP.NET Core, [_ScopesRequiredHttpContextExtensions.cs_](https://github.com/AzureAD/microsoft-identity-web/blob/master/src/Microsoft.Identity.Web/Resource/ScopesRequiredHttpContextExtensions.cs)
255254

256255
---
257256

@@ -290,7 +289,6 @@ MyController : ApiController
290289

291290
But for this, you'll need to map the Role claim to "roles" in the Startup.cs file:
292291

293-
294292
```CSharp
295293
services.Configure<OpenIdConnectOptions>(OpenIdConnectDefaults.AuthenticationScheme, options =>
296294
{
@@ -318,7 +316,7 @@ public class TodoListController : ApiController
318316
}
319317
```
320318

321-
A simplified version of `ValidateAppRole` is:
319+
A simplified version of `ValidateAppRole` is:
322320

323321
```csharp
324322
private void ValidateAppRole(string appRole)
@@ -338,7 +336,7 @@ private void ValidateAppRole(string appRole)
338336
}
339337
```
340338

341-
For a full version of `ValidateAppRole` for ASP.NET Core, see [*RolesRequiredHttpContextExtensions.cs*](https://github.com/AzureAD/microsoft-identity-web/blob/master/src/Microsoft.Identity.Web/Resource/RolesRequiredHttpContextExtensions.cs) code.
339+
For a full version of `ValidateAppRole` for ASP.NET Core, see [_RolesRequiredHttpContextExtensions.cs_](https://github.com/AzureAD/microsoft-identity-web/blob/master/src/Microsoft.Identity.Web/Resource/RolesRequiredHttpContextExtensions.cs) code.
342340
343341
---
344342

@@ -367,7 +365,7 @@ If you are using Microsoft.Identity.Web on ASP.NET core, you'll need to declare
367365
System.UnauthorizedAccessException: IDW10201: Neither scope or roles claim was found in the bearer token.
368366
```
369367

370-
To avoid this exception, set the `AllowWebApiToBeAuthorizedByACL` configuration property to true, in the appsettings.json or programmatically.
368+
To avoid this exception, set the `AllowWebApiToBeAuthorizedByACL` configuration property to true, in the appsettings.json or programmatically.
371369

372370
```Json
373371
{

articles/active-directory/enterprise-users/directory-delete-howto.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.service: active-directory
1010
ms.subservice: enterprise-users
1111
ms.workload: identity
1212
ms.topic: how-to
13-
ms.date: 10/13/2021
13+
ms.date: 10/20/2021
1414
ms.author: curtand
1515
ms.reviewer: addimitu
1616
ms.custom: it-pro
@@ -23,8 +23,9 @@ When an Azure AD organization (tenant) is deleted, all resources that are contai
2323

2424
## Prepare the organization
2525

26-
You can't delete a organization in Azure AD until it passes several checks. These checks reduce risk that deleting an Azure AD organization negatively impacts user access, such as the ability to sign in to Microsoft 365 or access resources in Azure. For example, if the organization associated with a subscription is unintentionally deleted, then users can't access the Azure resources for that subscription. The following conditions are checked:
26+
You can't delete a organization in Azure AD until it passes several checks. These checks reduce risk that deleting an Azure AD organization negatively impacts user access, such as the ability to sign in to Microsoft 365 or access resources in Azure. For example, if the organization associated with a subscription is unintentionally deleted, then users can't access the Azure resources for that subscription. The following conditions should be checked:
2727

28+
* You must have paid all outstanding invoices and amounts due or overdue.
2829
* There can be no users in the Azure AD tenant except one global administrator who is to delete the organization. Any other users must be deleted before the organization can be deleted. If users are synchronized from on-premises, then sync must first be turned off, and the users must be deleted in the cloud organization using the Azure portal or Azure PowerShell cmdlets.
2930
* There can be no applications in the organization. Any applications must be removed before the organization can be deleted.
3031
* There can be no multi-factor authentication providers linked to the organization.

articles/active-directory/hybrid/reference-connect-version-history.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,14 @@ The Azure Active Directory (Azure AD) team regularly updates Azure AD Connect wi
1717

1818
This article is designed to help you keep track of the versions that have been released, and to understand what the changes are in the latest version.
1919

20+
## Looking for the latest versions?
21+
22+
You can upgrade your AADConnect server from all supported versions with the latest versions:
23+
24+
- If you are using **Windows Server 2016 or newer** you should use ** Azure AD Connect V2.0**. You can download the latest version of Azure AD Connect 2.0 using [this link](https://www.microsoft.com/en-us/download/details.aspx?id=47594). The release notes for the latest V2.0 release are [here](reference-connect-version-history.md#20280)
25+
- If you are still using an **older version of Windows Server** you should use** Azure AD Connect V1.6**. You can download the latest version of Azure AD Connect V1 using [this link](https://www.microsoft.com/download/details.aspx?id=103336). The release notes for the latest V1.6 release are [here](reference-connect-version-history.md#16160)
26+
- We are only applying critical changes to the V1 versions going forward, and you may not find some of the features and fixes for V2 in the V1 releases - so you should upgrade to the V2 version as soon as possible.
27+
2028
This table is a list of related topics:
2129

2230
Topic | Details
@@ -48,11 +56,6 @@ However, if you'd like all the latest features and updates, the best way to see
4856
>Please follow this link to read more about [auto upgrade](how-to-connect-install-automatic-upgrade.md)
4957
5058

51-
## Download links
52-
- If you are using Windows Server 2016 or newer you should use Azure AD Connect V2.0. You can download the latest version of Azure AD Connect 2.0 using [this link](https://www.microsoft.com/en-us/download/details.aspx?id=47594).
53-
- If you are still using an older version of Windows Server you should use Azure AD Connect V1.6. You can download the latest version of Azure AD Connect V1 using [this link](https://www.microsoft.com/download/details.aspx?id=103336).
54-
- We are only applying critical changes to the V1 versions going forward, and you may not find some of the features and fixes for V2 in the V1 releases - so you should upgrade to the V2 version as soon as possible.
55-
5659
## 1.6.16.0
5760
>[!NOTE]
5861
>This is an update release of Azure AD Connect. This version is intended to be used by customers who are running an older version of Windows Server and cannot upgrade their server to Windows Server 2016 or newer at this time. You cannot use this version to update an Azure AD Connect V2.0 server.

articles/advisor/advisor-high-availability-recommendations.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ Azure Advisor checks for any VPN gateways that use a Basic SKU and recommends th
5555
- Custom Ipsec/IKE policy.
5656
- Higher stability and availability.
5757

58+
## Ensure reliable outbound connectivity with VNet NAT
59+
Using default outbound connecitivty provided by a Standard Load Balancer or other Azure resources is not recommended for production workloads as this causes connection failures (also called SNAT port exhaustion). The recommended approach is using a VNet NAT which will prevent any failures of connectivty in this regard. NAT can scale seamlessly to ensure your application is never out ports. [Learn more about VNet NAT](https://docs.microsoft.com/azure/virtual-network/nat-overview).
60+
5861
## Ensure virtual machine fault tolerance (temporarily disabled)
5962

6063
To provide redundancy for your application, we recommend that you group two or more virtual machines in an availability set. Advisor identifies virtual machines that aren't part of an availability set and recommends moving them into one. This configuration ensures that during either planned or unplanned maintenance, at least one virtual machine is available and meets the Azure virtual machine SLA. You can choose to create an availability set for the virtual machine or to add the virtual machine to an existing availability set.
@@ -127,4 +130,4 @@ For more information about Advisor recommendations, see:
127130
* [Advisor cost recommendations](advisor-cost-recommendations.md)
128131
* [Advisor performance recommendations](advisor-performance-recommendations.md)
129132
* [Advisor security recommendations](advisor-security-recommendations.md)
130-
* [Advisor operational excellence recommendations](advisor-operational-excellence-recommendations.md)
133+
* [Advisor operational excellence recommendations](advisor-operational-excellence-recommendations.md)

articles/aks/api-server-authorized-ip-ranges.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ You need the Azure CLI version 2.0.76 or later installed and configured. Run `a
2525

2626
The API server Authorized IP ranges feature has the following limitations:
2727
- On clusters created after API server authorized IP address ranges moved out of preview in October 2019, API server authorized IP address ranges are only supported on the *Standard* SKU load balancer. Existing clusters with the *Basic* SKU load balancer and API server authorized IP address ranges configured will continue work as is but cannot be migrated to a *Standard* SKU load balancer. Those existing clusters will also continue to work if their Kubernetes version or control plane are upgraded. API server authorized IP address ranges are not supported for private clusters.
28-
- This feature is not compatible with clusters that use [Public IP per Node](use-multiple-node-pools.md#assign-a-public-ip-per-node-for-your-node-pools).
28+
- When using this feature with clusters that use [Public IP per Node](use-multiple-node-pools.md#assign-a-public-ip-per-node-for-your-node-pools), those node pools with public IP per node enabled must use public IP prefixes and those prefixes must be added as authorized ranges.
2929

3030
## Overview of API server authorized IP ranges
3131

articles/api-management/api-management-howto-aad-b2c.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ The **Sign-up form: OAuth** widget represents a form used for signing up with OA
112112
[!INCLUDE [api-management-portal-legacy.md](../../includes/api-management-portal-legacy.md)]
113113

114114
> [!NOTE]
115-
> To properly integrate B2C with the legacy developer portal, use **standard v1** user flows, in combination with enabling [password reset](/azure/active-directory-b2c/user-flow-self-service-password-reset) before signing up/signing into a developer account using Azure Active Directory B2C.
115+
> To properly integrate B2C with the legacy developer portal, use **standard v1** user flows, in combination with enabling [password reset](/azure/active-directory-b2c/add-password-reset-policy) before signing up/signing into a developer account using Azure Active Directory B2C.
116116
117117
1. Open a new browser window and go to the legacy developer portal. Click the **Sign up** button.
118118

articles/api-management/api-management-howto-properties.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ms.author: danlep
2929

3030
Plain values or secrets can contain [policy expressions](./api-management-policy-expressions.md). For example, the expression `@(DateTime.Now.ToString())` returns a string containing the current date and time.
3131

32-
For details about the named value attributes, see the API Management [REST API reference](/rest/api/apimanagement/2020-06-01-preview/namedvalue/createorupdate).
32+
For details about the named value attributes, see the API Management [REST API reference](/rest/api/apimanagement/2021-04-01-preview/named-value/create-or-update).
3333

3434
## Key vault secrets
3535

@@ -202,4 +202,3 @@ To delete a named value, select the name and then select **Delete** from the con
202202
- [Policy expressions](./api-management-policy-expressions.md)
203203

204204
[api-management-send-results]: ./media/api-management-howto-properties/api-management-send-results.png
205-

0 commit comments

Comments
 (0)