Skip to content

Commit 7b6ceae

Browse files
authored
Merge pull request #170918 from MicrosoftDocs/master
8/31 AM Publish
2 parents 2eac9bd + c2114f5 commit 7b6ceae

File tree

70 files changed

+16612
-259
lines changed

Some content is hidden

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

70 files changed

+16612
-259
lines changed

articles/active-directory-b2c/userjourneys.md

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: celestedg
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: reference
11-
ms.date: 06/27/2021
11+
ms.date: 08/31/2021
1212
ms.author: mimart
1313
ms.subservice: B2C
1414
---
@@ -109,12 +109,7 @@ The **OrchestrationStep** element can contain the following elements:
109109

110110
Orchestration steps can be conditionally executed based on preconditions defined in the orchestration step. The `Preconditions` element contains a list of preconditions to evaluate. When the precondition evaluation is satisfied, the associated orchestration step skips to the next orchestration step.
111111

112-
Each precondition evaluates a single claim. There are two types of preconditions:
113-
 
114-
- **Claims exist** - Specifies that the actions should be performed if the specified claims exist in the user's current claim bag.
115-
- **Claim equals** - Specifies that the actions should be performed if the specified claim exists, and its value is equal to the specified value. The check performs a case-sensitive ordinal comparison. When checking Boolean claim type, use `True`, or `False`.
116-
117-
Azure AD B2C evaluates the preconditions in list order. The oder-based preconditions allows you set the order in which the preconditions are applied. The first precondition that satisfied overrides all the subsequent preconditions. The orchestration step is executed only if all of the preconditions are not satisfied.
112+
Azure AD B2C evaluates the preconditions in list order. The order-based preconditions allows you set the order in which the preconditions are applied. The first precondition that satisfied overrides all the subsequent preconditions. The orchestration step is executed only if all of the preconditions are not satisfied.
118113

119114
The **Preconditions** element contains the following element:
120115

@@ -137,6 +132,31 @@ The **Precondition** elements contains the following elements:
137132
| ------- | ----------- | ----------- |
138133
| Value | 1:2 | The identifier of a claim type. The claim is already defined in the claims schema section in the policy file, or parent policy file. When the precondition is type of `ClaimEquals`, a second `Value` element contains the value to be checked. |
139134
| Action | 1:1 | The action that should be performed if the precondition evaluation is satisfied. Possible value: `SkipThisOrchestrationStep`. The associated orchestration step skips to the next one. |
135+
136+
Each precondition evaluates a single claim. There are two types of preconditions:
137+
 
138+
- **ClaimsExist** - Specifies that the actions should be performed if the specified claims exist in the user's current claim bag.
139+
- **ClaimEquals** - Specifies that the actions should be performed if the specified claim exists, and its value is equal to the specified value. The check performs a case-sensitive ordinal comparison. When checking Boolean claim type, use `True`, or `False`.
140+
141+
If the claim is null or uninitialized, the precondition is ignored, whether the `ExecuteActionsIf` is `true`, or `false`. As a best practice, check both that the claim exists, and equals to a value.
142+
143+
An example scenario would be to challenge the user for MFA if the user has `MfaPreference` set to `Phone`. To perform this conditional logic, check if the `MfaPreference` claim exists, and also check the claim value equals to `Phone`. The following XML demonstrates how to implement this logic with preconditions.
144+
 
145+
```xml
146+
<Preconditions>
147+
<!-- Skip this orchestration step if MfaPreference doesn't exist. -->
148+
<Precondition Type="ClaimsExist" ExecuteActionsIf="false">
149+
<Value>MfaPreference</Value>
150+
<Action>SkipThisOrchestrationStep</Action>
151+
</Precondition>
152+
<!-- Skip this orchestration step if MfaPreference doesn't equal to Phone. -->
153+
<Precondition Type="ClaimEquals" ExecuteActionsIf="false">
154+
<Value>MfaPreference</Value>
155+
<Value>Phone</Value>
156+
<Action>SkipThisOrchestrationStep</Action>
157+
</Precondition>
158+
</Preconditions>
159+
```
140160

141161
#### Preconditions examples
142162

articles/app-service/reference-app-settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ APACHE_RUN_GROUP | RUN sed -i 's!User ${APACHE_RUN_GROUP}!Group www-data!g' /etc
266266
DOMAIN_OWNERSHIP_VERIFICATION_IDENTIFIERS
267267
-->
268268

269-
## TSL/SSL
269+
## TLS/SSL
270270

271271
For more information, see [Use a TLS/SSL certificate in your code in Azure App Service](configure-ssl-certificate-in-code.md).
272272

articles/application-gateway/multiple-site-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ description: This article provides an overview of the Azure Application Gateway
44
services: application-gateway
55
author: vhorne
66
ms.service: application-gateway
7-
ms.date: 07/20/2020
7+
ms.date: 08/31/2021
88
ms.author: azhussai
99
ms.topic: conceptual
1010
---
1111

1212
# Application Gateway multiple site hosting
1313

14-
Multiple site hosting enables you to configure more than one web application on the same port of an application gateway. It allows you to configure a more efficient topology for your deployments by adding up to 100+ websites to one application gateway. Each website can be directed to its own backend pool. For example, three domains, contoso.com, fabrikam.com, and adatum.com, point to the IP address of the application gateway. You'd create three multi-site listeners and configure each listener for the respective port and protocol setting.
14+
Multiple site hosting enables you to configure more than one web application on the same port of application gateways using public-facing listeners. It allows you to configure a more efficient topology for your deployments by adding up to 100+ websites to one application gateway. Each website can be directed to its own backend pool. For example, three domains, contoso.com, fabrikam.com, and adatum.com, point to the IP address of the application gateway. You'd create three multi-site listeners and configure each listener for the respective port and protocol setting.
1515

1616
You can also define wildcard host names in a multi-site listener and up to 5 host names per listener. To learn more, see [wildcard host names in listener](#wildcard-host-names-in-listener-preview).
1717

articles/azure-arc/kubernetes/faq.md

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ Azure Arc enabled Kubernetes allows you to extend Azure’s management capabilit
2222

2323
## Do I need to connect my AKS clusters running on Azure to Azure Arc?
2424

25-
No. All Azure Arc enabled Kubernetes features, including Azure Monitor and Azure Policy (Gatekeeper), are available on AKS (a native resource in Azure Resource Manager).
25+
Connecting an Azure Kubernetes Service (AKS) cluster to Azure Arc is only required for running Arc enabled services like App Services and Data Services on top of the cluster. This can be done using the [custom locations](custom-locations.md) feature of Arc enabled Kubernetes. This is a point in time limitation for now till cluster extensions and custom locations are introduced natively on top of AKS clusters.
26+
27+
If you don't want to use custom locations and just want to use management features like Azure Monitor and Azure Policy (Gatekeeper), they are available natively on AKS and connection to Azure Arc is not required in such cases.
2628

2729
## Should I connect my AKS-HCI cluster and Kubernetes clusters on Azure Stack Hub and Azure Stack Edge to Azure Arc?
2830

@@ -32,7 +34,17 @@ If the Azure Arc enabled Kubernetes cluster is on Azure Stack Edge, AKS on Azure
3234

3335
## How to address expired Azure Arc enabled Kubernetes resources?
3436

35-
The Managed Service Identity (MSI) certificate associated with your Azure Arc enabled Kubernetes has an expiration window of 90 days. Once this certificate expires, the resource is considered `Expired` and all features (such as configuration, monitoring, and policy) stop working on this cluster. To get your Kubernetes cluster working with Azure Arc again:
37+
The system assigned managed identity associated with your Azure Arc enabled Kubernetes cluster is only used by the Arc agents to communicate with the Azure Arc services. The certificate associated with this system assigned managed identity has an expiration window of 90 days and the agents keep attempting to renew this certificate between Day 46 to Day 90. Once this certificate expires, the resource is considered `Expired` and all features (such as configuration, monitoring, and policy) stop working on this cluster and you'll then need to delete and connect the cluster to Azure Arc once again. It is thus advisable to have the cluster come online at least once between Day 46 to Day 90 time window to ensure renewal of the managed identity certificate.
38+
39+
To check when the certificate is about to expire for any given cluster, run the following command:
40+
41+
```console
42+
az connectedk8s show -n <name> -g <resource-group>
43+
```
44+
45+
In the output, the value of the `managedIdentityCertificateExpirationTime` indicates when the managed identity certificate will expire (90D mark for that certificate).
46+
47+
If the value of `managedIdentityCertificateExpirationTime` indicates a timestamp from the past, then the `connectivityStatus` field in the above output will be set to `Expired`. In such cases, to get your Kubernetes cluster working with Azure Arc again:
3648

3749
1. Delete Azure Arc enabled Kubernetes resource and agents on the cluster.
3850

@@ -47,7 +59,7 @@ The Managed Service Identity (MSI) certificate associated with your Azure Arc en
4759
```
4860

4961
> [!NOTE]
50-
> `az connectedk8s delete` will also delete configurations on top of the cluster. After running `az connectedk8s connect`, recreate the configurations on the cluster, either manually or using Azure Policy.
62+
> `az connectedk8s delete` will also delete configurations and cluster extensions on top of the cluster. After running `az connectedk8s connect`, recreate the configurations and cluster extensions on the cluster, either manually or using Azure Policy.
5163

5264
## If I am already using CI/CD pipelines, can I still use Azure Arc enabled Kubernetes and configurations?
5365

articles/azure-monitor/essentials/rest-api-walkthrough.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -725,6 +725,11 @@ Get Activity Logs without filter or select:
725725
GET https://management.azure.com/subscriptions/089bd33f-d4ec-47fe-8ba5-0753aa5c5b33/providers/microsoft.insights/eventtypes/management/values?api-version=2015-04-01
726726
```
727727

728+
## Troubleshooting
729+
730+
If you receive a 429, 503, or 504 error, please retry the API in one minute.
731+
732+
728733
## Next steps
729734

730735
* Review the [Overview of Monitoring](../overview.md).

articles/azure-monitor/logs/customer-managed-keys.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ Content-type: application/json
179179
"properties": {
180180
"keyVaultProperties": {
181181
"keyVaultUri": "https://key-vault-name.vault.azure.net",
182-
"kyName": "key-name",
182+
"keyName": "key-name",
183183
"keyVersion": "current-version"
184184
},
185185
"sku": {
@@ -211,7 +211,7 @@ A response to GET request should look like this when the key update is complete:
211211
"properties": {
212212
"keyVaultProperties": {
213213
"keyVaultUri": "https://key-vault-name.vault.azure.net",
214-
"kyName": "key-name",
214+
"keyName": "key-name",
215215
"keyVersion": "current-version"
216216
},
217217
"provisioningState": "Succeeded",

articles/azure-monitor/logs/private-link-configure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ The below Azure Resource Manager template creates:
155155
* A Log Analytics workspace named "my-workspace"
156156
* Add a scoped resource to the "my-scope" AMPLS, named "my-workspace-connection"
157157
> [!NOTE]
158-
> The below ARM template uses API version "2019-04-01", which doesn't support setting the AMPLS access modes. When using the below template, the resulting AMPLS is set with QueryAccessMode="Open" and IngestionAccessMode="PrivateOnly", meaning it allows queries to run on resources both in and out of the AMPLS, but limits ingestion to reach only Private Link resources.
158+
> The below ARM template uses an old API version which doesn't support setting the AMPLS access modes. When using the below template, the resulting AMPLS is set with QueryAccessMode="Open" and IngestionAccessMode="PrivateOnly", meaning it allows queries to run on resources both in and out of the AMPLS, but limits ingestion to reach only Private Link resources.
159159
160160
```
161161
{

0 commit comments

Comments
 (0)