Skip to content

Commit 702185d

Browse files
authored
Merge branch 'MicrosoftDocs:main' into patch-2
2 parents 56afee3 + 84ca5c4 commit 702185d

File tree

584 files changed

+5436
-5248
lines changed

Some content is hidden

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

584 files changed

+5436
-5248
lines changed

articles/active-directory/conditional-access/howto-continuous-access-evaluation-troubleshoot.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: conditional-access
88
ms.topic: troubleshooting
9-
ms.date: 06/09/2022
9+
ms.date: 01/05/2023
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo
@@ -35,7 +35,7 @@ There are multiple sign-in requests for each authentication. Some will be shown
3535

3636
### Searching for specific sign-in attempts
3737

38-
Use filters to narrow your search. For example, if a user signed in to Teams, use the Application filter and set it to Teams. Admins may need to check the sign-ins from both interactive and non-interactive tabs to locate the specific sign-in. To further narrow the search, admins may apply multiple filters.
38+
Sign in logs contain information on Success as well as failure events. Use filters to narrow your search. For example, if a user signed in to Teams, use the Application filter and set it to Teams. Admins may need to check the sign-ins from both interactive and non-interactive tabs to locate the specific sign-in. To further narrow the search, admins may apply multiple filters.
3939

4040
## Continuous access evaluation workbooks
4141

articles/active-directory/reports-monitoring/concept-all-sign-ins.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ To access the sign-ins log for a tenant, you must have one of the following role
4242
- Reports Reader
4343

4444
>[!NOTE]
45-
>You might need conditional access administrator role to see applied conditional access policies in the sign-ins log.
45+
>To see Conditional Access data in the sign-ins log, you need to be a user in one of the following roles:
46+
Company Administrator, Global Reader, Security Administrator, Security Reader, Conditional Access Administrator .
4647

4748
The sign-in activity report is available in [all editions of Azure AD](reference-reports-data-retention.md#how-long-does-azure-ad-store-the-data). If you have an Azure Active Directory P1 or P2 license, you can access the sign-in activity report through the Microsoft Graph API. See [Getting started with Azure Active Directory Premium](../fundamentals/active-directory-get-started-premium.md) to upgrade your Azure Active Directory edition. It will take a couple of days for the data to show up in Graph after you upgrade to a premium license with no data activities before the upgrade.
4849

articles/active-directory/saas-apps/trend-micro-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ After you configure the Azure AD service and specify Azure AD as the user authen
210210
1. Clear the browser of all cookies and then restart the browser.
211211

212212
1. Point your browser to the TMWS proxy server.
213-
For details, see [Traffic Forwarding Using PAC Files](https://docs.trendmicro.com/en-us/enterprise/trend-micro-web-security-online-help/administration_001/pac-files/traffic-forwarding-u.aspx#GUID-A4A83827-7A29-4596-B866-01ACCEDCC36B).
213+
For details, see [Traffic Forwarding Using PAC Files](https://docs.trendmicro.com/en-us/enterprise/trend-micro-web-security-online-help/administration/pac-files/traffic-forwarding-u.aspx).
214214

215215
1. Visit any internet website. TMWS will direct you to the TMWS captive portal.
216216

articles/aks/security-controls-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Azure Policy Regulatory Compliance controls for Azure Kubernetes Service (AKS)
33
description: Lists Azure Policy Regulatory Compliance controls available for Azure Kubernetes Service (AKS). These built-in policy definitions provide common approaches to managing the compliance of your Azure resources.
4-
ms.date: 11/04/2022
4+
ms.date: 01/05/2023
55
ms.topic: sample
66
ms.service: container-service
77
ms.custom: subject-policy-compliancecontrols

articles/api-management/api-management-policy-expressions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: dlepow
77

88
ms.service: api-management
99
ms.topic: article
10-
ms.date: 12/08/2022
10+
ms.date: 02/07/2022
1111
ms.author: danlep
1212
---
1313
# API Management policy expressions
@@ -213,7 +213,7 @@ The `context` variable is implicitly available in every policy [expression](api-
213213
|<a id="ref-context-user"></a>`context.User`|`Email`: `string`<br /><br /> `FirstName`: `string`<br /><br /> `Groups`: `IEnumerable<`[`IGroup`](#ref-igroup)`>`<br /><br /> `Id`: `string`<br /><br /> `Identities`: `IEnumerable<`[`IUserIdentity`](#ref-iuseridentity)`>`<br /><br /> `LastName`: `string`<br /><br /> `Note`: `string`<br /><br /> `RegistrationDate`: `DateTime`|
214214
|<a id="ref-iapi"></a>`IApi`|`Id`: `string`<br /><br /> `Name`: `string`<br /><br /> `Path`: `string`<br /><br /> `Protocols`: `IEnumerable<string>`<br /><br /> `ServiceUrl`: [`IUrl`](#ref-iurl)<br /><br /> `SubscriptionKeyParameterNames`: [`ISubscriptionKeyParameterNames`](#ref-isubscriptionkeyparameternames)|
215215
|<a id="ref-igroup"></a>`IGroup`|`Id`: `string`<br /><br /> `Name`: `string`|
216-
|<a id="ref-imessagebody"></a>`IMessageBody`|`As<T>(bool preserveContent = false): Where T: string, byte[], JObject, JToken, JArray, XNode, XElement, XDocument` <br /><br /> - The `context.Request.Body.As<T>` and `context.Response.Body.As<T>` methods read a request or response message body in specified type `T`. <br/><br/> - Or - <br/><br/>`AsFormUrlEncodedContent(bool preserveContent = false)` <br/></br>- The `context.Request.Body.AsFormUrlEncodedContent()` and `context.Response.Body.AsFormUrlEncodedContent()` methods read URL-encoded form data in a request or response message body and return an `IDictionary<string, IList<string>>` object. The decoded object supports `IDictionary` operations and the following expressions: `ToQueryString()`, `JsonConvert.SerializeObject()`, `ToFormUrlEncodedContent().` <br/><br/> By default, the `As<T>` and `AsFormUrlEncodedContent()` methods:<br /><ul><li>Use the original message body stream.</li><li>Render it unavailable after it returns.</li></ul> <br />To avoid that and have the method operate on a copy of the body stream, set the `preserveContent` parameter to `true`, as in [this example](api-management-transformation-policies.md#SetBody).|
216+
|<a id="ref-imessagebody"></a>`IMessageBody`|`As<T>(preserveContent: bool = false): Where T: string, byte[],JObject, JToken, JArray, XNode, XElement, XDocument`<br /><br /> The `context.Request.Body.As<T>` and `context.Response.Body.As<T>` methods are used to read either a request and response message body in specified type `T`. By default, the method:<br /><ul><li>Uses the original message body stream.</li><li>Renders it unavailable after it returns.</li></ul> <br />To avoid that and have the method operate on a copy of the body stream, set the `preserveContent` parameter to `true`, as in [this example](api-management-transformation-policies.md#SetBody).|
217217
|<a id="ref-iprivateendpointconnection"></a>`IPrivateEndpointConnection`|`Name`: `string`<br /><br /> `GroupId`: `string`<br /><br /> `MemberName`: `string`<br /><br />For more information, see the [REST API](/rest/api/apimanagement/current-ga/private-endpoint-connection/list-private-link-resources).|
218218
|<a id="ref-iurl"></a>`IUrl`|`Host`: `string`<br /><br /> `Path`: `string`<br /><br /> `Port`: `int`<br /><br /> [`Query`](#ref-iurl-query): `IReadOnlyDictionary<string, string[]>`<br /><br /> `QueryString`: `string`<br /><br /> `Scheme`: `string`|
219219
|<a id="ref-iuseridentity"></a>`IUserIdentity`|`Id`: `string`<br /><br /> `Provider`: `string`|

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -399,19 +399,6 @@ Since we are not reserving the original request body, accessing it later in the
399399

400400
```
401401

402-
#### Example accessing the body as URL-encoded form data
403-
The following example uses the `AsFormUrlEncodedContent()` expression to access the request body as URL-encoded form data (content type `application/x-www-form-urlencoded`), and then converts it to JSON. Since we are not reserving the original request body, accessing it later in the pipeline will result in an exception.
404-
405-
```xml
406-
<set-body
407-
@{ 
408-
var inBody = context.Request.Body.AsFormUrlEncodedContent();
409-
return JsonConvert.SerializeObject(inBody); 
410-
411-
</set-body>
412-
413-
```
414-
415402
#### Filter response based on product
416403
This example shows how to perform content filtering by removing data elements from the response received from a backend service when using the `Starter` product. The example backend response includes root-level properties similar to the [OpenWeather One Call API](https://openweathermap.org/api/one-call-api).
417404

articles/api-management/configure-custom-domain.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ When you create an Azure API Management service instance in the Azure cloud, Azu
2424
2525
## Prerequisites
2626

27-
- An active Azure subscription. [!INCLUDE [quickstarts-free-trial-note](../../includes/quickstarts-free-trial-note.md)]
2827
- An API Management instance. For more information, see [Create an Azure API Management instance](get-started-create-service-instance.md).
2928
- A custom domain name that is owned by you or your organization. This article does not provide instructions on how to procure a custom domain name.
3029
- Optionally, a valid certificate with a public and private key (.PFX). The subject or subject alternative name (SAN) has to match the domain name (this enables API Management instance to securely expose URLs over TLS).
@@ -49,6 +48,7 @@ There are several API Management endpoints to which you can assign a custom doma
4948

5049
### Considerations
5150
* You can update any of the endpoints supported in your service tier. Typically, customers update **Gateway** (this URL is used to call the APIs exposed through API Management) and **Developer portal** (the developer portal URL).
51+
* The default **Gateway** endpoint also is available after you configure a custom Gateway domain name. For other API Management endpoints (such as **Developer portal**) that you configure with a custom domain name, the default endpoint is no longer available.
5252
* Only API Management instance owners can use **Management** and **SCM** endpoints internally. These endpoints are less frequently assigned a custom domain name.
5353
* The **Premium** and **Developer** tiers support setting multiple hostnames for the **Gateway** endpoint.
5454
* Wildcard domain names, like `*.contoso.com`, are supported in all tiers except the Consumption tier.
@@ -57,7 +57,7 @@ There are several API Management endpoints to which you can assign a custom doma
5757

5858
API Management supports custom TLS certificates or certificates imported from Azure Key Vault. You can also enable a free, managed certificate.
5959

60-
> [!WARNING]
60+
> [!WARNING
6161
> If you require certificate pinning, please use a custom domain name and either a custom or Key Vault certificate, not the default certificate or the free, managed certificate. We don't recommend taking a hard dependency on a certificate that you don't manage.
6262
6363
# [Custom](#tab/custom)

articles/api-management/security-controls-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Azure Policy Regulatory Compliance controls for Azure API Management
33
description: Lists Azure Policy Regulatory Compliance controls available for Azure API Management. These built-in policy definitions provide common approaches to managing the compliance of your Azure resources.
4-
ms.date: 11/04/2022
4+
ms.date: 01/05/2023
55
ms.topic: sample
66
author: dlepow
77
ms.author: danlep

articles/app-service/security-controls-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Azure Policy Regulatory Compliance controls for Azure App Service
33
description: Lists Azure Policy Regulatory Compliance controls available for Azure App Service. These built-in policy definitions provide common approaches to managing the compliance of your Azure resources.
4-
ms.date: 11/04/2022
4+
ms.date: 01/05/2023
55
ms.topic: sample
66
ms.service: app-service
77
ms.custom: subject-policy-compliancecontrols

articles/automation/security-controls-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Azure Policy Regulatory Compliance controls for Azure Automation
33
description: Lists Azure Policy Regulatory Compliance controls available for Azure Automation. These built-in policy definitions provide common approaches to managing the compliance of your Azure resources.
4-
ms.date: 11/04/2022
4+
ms.date: 01/05/2023
55
ms.topic: sample
66
ms.service: automation
77
ms.custom: subject-policy-compliancecontrols

0 commit comments

Comments
 (0)