Skip to content

Commit 6909dfb

Browse files
authored
Merge pull request #198162 from MicrosoftDocs/main
Merge Main to Live, 4 AM
2 parents a4d6f85 + 42eac05 commit 6909dfb

File tree

137 files changed

+2338
-660
lines changed

Some content is hidden

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

137 files changed

+2338
-660
lines changed

articles/active-directory-b2c/identity-provider-google.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,10 @@ To enable sign-in for users with a Google account in Azure Active Directory B2C
4343
1. In the upper-left corner of the page, select the project list, and then select **New Project**.
4444
1. Enter a **Project Name**, select **Create**.
4545
1. Make sure you are using the new project by selecting the project drop-down in the top-left of the screen. Select your project by name, then select **Open**.
46-
1. In the left menu, select **OAuth consent screen**, select **External**, and then select **Create**.
46+
1. In the left menu, select **APIs and services** and then **OAuth consent screen**. Select **External** and then select **Create**.
4747
1. Enter a **Name** for your application.
4848
1. Select a **User support email**.
49+
1. In the **App domain** section, enter a link to your **Application home page**, a link to your **Application privacy policy**, and a link to your **Application terms of service**.
4950
1. In the **Authorized domains** section, enter *b2clogin.com*.
5051
1. In the **Developer contact information** section, enter comma separated emails for Google to notify you about any changes to your project.
5152
1. Select **Save**.
@@ -199,4 +200,4 @@ If the sign-in process is successful, your browser is redirected to `https://jwt
199200
- Check out the Google federation [Live demo](https://github.com/azure-ad-b2c/unit-tests/tree/main/Identity-providers#google), and how to pass Google access token [Live demo](https://github.com/azure-ad-b2c/unit-tests/tree/main/Identity-providers#google-with-access-token)
200201

201202

202-
::: zone-end
203+
::: zone-end

articles/active-directory/develop/workload-identities-overview.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ Here are some ways you can use workload identities:
4545
- Review service principals and applications that are assigned to privileged directory roles in Azure AD using [access reviews for service principals](../privileged-identity-management/pim-create-azure-ad-roles-and-resource-roles-review.md).
4646
- Access Azure AD protected resources without needing to manage secrets (for supported scenarios) using [workload identity federation](workload-identity-federation.md).
4747
- Apply Conditional Access policies to service principals owned by your organization using [Conditional Access for workload identities](../conditional-access/workload-identity.md).
48+
- Secure workload identities with [Identity Protection](../identity-protection/concept-workload-identity-risk.md).
4849

4950
## Next steps
5051

articles/active-directory/manage-apps/ways-users-get-assigned-to-applications.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.reviewer: davidmu
1616

1717
# Understand how users are assigned to apps
1818

19-
This article help you to understand how users get assigned to an application in your tenant.
19+
This article helps you to understand how users get assigned to an application in your tenant.
2020

2121
## How do users get assigned an application in Azure AD?
2222

@@ -34,6 +34,7 @@ There are several ways a user can be assigned an application. Assignment can be
3434
* An administrator enables [Self-service Application Access](./manage-self-service-access.md) to allow a user to add an application using [My Apps](https://support.microsoft.com/account-billing/sign-in-and-start-apps-from-the-my-apps-portal-2f3b1bae-0e5a-4a86-a33e-876fbd2a4510) **Add App** feature, but only **with prior approval from a selected set of business approvers**
3535
* An administrator enables [Self-service Group Management](../enterprise-users/groups-self-service-management.md) to allow a user to join a group that an application is assigned to **without business approval**
3636
* An administrator enables [Self-service Group Management](../enterprise-users/groups-self-service-management.md) to allow a user to join a group that an application is assigned to, but only **with prior approval from a selected set of business approvers**
37+
* One of the application's roles is included in an [entitlement management access package](../governance/entitlement-management-access-package-resources.md), and a user requests or is assigned to that access package
3738
* An administrator assigns a license to a user directly, for a Microsoft service such as [Microsoft 365](https://products.office.com/)
3839
* An administrator assigns a license to a group that the user is a member of, for a Microsoft service such as [Microsoft 365](https://products.office.com/)
3940
* A user [consents to an application](consent-and-permissions-overview.md#user-consent) on behalf of themselves.

articles/application-gateway/private-link-configure.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
---
2-
title: Configure Azure Application Gateway Private Link
2+
title: Configure Azure Application Gateway Private Link (preview)
33
description: This article shows you how to configure Application Gateway Private Link.
44
services: application-gateway
5-
author: greglin
5+
author: greg-lindsay
66
ms.service: application-gateway
77
ms.topic: how-to
88
ms.date: 05/09/2022
99
ms.author: greglin
1010

1111
---
1212

13-
# Configure Azure Application Gateway Private Link
13+
# Configure Azure Application Gateway Private Link (preview)
1414

1515
Application Gateway Private Link allows you to connect your workloads over a private connection spanning across VNets and subscriptions. For more information, see [Application Gateway Private Link](private-link.md).
1616

1717
:::image type="content" source="media/private-link/private-link.png" alt-text="Diagram showing Application Gateway Private Link":::
1818

19+
> [!IMPORTANT]
20+
> Azure Application Gateway Private Link is currently in [public preview](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).
1921
2022
## Configuration options
2123

articles/application-gateway/private-link.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
---
2-
title: Azure Application Gateway Private Link
2+
title: Azure Application Gateway Private Link (preview)
33
description: This article is an overview of Application Gateway Private Link.
44
services: application-gateway
5-
author: greglin
5+
author: greg-lindsay
66
ms.service: application-gateway
77
ms.topic: conceptual
88
ms.date: 05/09/2022
99
ms.author: greglin
1010

1111
---
1212

13-
# Application Gateway Private Link
13+
# Application Gateway Private Link (preview)
1414

1515
Today, you can deploy your critical workloads securely behind Application Gateway, gaining the flexibility of Layer 7 load balancing features. Access to the backend workloads is possible in two ways:
1616

@@ -21,6 +21,8 @@ Private Link for Application Gateway allows you to connect workloads over a priv
2121

2222
:::image type="content" source="media/private-link/private-link.png" alt-text="Diagram showing Application Gateway Private Link":::
2323

24+
> [!IMPORTANT]
25+
> Azure Application Gateway Private Link is currently in [public preview](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).
2426
2527
## Features and capabilities
2628

articles/azure-functions/functions-concurrency.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ ms.author: cachai
1111

1212
This article describes the concurrency behaviors of event-driven triggers in Azure Functions. It also describes a new dynamic model for optimizing concurrency behaviors.
1313

14-
>[!NOTE]
15-
>The dynamic concurrency model is currently in preview. Support for dynamic concurrency is limited to specific binding extensions.
16-
1714
The hosting model for Functions allows multiple function invocations to run concurrently on a single compute instance. For example, consider a case where you have three different functions in your function app, which is scaled out and running on multiple instances. In this scenario, each function processes invocations on each VM instance on which your function app is running. The function invocations on a single instance share the same VM compute resources, such as memory, CPU, and connections. When your app is hosted in a dynamic plan (Consumption or Premium), the platform scales the number of function app instances up or down based on the number of incoming events. To learn more, see [Event Driven Scaling](./Event-Driven-Scaling.md)). When you host your functions in a Dedicated (App Service) plan, you manually configure your instances or [set up an autoscale scheme](dedicated-plan.md#scaling).
1815

1916
Because multiple function invocations can run on each instance concurrently, each function needs to have a way to throttle how many concurrent invocations it's processing at any given time.
@@ -28,7 +25,7 @@ While such concurrency configurations give you control of certain trigger behavi
2825

2926
Ideally, we want the system to allow instances to process as much work as they can while keeping each instance healthy and latencies low, which is what dynamic concurrency is designed to do.
3027

31-
## Dynamic concurrency (preview)
28+
## Dynamic concurrency
3229

3330
Functions now provides a dynamic concurrency model that simplifies configuring concurrency for all function apps running in the same plan.
3431

@@ -74,7 +71,7 @@ When dynamic concurrency is enabled, you'll see dynamic concurrency decisions in
7471

7572
### Extension support
7673

77-
Dynamic concurrency is enabled for a function app at the host level, and any extensions that support dynamic concurrency run in that mode. Dynamic concurrency requires collaboration between the host and individual trigger extensions. For preview, only the listed versions of the following extensions support dynamic concurrency.
74+
Dynamic concurrency is enabled for a function app at the host level, and any extensions that support dynamic concurrency run in that mode. Dynamic concurrency requires collaboration between the host and individual trigger extensions. Only the listed versions of the following extensions support dynamic concurrency.
7875

7976
#### Azure Queues
8077

articles/azure-maps/authentication-best-practices.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
title: Authentication and authorization best practices in Azure Maps
2+
title: Authentication best practices in Azure Maps
33
titleSuffix: Microsoft Azure Maps
4-
description: Learn tips & tricks to optimize the use of Authentication and Authorization in your Azure Maps applications.
4+
description: Learn tips & tricks to optimize the use of Authentication in your Azure Maps applications.
55
author: stevemunk
66
ms.author: v-munksteve
77
ms.date: 05/11/2022
@@ -10,7 +10,7 @@ ms.service: azure-maps
1010
services: azure-maps
1111
---
1212

13-
# Authentication and authorization best practices
13+
# Authentication best practices
1414

1515
The single most important part of your application is its security. No matter how good the user experience might be, if your application isn't secure a hacker can ruin it.
1616

articles/azure-monitor/agents/resource-manager-data-collection-rules.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ The following sample creates an association between an Azure virtual machine and
7878
"contentVersion": "1.0.0.0",
7979
"parameters": {
8080
"vmName": {
81-
"value": "my-windows-vm"
81+
"value": "my-azure-vm"
8282
},
8383
"associationName": {
8484
"value": "my-windows-vm-my-dcr"
@@ -142,7 +142,7 @@ The following sample creates an association between an Azure Arc-enabled server
142142
"contentVersion": "1.0.0.0",
143143
"parameters": {
144144
"vmName": {
145-
"value": "my-windows-vm"
145+
"value": "my-hybrid-vm"
146146
},
147147
"associationName": {
148148
"value": "my-windows-vm-my-dcr"

articles/azure-monitor/essentials/resource-logs-schema.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ The schema for resource logs varies depending on the resource and log category.
9090
| Azure Storage | [Blobs](../../storage/blobs/monitor-blob-storage-reference.md#resource-logs-preview), [Files](../../storage/files/storage-files-monitoring-reference.md#resource-logs-preview), [Queues](../../storage/queues/monitor-queue-storage-reference.md#resource-logs-preview), [Tables](../../storage/tables/monitor-table-storage-reference.md#resource-logs-preview) |
9191
| Azure Stream Analytics |[Job logs](../../stream-analytics/stream-analytics-job-diagnostic-logs.md) |
9292
| Azure Traffic Manager | [Traffic Manager log schema](../../traffic-manager/traffic-manager-diagnostic-logs.md) |
93+
| Azure Video Indexer|[Monitor Azure Video Indexer data reference](/azure/azure-video-indexer/monitor-video-indexer-data-reference)|
9394
| Azure Virtual Network | Schema not available |
9495
| Virtual network gateways | [Logging for Virtual Network Gateways](../../vpn-gateway/troubleshoot-vpn-with-azure-diagnostics.md)|
9596

articles/azure-monitor/logs/custom-fields.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ For example, the sample record below has useful data buried in the event descrip
2525
![Sample extract](media/custom-fields/sample-extract.png)
2626

2727
> [!NOTE]
28-
> In the Preview, you are limited to 100 custom fields in your workspace. This limit will be expanded when this feature reaches general availability.
28+
> In the Preview, you are limited to 500 custom fields in your workspace. This limit will be expanded when this feature reaches general availability.
2929
3030
## Creating a custom field
3131
When you create a custom field, Log Analytics must understand which data to use to populate its value. It uses a technology from Microsoft Research called FlashExtract to quickly identify this data. Rather than requiring you to provide explicit instructions, Azure Monitor learns about the data you want to extract from examples that you provide.

0 commit comments

Comments
 (0)