Skip to content

Commit 87dec51

Browse files
authored
Merge pull request #196922 from MicrosoftDocs/main
5/03 AM Publish
2 parents 1f2d862 + 89ac276 commit 87dec51

File tree

81 files changed

+641
-878
lines changed

Some content is hidden

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

81 files changed

+641
-878
lines changed

.openpublishing.redirection.azure-monitor.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
"redirect_url": "/azure/azure-monitor/app/overview-dashboard",
66
"redirect_document_id": false
77
},
8+
{
9+
"source_path_from_root": "/articles/azure-monitor/essentials/activity-logs-insights.md",
10+
"redirect_url": "/azure/azure-monitor/essentials/activity-log",
11+
"redirect_document_id": false
12+
},
813
{
914
"source_path_from_root": "/articles/application-insights/app-insights-performance-counters.md",
1015
"redirect_url": "/azure/azure-monitor/app/performance-counters",
@@ -59,6 +64,16 @@
5964
"source_path_from_root": "/articles/azure-monitor/logs/data-ingestion-from-file.md",
6065
"redirect_url": "/azure/azure-monitor/agents/data-sources-custom-logs",
6166
"redirect_document_id": false
67+
},
68+
{
69+
"source_path_from_root": "/articles/azure-monitor/alerts/itsmc-service-manager-script.md",
70+
"redirect_url": "/azure/azure-monitor/alerts/itsmc-connections.md",
71+
"redirect_document_id": false
72+
},
73+
{
74+
"source_path_from_root": "/articles/azure-monitor/alerts/itsmc-connections-scsm.md" ,
75+
"redirect_url": "/azure/azure-monitor/alerts/itsmc-connections.md",
76+
"redirect_document_id": false
6277
}
6378
]
6479
}

articles/active-directory/conditional-access/concept-conditional-access-cloud-apps.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,8 @@ The Microsoft Azure Management application includes multiple services.
133133
134134
For more information on how to set up a sample policy for Microsoft Azure Management, see [Conditional Access: Require MFA for Azure management](howto-conditional-access-policy-azure-management.md).
135135

136-
For Azure Government, you should target the Azure Government Cloud Management API application.
136+
>[!NOTE]
137+
>For Azure Government, you should target the Azure Government Cloud Management API application.
137138
138139
### Other applications
139140

articles/active-directory/conditional-access/concept-conditional-access-users-groups.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ The following options are available to exclude when creating a Conditional Acces
6262
- Directory roles
6363
- Allows administrators to select specific Azure AD directory roles used to determine assignment. For example, organizations may create a more restrictive policy on users assigned the global administrator role.
6464
- Users and groups
65-
- Allows targeting of specific sets of users. For example, organizations can select a group that contains all members of the HR department when an HR app is selected as the cloud app. A group can be any type of group in Azure AD, including dynamic or assigned security and distribution groups.
65+
- Allows targeting of specific sets of users. For example, organizations can select a group that contains all members of the HR department when an HR app is selected as the cloud app. A group can be any type of group in Azure AD, including dynamic or assigned security and distribution groups. Policy will be applied to nested users and groups.
6666

6767
### Preventing administrator lockout
6868

articles/active-directory/conditional-access/howto-conditional-access-policy-risk.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@ ms.collection: M365-identity-device-management
1919

2020
Most users have a normal behavior that can be tracked, when they fall outside of this norm it could be risky to allow them to just sign in. You may want to block that user or maybe just ask them to perform multi-factor authentication to prove that they are really who they say they are.
2121

22-
A sign-in risk represents the probability that a given authentication request isn't authorized by the identity owner. Organizations with Azure AD Premium P2 licenses can create Conditional Access policies incorporating [Azure AD Identity Protection sign-in risk detections](../identity-protection/concept-identity-protection-risks.md#sign-in-risk).
22+
A sign-in risk represents the probability that a given authentication request isn't authorized by the identity owner. Organizations with Azure AD Premium P2 licenses can create Conditional Access policies incorporating [Azure AD Identity Protection sign-in risk detections](../identity-protection/concept-identity-protection-risks.md#sign-in-risk).
2323

2424
There are two locations where this policy may be configured, Conditional Access and Identity Protection. Configuration using a Conditional Access policy is the preferred method providing more context including enhanced diagnostic data, report-only mode integration, Graph API support, and the ability to utilize other Conditional Access attributes in the policy.
2525

26+
The Sign-in risk-based policy protects users from registering MFA in risky sessions. For example. If the users are not registered for MFA, their risky sign-ins will get blocked and presented with the AADSTS53004 error.
27+
2628
## Template deployment
2729

2830
Organizations can choose to deploy this policy using the steps outlined below or using the [Conditional Access templates (Preview)](concept-conditional-access-policy-common.md#conditional-access-templates-preview).

articles/active-directory/devices/howto-vm-sign-in-azure-ad-windows.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ The AADLoginForWindows extension must install successfully in order for the VM t
286286
1. The Device State can be viewed by running `dsregcmd /status`. The goal is for Device State to show as `AzureAdJoined : YES`.
287287

288288
> [!NOTE]
289-
> Azure AD join activity is captured in Event viewer under the `User Device Registration\Admin` log.
289+
> Azure AD join activity is captured in Event viewer under the `User Device Registration\Admin` log at `Event Viewer (local)\Applications` and `Services Logs\Windows\Microsoft\User Device Registration\Admin`.
290290
291291
If the AADLoginForWindows extension fails with certain error code, you can perform the following steps:
292292

articles/active-directory/external-identities/b2b-direct-connect-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Then Contoso adds the Fabrikam organization and configures the following **Organ
6666
- Allow all Contoso users and groups to have outbound access to Fabrikam using B2B direct connect.
6767
- Allow Contoso B2B direct connect users to have outbound access to all Fabrikam applications.
6868

69-
For this scenario to work, Fabrikam also needs to allow B2B direct connect with Contoso by configuring these same cross-tenant access settings for Contoso and for their own users and applications. Contoso users who manage Teams shared channels in your organizations will be able to add Fabrikam users by searching for their full Fabrikam email addresses.
69+
For this scenario to work, Fabrikam also needs to allow B2B direct connect with Contoso by configuring these same cross-tenant access settings for Contoso and for their own users and applications. When configuration is complete, Contoso users who manage Teams shared channels will be able to add Fabrikam users by searching for their full Fabrikam email addresses.
7070

7171
### Example 2: Enable B2B direct connect with Fabrikam's Marketing group only
7272

@@ -77,7 +77,7 @@ Starting from the example above, Contoso could also choose to allow only the Fab
7777
- Allow all Contoso users and groups to have outbound access to Fabrikam using B2B direct connect.
7878
- Allow Contoso B2B direct connect users to have outbound access to all Fabrikam applications.
7979

80-
Fabrikam will also need to configure their outbound cross-tenant access settings so that their Marketing group is allowed to collaborate with Contoso through B2B direct connect. Contoso users who manage Teams shared channels in your organizations will be able to add only Fabrikam Marketing group users by searching for their full Fabrikam email addresses.
80+
Fabrikam will also need to configure their outbound cross-tenant access settings so that their Marketing group is allowed to collaborate with Contoso through B2B direct connect. When configuration is complete, Contoso users who manage Teams shared channels will be able to add only Fabrikam Marketing group users by searching for their full Fabrikam email addresses.
8181

8282
## Authentication
8383

articles/active-directory/verifiable-credentials/get-started-request-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: karenhoran
88
ms.service: active-directory
99
ms.topic: how-to
1010
ms.subservice: verifiable-credentials
11-
ms.date: 10/08/2021
11+
ms.date: 05/03/2022
1212
ms.author: barclayn
1313

1414
#Customer intent: As an administrator, I am trying to learn how to use the Request Service API and integrate it into my business application.

articles/active-directory/verifiable-credentials/verifiable-credentials-configure-issuer.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: barclayn
77
manager: karenhoran
88
ms.author: barclayn
99
ms.topic: tutorial
10-
ms.date: 10/08/2021
10+
ms.date: 05/03/2022
1111
# Customer intent: As an enterprise, we want to enable customers to manage information about themselves by using verifiable credentials.
1212

1313
---
@@ -206,7 +206,7 @@ Now that you have a new credential, you're going to gather some information abou
206206
The sample application is available in .NET, and the code is maintained in a GitHub repository. Download the sample code from [GitHub](https://github.com/Azure-Samples/active-directory-verifiable-credentials-dotnet), or clone the repository to your local machine:
207207

208208

209-
```bash
209+
```
210210
git clone https://github.com/Azure-Samples/active-directory-verifiable-credentials-dotnet.git
211211
```
212212
@@ -277,15 +277,15 @@ The following JSON demonstrates a complete *appsettings.json* file:
277277

278278
Now you're ready to issue your first verified credential expert card by running the sample application.
279279

280-
1. From Visual Studio Code, run the *Verifiable_credentials_DotNet* project. Or, from the command shell, run the following commands:
280+
1. From Visual Studio Code, run the *Verifiable_credentials_DotNet* project. Or, from your operating system's command line, run:
281281

282-
```bash
282+
```
283283
cd active-directory-verifiable-credentials-dotnet/1-asp-net-core-api-idtokenhint dotnet build "AspNetCoreVerifiableCredentials.csproj" -c Debug -o .\\bin\\Debug\\netcoreapp3. dotnet run
284284
```
285285
286-
1. In another terminal, run the following command. This command runs [ngrok](https://ngrok.com/) to set up a URL on 3000, and make it publicly available on the internet.
286+
1. In another command prompt window, run the following command. This command runs [ngrok](https://ngrok.com/) to set up a URL on 5000, and make it publicly available on the internet.
287287
288-
```bash
288+
```
289289
ngrok http 5000
290290
```
291291

articles/aks/azure-ad-rbac.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.date: 03/17/2021
1010

1111
# Control access to cluster resources using Kubernetes role-based access control and Azure Active Directory identities in Azure Kubernetes Service
1212

13-
Azure Kubernetes Service (AKS) can be configured to use Azure Active Directory (AD) for user authentication. In this configuration, you sign in to an AKS cluster using an Azure AD authentication token. Once authenticated, you can use the built-in Kubernetes role-based access control (Kubernetes RBAC) to manage access to namespaces and cluster resources based a user's identity or group membership.
13+
Azure Kubernetes Service (AKS) can be configured to use Azure Active Directory (AD) for user authentication. In this configuration, you sign in to an AKS cluster using an Azure AD authentication token. Once authenticated, you can use the built-in Kubernetes role-based access control (Kubernetes RBAC) to manage access to namespaces and cluster resources based on a user's identity or group membership.
1414

1515
This article shows you how to control access using Kubernetes RBAC in an AKS cluster based on Azure AD group membership. Example groups and users are created in Azure AD, then Roles and RoleBindings are created in the AKS cluster to grant the appropriate permissions to create and view resources.
1616

articles/api-management/api-management-policies.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ More information about policies:
6767
- [Send message to Pub/Sub topic](api-management-dapr-policies.md#pubsub) - uses Dapr runtime to publish a message to a Publish/Subscribe topic.
6868
- [Trigger output binding](api-management-dapr-policies.md#bind) - uses Dapr runtime to invoke an external system via output binding.
6969

70-
## [Graph QL validation policy](graphql-validation-policies.md)
70+
## [GraphQL validation policy](graphql-validation-policies.md)
7171
- [Validate GraphQL request](graphql-validation-policies.md#validate-graphql-request) - Validates and authorizes a request to a GraphQL API.
7272

7373
## [Transformation policies](api-management-transformation-policies.md)
@@ -94,4 +94,4 @@ For more information about working with policies, see:
9494

9595
+ [Tutorial: Transform and protect your API](transform-api.md)
9696
+ [Set or edit policies](set-edit-policies.md)
97-
+ [Policy samples](./policies/index.md)
97+
+ [Policy samples](./policies/index.md)

0 commit comments

Comments
 (0)