Skip to content

Commit 9dae271

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into additional-prerequisites
2 parents 88808ae + 18f908f commit 9dae271

File tree

102 files changed

+1162
-349
lines changed

Some content is hidden

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

102 files changed

+1162
-349
lines changed

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/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/azure-arc/kubernetes/conceptual-gitops-flux2.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@ description: "This article provides a conceptual overview of GitOps in Azure for
44
keywords: "GitOps, Flux, Kubernetes, K8s, Azure, Arc, AKS, Azure Kubernetes Service, containers, devops"
55
services: azure-arc, aks
66
ms.service: azure-arc
7-
ms.date: 1/24/2022
7+
ms.date: 5/3/2022
88
ms.topic: conceptual
9-
author: csand-msft
10-
ms.author: csand
119
---
1210

1311
# GitOps in Azure
@@ -87,6 +85,12 @@ Each `fluxConfigurations` resource in Azure will be associated in a Kubernetes c
8785
> * `fluxconfig-agent` monitors for new or updated `fluxConfiguration` resources in Azure. The agent requires connectivity to Azure for the desired state of the `fluxConfiguration` to be applied to the cluster. If the agent is unable to connect to Azure, there will be a delay in making the changes in the cluster until the agent can connect. If the cluster is disconnected from Azure for more than 48 hours, then the request to the cluster will time-out, and the changes will need to be re-applied in Azure.
8886
> * Sensitive customer inputs like private key and token/password are stored for less than 48 hours in the Kubernetes Configuration service. If you update any of these values in Azure, assure that your clusters connect with Azure within 48 hours.
8987
88+
## GitOps with Private Link
89+
90+
If you've added support for private link to an Azure Arc-enabled Kubernetes cluster, then the `microsoft.flux` extension works out-of-the-box with communication back to Azure. For connections to your Git repository, Helm repository, or any other endpoints that are needed to deploy your Kubernetes manifests, you will need to provision these endpoints behind your firewall or list them on your firewall so that the Flux Source controller can successfully reach them.
91+
92+
For more information on private link scopes in Azure Arc, refer to [this document](../servers/private-link-security.md#create-a-private-link-scope).
93+
9094
## Data residency
9195
The Azure GitOps service (Azure Kubernetes Configuration Management) stores/processes customer data. By default, customer data is replicated to the paired region. For the regions Singapore, East Asia, and Brazil South, all customer data is stored and processed in the region.
9296

articles/azure-monitor/alerts/itsmc-definition.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Action groups provide a modular and reusable way to trigger actions for your Azu
8080
8181
### Define a template
8282

83-
Certain work item types can use templates that you define in the ITSM tool. Using templates, you can define fields that will be automatically populated using fixed values for an action group. You can define which template you want to use as a part of the definition of an action group. Find information about how to create templates [here](https://docs.servicenow.com/bundle/paris-platform-administration/page/administer/form-administration/task/t_CreateATemplateUsingTheTmplForm.html).
83+
Certain work item types can use templates that you define in the ServiceNow. Using templates, you can define fields that will be automatically populated using constant values that is defined in ServiceNow (not values from the payload). The templates synced with Azure and you can define which template you want to use as a part of the definition of an action group. Find information about how to create templates [here](https://docs.servicenow.com/bundle/paris-platform-administration/page/administer/form-administration/task/t_CreateATemplateUsingTheTmplForm.html).
8484

8585
To create an action group:
8686

articles/azure-monitor/logs/analyze-usage.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ Event
9696
Analyze the amount of billable data collect from a virtual machine or set of virtual machines. The **Usage** table doesn't include information about data collected from virtual machines, so these queries use the [find operator](/azure/data-explorer/kusto/query/findoperator) to search all tables that include a computer name. The **Usage** type is omitted because this is only for analytics of data trends.
9797

9898
> [!WARNING]
99-
> Use [find](/azure/data-explorer/kusto/query/findoperator?pivots=azuremonitor) queries sparingly because scans across data types are [resource intensive](./query-optimization.md#query-performance-pane) to execute. If you don't need results per subscription, resource group, or resource name, use the [Usage](/azure/azure-monitor/reference/tables/usage) table as in the queries above.
99+
> Use [find](/azure/data-explorer/kusto/query/findoperator?pivots=azuremonitor) queries sparingly because scans across data types are [resource intensive](./query-optimization.md#query-details-pane) to execute. If you don't need results per subscription, resource group, or resource name, use the [Usage](/azure/azure-monitor/reference/tables/usage) table as in the queries above.
100100
101101
**Billable data volume by computer**
102102

@@ -122,7 +122,7 @@ find where TimeGenerated > ago(24h) project _IsBillable, Computer
122122
Analyze the amount of billable data collected from a particular resource or set of resources. These queries use the [_ResourceId](./log-standard-columns.md#_resourceid) and [_SubscriptionId](./log-standard-columns.md#_subscriptionid) columns for data from resources hosted in Azure.
123123

124124
> [!WARNING]
125-
> Use [find](/azure/data-explorer/kusto/query/findoperator?pivots=azuremonitor) queries sparingly because scans across data types are [resource intensive](./query-optimization.md#query-performance-pane) to execute. If you don't need results per subscription, resource group, or resource name, use the [Usage](/azure/azure-monitor/reference/tables/usage) table as in the queries above.
125+
> Use [find](/azure/data-explorer/kusto/query/findoperator?pivots=azuremonitor) queries sparingly because scans across data types are [resource intensive](./query-optimization.md#query-details-pane) to execute. If you don't need results per subscription, resource group, or resource name, use the [Usage](/azure/azure-monitor/reference/tables/usage) table as in the queries above.
126126
127127
**Billable data volume by resource ID**
128128

@@ -322,7 +322,7 @@ union (AppAvailabilityResults),
322322
If you don't have excessive data from any particular source, you may have an excessive number of agents that are sending data.
323323

324324
> [!WARNING]
325-
> Use [find](/azure/data-explorer/kusto/query/findoperator?pivots=azuremonitor) queries sparingly because scans across data types are [resource intensive](./query-optimization.md#query-performance-pane) to execute. If you don't need results per subscription, resource group, or resource name, use the [Usage](/azure/azure-monitor/reference/tables/usage) table as in the queries above.
325+
> Use [find](/azure/data-explorer/kusto/query/findoperator?pivots=azuremonitor) queries sparingly because scans across data types are [resource intensive](./query-optimization.md#query-details-pane) to execute. If you don't need results per subscription, resource group, or resource name, use the [Usage](/azure/azure-monitor/reference/tables/usage) table as in the queries above.
326326
327327

328328
**Count of agent nodes that are sending a heartbeat each day in the last month**

0 commit comments

Comments
 (0)