Skip to content

Commit 2d75db4

Browse files
Merge pull request #216270 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents f23e7b0 + e1f1712 commit 2d75db4

27 files changed

+62
-47
lines changed

articles/active-directory-b2c/custom-email-mailjet.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,11 +333,12 @@ Add the following technical profiles to the `<ClaimsProviders>` element.
333333
<Protocol Name="Proprietary" Handler="Web.TPEngine.Providers.OneTimePasswordProtocolProvider, Web.TPEngine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
334334
<Metadata>
335335
<Item Key="Operation">GenerateCode</Item>
336-
<Item Key="CodeExpirationInSeconds">1200</Item>
336+
<Item Key="CodeExpirationInSeconds">600</Item>
337337
<Item Key="CodeLength">6</Item>
338338
<Item Key="CharacterSet">0-9</Item>
339-
<Item Key="ReuseSameCode">true</Item>
340339
<Item Key="NumRetryAttempts">5</Item>
340+
<Item Key="NumCodeGenerationAttempts">10</Item>
341+
<Item Key="ReuseSameCode">false</Item>
341342
</Metadata>
342343
<InputClaims>
343344
<InputClaim ClaimTypeReferenceId="email" PartnerClaimType="identifier" />

articles/active-directory-b2c/custom-email-sendgrid.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,11 +322,12 @@ Add the following technical profiles to the `<ClaimsProviders>` element.
322322
<Protocol Name="Proprietary" Handler="Web.TPEngine.Providers.OneTimePasswordProtocolProvider, Web.TPEngine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
323323
<Metadata>
324324
<Item Key="Operation">GenerateCode</Item>
325-
<Item Key="CodeExpirationInSeconds">1200</Item>
325+
<Item Key="CodeExpirationInSeconds">600</Item>
326326
<Item Key="CodeLength">6</Item>
327327
<Item Key="CharacterSet">0-9</Item>
328-
<Item Key="ReuseSameCode">true</Item>
329328
<Item Key="NumRetryAttempts">5</Item>
329+
<Item Key="NumCodeGenerationAttempts">10</Item>
330+
<Item Key="ReuseSameCode">false</Item>
330331
</Metadata>
331332
<InputClaims>
332333
<InputClaim ClaimTypeReferenceId="email" PartnerClaimType="identifier" />

articles/active-directory-b2c/one-time-password-technical-profile.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ The following settings can be used to configure code generation mode:
7070

7171
| Attribute | Required | Description |
7272
| --------- | -------- | ----------- |
73+
| Operation | Yes | The operation to be performed. Possible value: `GenerateCode`. |
7374
| CodeExpirationInSeconds | No | Time in seconds until code expiration. Minimum: `60`; Maximum: `1200`; Default: `600`. Every time a code is provided (same code using `ReuseSameCode`, or a new code), the code expiration is extended. This time is also used to set retry timeout (once max attempts are reached, user is locked out from attempting to obtain new codes until this time expires) |
7475
| CodeLength | No | Length of the code. The default value is `6`. |
7576
| CharacterSet | No | The character set for the code, formatted for use in a regular expression. For example, `a-z0-9A-Z`. The default value is `0-9`. The character set must include a minimum of 10 different characters in the set specified. |
7677
| NumRetryAttempts | No | The number of verification attempts before the code is considered invalid. The default value is `5`. For example, if you set NumRetryAttempts to 2 it will allow you only 2 attempts in total (first + 1 retry). For the 3rd attempt it will throw max attempts reached irrespective of whether the code is correct or not.|
77-
| NumCodeGenerationAttempts | No | The number of maximum code generation attempts per identifier. The default value is 10 if not specified. |
78-
| Operation | Yes | The operation to be performed. Possible value: `GenerateCode`. |
78+
| NumCodeGenerationAttempts | No | The number of maximum code generation attempts per identifier. The default value is `10` if not specified. |
7979
| ReuseSameCode | No | Whether the same code should be given rather than generating a new code when given code has not expired and is still valid. The default value is `false`. |
8080

8181

@@ -94,7 +94,7 @@ The following example `TechnicalProfile` is used for generating a code:
9494
<Item Key="CodeLength">6</Item>
9595
<Item Key="CharacterSet">0-9</Item>
9696
<Item Key="NumRetryAttempts">5</Item>
97-
<Item Key="NumCodeGenerationAttempts">15</Item>
97+
<Item Key="NumCodeGenerationAttempts">10</Item>
9898
<Item Key="ReuseSameCode">false</Item>
9999
</Metadata>
100100
<InputClaims>

articles/active-directory-b2c/service-limits.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: reference
1111
ms.author: kengaderdus
12-
ms.date: 04/15/2022
12+
ms.date: 10/27/2022
1313
ms.subservice: B2C
1414
zone_pivot_groups: b2c-policy-type
1515
---
@@ -168,6 +168,7 @@ The following table lists the administrative configuration limits in the Azure A
168168
|Levels of [inheritance](custom-policy-overview.md#inheritance-model) in custom policies |10 |
169169
|Number of policies per Azure AD B2C tenant (user flows + custom policies) |200 |
170170
|Maximum policy file size |1024 KB |
171+
|Number of API connectors per tenant |19 |
171172

172173
<sup>1</sup> See also [Azure AD service limits and restrictions](../active-directory/enterprise-users/directory-service-limits-restrictions.md).
173174

articles/active-directory/develop/msal-net-token-cache-serialization.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@ The recommendation is:
3838

3939
## [ASP.NET Core web apps and web APIs](#tab/aspnetcore)
4040

41-
The [Microsoft.Identity.Web.TokenCache](https://www.nuget.org/packages/Microsoft.Identity.Web.TokenCache) NuGet package provides token cache serialization within the [Microsoft.Identity.Web](https://github.com/AzureAD/microsoft-identity-web) library.
41+
The [Microsoft.Identity.Web.TokenCache](https://www.nuget.org/packages/Microsoft.Identity.Web.TokenCache) NuGet package provides token cache serialization within the [Microsoft.Identity.Web](https://github.com/AzureAD/microsoft-identity-web) library.
42+
43+
If you're using the MSAL library directly in an ASP.NET Core app, consider moving to use [Microsoft.Identity.Web](https://github.com/AzureAD/microsoft-identity-web), which provides a simpler, higher-level API. Otherwise, see the [Non-ASP.NET Core web apps and web APIs](/azure/active-directory/develop/msal-net-token-cache-serialization?tabs=aspnet#configuring-the-token-cache), which covers direct MSAL usage.
44+
4245

4346
| Extension method | Description |
4447
| ---------------- | ------------ |
@@ -686,6 +689,9 @@ namespace CommonCacheMsalV3
686689
}
687690
```
688691

692+
For more details see the sample: https://github.com/Azure-Samples/active-directory-dotnet-v1-to-v2/tree/master/TokenCacheMigration/ADAL2MSAL
693+
694+
689695
---
690696

691697
## Monitor cache hit ratios and cache performance

articles/active-directory/develop/v2-protocols-oidc.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ The value of `{tenant}` varies based on the application's sign-in audience as sh
7070
| `consumers` |Only users with a personal Microsoft account can sign in to the application. |
7171
| `8eaef023-2b34-4da1-9baa-8bc8c9d6a490` or `contoso.onmicrosoft.com` | Only users from a specific Azure AD tenant (directory members with a work or school account or directory guests with a personal Microsoft account) can sign in to the application. <br/><br/>The value can be the domain name of the Azure AD tenant or the tenant ID in GUID format. You can also use the consumer tenant GUID, `9188040d-6c67-4c5b-b112-36a304b66dad`, in place of `consumers`. |
7272

73+
> [!TIP]
74+
> Note that when using the `common` or `consumers` authority for personal Microsoft accounts, the consuming resource application must be configured to support such type of accounts in accordance with [signInAudience](/azure/active-directory/develop/supported-accounts-validation).
75+
7376
You can also find your app's OpenID configuration document URI in its app registration in the Azure portal.
7477

7578
To find the OIDC configuration document for your app, navigate to the [Azure portal](https://portal.azure.com) and then:

articles/active-directory/develop/workload-identity-federation-create-trust.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ In the **Federated credential scenario** drop-down box, select **GitHub actions
4949

5050
Specify the **Organization** and **Repository** for your GitHub Actions workflow.
5151

52-
For **Entity type**, select **Environment**, **Branch**, **Pull request**, or **Tag** and specify the value. The values must exactly match the configuration in the [GitHub workflow](https://docs.github.com/actions/using-workflows/workflow-syntax-for-github-actions#on). For more info, read the [examples](#entity-type-examples).
52+
For **Entity type**, select **Environment**, **Branch**, **Pull request**, or **Tag** and specify the value. The values must exactly match the configuration in the [GitHub workflow](https://docs.github.com/actions/using-workflows/workflow-syntax-for-github-actions#on). Pattern matching is not supported for branches and tags. Specify an environment if your on-push workflow runs against many branches or tags. For more info, read the [examples](#entity-type-examples).
5353

5454
Add a **Name** for the federated credential.
5555

articles/active-directory/saas-apps/workday-inbound-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ In this section, you will configure how user data flows from Workday to Active D
387387
| **WorkerID** | EmployeeID | **Yes** | Written on create only |
388388
| **PreferredNameData** | cn | | Written on create only |
389389
| **SelectUniqueValue( Join("\@", Join(".", \[FirstName\], \[LastName\]), "contoso.com"), Join("\@", Join(".", Mid(\[FirstName\], 1, 1), \[LastName\]), "contoso.com"), Join("\@", Join(".", Mid(\[FirstName\], 1, 2), \[LastName\]), "contoso.com"))** | userPrincipalName | | Written on create only
390-
| `Replace(Mid(Replace(\[UserID\], , "(\[\\\\/\\\\\\\\\\\\\[\\\\\]\\\\:\\\\;\\\\\|\\\\=\\\\,\\\\+\\\\\*\\\\?\\\\&lt;\\\\&gt;\])", , "", , ), 1, 20), , "([\\\\.)\*\$](file:///\\.)*$)", , "", , )` | sAMAccountName | | Written on create only |
390+
| `Replace(Mid(Replace([UserID], , "([\\/\\\\\\[\\]\\:\\;\\|\\=\\,\\+\\*\\?\\<\\>])", , "", , ), 1, 20), , "(\\.)*$", , "", , )` | sAMAccountName | | Written on create only |
391391
| **Switch(\[Active\], , "0", "True", "1", "False")** | accountDisabled | | Create + update |
392392
| **FirstName** | givenName | | Create + update |
393393
| **LastName** | sn | | Create + update |

articles/applied-ai-services/form-recognizer/v3-migration-guide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ POST https://{your-form-recognizer-endpoint}/formrecognizer/documentModels:compo
311311
The call pattern for copy model remains unchanged:
312312

313313
* Authorize the copy operation with the target resource calling ```authorizeCopy```. Now a POST request.
314-
* Submit the authorization to the source resource to copy the model calling ```copy-to```
314+
* Submit the authorization to the source resource to copy the model calling ```copyTo```
315315
* Poll the returned operation to validate the operation completed successfully
316316

317317
The only changes to the copy model function are:
@@ -332,7 +332,7 @@ POST https://{targetHost}/formrecognizer/documentModels:authorizeCopy?api-versio
332332
Use the response body from the authorize action to construct the request for the copy.
333333

334334
```json
335-
POST https://{sourceHost}/formrecognizer/documentModels/{sourceModelId}:copy-to?api-version=2022-08-31
335+
POST https://{sourceHost}/formrecognizer/documentModels/{sourceModelId}:copyTo?api-version=2022-08-31
336336
{
337337
"targetResourceId": "{targetResourceId}",
338338
"targetResourceRegion": "{targetResourceRegion}",

articles/azure-monitor/essentials/prometheus-remote-write-managed-identity.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,11 +196,11 @@ This is likely due to misconfiguration of the container. In order to view the co
196196
kubectl get po <Prometheus-Pod-Name> -o json | jq -c '.spec.containers[] | select( .name | contains(" <Azure-Monitor-Side-Car-Container-Name> "))'
197197
```
198198
Output:
199-
{"env":[{"name":"INGESTION_URL","value":"https://rwtest-eus2-qu4m.eastus2-1.metrics.ingest.monitor.azure.com/dataCollectionRules/dcr-90b2d5e5feac43f486311dff33c3c116/streams/Microsoft-PrometheusMetrics/api/v1/write?api-version=2021-11-01-preview"},{"name":"LISTENING_PORT","value":"8081"},{"name":"IDENTITY_TYPE","value":"userAssigned"},{"name":"AZURE_CLIENT_ID","value":"fe9b242a-1cdb-4d30-86e4-14e432f326de"}],"image":"mcr.microsoft.com/azuremonitor/prometheus/promdev/prom-remotewrite:prom-remotewrite-20221012.2","imagePullPolicy":"Always","name":"prom-remotewrite","ports":[{"containerPort":8081,"name":"rw-port","protocol":"TCP"}],"resources":{},"terminationMessagePath":"/dev/termination-log","terminationMessagePolicy":"File","volumeMounts":[{"mountPath":"/var/run/secrets/kubernetes.io/serviceaccount","name":"kube-api-access-vbr9d","readOnly":true}]}
199+
{"env":[{"name":"INGESTION_URL","value":"https://my-azure-monitor-workspace.eastus2-1.metrics.ingest.monitor.azure.com/dataCollectionRules/dcr-00000000000000000/streams/Microsoft-PrometheusMetrics/api/v1/write?api-version=2021-11-01-preview"},{"name":"LISTENING_PORT","value":"8081"},{"name":"IDENTITY_TYPE","value":"userAssigned"},{"name":"AZURE_CLIENT_ID","value":"00000000-0000-0000-0000-00000000000"}],"image":"mcr.microsoft.com/azuremonitor/prometheus/promdev/prom-remotewrite:prom-remotewrite-20221012.2","imagePullPolicy":"Always","name":"prom-remotewrite","ports":[{"containerPort":8081,"name":"rw-port","protocol":"TCP"}],"resources":{},"terminationMessagePath":"/dev/termination-log","terminationMessagePolicy":"File","volumeMounts":[{"mountPath":"/var/run/secrets/kubernetes.io/serviceaccount","name":"kube-api-access-vbr9d","readOnly":true}]}
200200
201201
Verify the configuration values especially “AZURE_CLIENT_ID” and “IDENTITY_TYPE”
202202
203203
## Next steps
204204
205-
= [Setup Grafana to use Managed Prometheus as a data source](prometheus-grafana.md).
205+
- [Setup Grafana to use Managed Prometheus as a data source](prometheus-grafana.md).
206206
- [Learn more about Azure Monitor managed service for Prometheus](prometheus-metrics-overview.md).

0 commit comments

Comments
 (0)