Skip to content

Commit 0e1b415

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents 33ec886 + b065fc6 commit 0e1b415

File tree

51 files changed

+163
-84
lines changed

Some content is hidden

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

51 files changed

+163
-84
lines changed

articles/active-directory/authentication/concept-authentication-authenticator-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ To use the Authenticator app at a sign-in prompt rather than a username and pass
2626

2727
> [!NOTE]
2828
> - Users don't have the option to register their mobile app when they enable SSPR. Instead, users can register their mobile app at [https://aka.ms/mfasetup](https://aka.ms/mfasetup) or as part of the combined security info registration at [https://aka.ms/setupsecurityinfo](https://aka.ms/setupsecurityinfo).
29-
> - The Authenticator app may not be supported on beta versions of iOS and Android.
29+
> - The Authenticator app may not be supported on beta versions of iOS and Android. In addition, starting October 20th, 2023 the authenticator app on Android will no longer support older verisons of the Android Company Portal. Android users with Company Portal versions below 2111 (5.0.5333.0) will not be able to re-register or register new instances of the authenticator app until they update their Company Portal application to a newer version.
3030
3131
## Passwordless sign-in
3232

articles/active-directory/authentication/concept-certificate-based-authentication-technical-deep-dive.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ Now we'll walk through each step:
4747

4848
:::image type="content" border="true" source="./media/concept-certificate-based-authentication-technical-deep-dive/sign-in-alt.png" alt-text="Screenshot of the Sign-in if FIDO2 is also enabled.":::
4949

50-
1. Once the user selects certificate-based authentication, the client is redirected to the certauth endpoint, which is [https://certauth.login.microsoftonline.com](https://certauth.login.microsoftonline.com) for Azure Global. For [Azure Government](../../azure-government/compare-azure-government-global-azure.md#guidance-for-developers), the certauth endpoint is [https://certauth.login.microsoftonline.us](https://certauth.login.microsoftonline.us).
50+
1. Once the user selects certificate-based authentication, the client is redirected to the certauth endpoint, which is [https://certauth.login.microsoftonline.com](https://certauth.login.microsoftonline.com) or [`https://t<tenant id>.certauth.login.microsoftonline.com`](`https://t<tenant id>.certauth.login.microsoftonline.com`) for Azure Global. For [Azure Government](../../azure-government/compare-azure-government-global-azure.md#guidance-for-developers), the certauth endpoint is [https://certauth.login.microsoftonline.us](https://certauth.login.microsoftonline.us).
5151

5252
The endpoint performs TLS mutual authentication, and requests the client certificate as part of the TLS handshake. You'll see an entry for this request in the Sign-ins log.
5353

5454
:::image type="content" border="true" source="./media/concept-certificate-based-authentication-technical-deep-dive/sign-in-log.png" alt-text="Screenshot of the Sign-ins log in Azure AD." lightbox="./media/concept-certificate-based-authentication-technical-deep-dive/sign-in-log.png":::
5555

5656
>[!NOTE]
57-
>The network administrator should allow access to the User sign-in page and certauth endpoint for the customer’s cloud environment. Disable TLS inspection on the certauth endpoint to make sure the client certificate request succeeds as part of the TLS handshake.
57+
>The network administrator should allow access to the User sign-in page and certauth endpoint *.certauth.login.microsoftonline.com for the customer’s cloud environment. Disable TLS inspection on the certauth endpoint to make sure the client certificate request succeeds as part of the TLS handshake.
5858
5959
Click the log entry to bring up **Activity Details** and click **Authentication Details**. You'll see an entry for the X.509 certificate.
6060

articles/active-directory/governance/entitlement-management-access-package-assignments.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ You can perform this query in PowerShell with the `Get-MgEntitlementManagementAs
7070
```powershell
7171
Connect-MgGraph -Scopes "EntitlementManagement.Read.All"
7272
$accesspackage = Get-MgEntitlementManagementAccessPackage -Filter "displayName eq 'Marketing Campaign'"
73-
$assignments = Get-MgEntitlementManagementAssignment -AccessPackageId $accesspackage.Id -ExpandProperty target -All -ErrorAction Stop
73+
$assignments = @(Get-MgEntitlementManagementAssignment -AccessPackageId $accesspackage.Id -ExpandProperty target -All -ErrorAction Stop)
7474
$assignments | ft Id,state,{$_.Target.id},{$_.Target.displayName}
7575
```
7676

@@ -181,7 +181,7 @@ For example, if you want to ensure all the users who are currently members of a
181181

182182
```powershell
183183
Connect-MgGraph -Scopes "EntitlementManagement.ReadWrite.All,Directory.Read.All"
184-
$members = Get-MgGroupMember -GroupId "a34abd69-6bf8-4abd-ab6b-78218b77dc15" -All
184+
$members = @(Get-MgGroupMember -GroupId "a34abd69-6bf8-4abd-ab6b-78218b77dc15" -All)
185185
186186
$accesspackage = Get-MgEntitlementManagementAccessPackage -Filter "displayname eq 'Marketing Campaign'" -ExpandProperty "assignmentPolicies"
187187
$policy = $accesspackage.AssignmentPolicies[0]

articles/active-directory/governance/entitlement-management-access-package-incompatible.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@ $ap_w_id = "29be137f-b006-426c-b46a-0df3d4e25ccd"
182182
$ap_e_id = "cce10272-68d8-4482-8ba3-a5965c86cfe5"
183183
$apa_w_filter = "accessPackage/id eq '" + $ap_w_id + "' and state eq 'Delivered'"
184184
$apa_e_filter = "accessPackage/id eq '" + $ap_e_id + "' and state eq 'Delivered'"
185-
$apa_w = Get-MgEntitlementManagementAssignment -Filter $apa_w_filter -ExpandProperty target -All
186-
$apa_e = Get-MgEntitlementManagementAssignment -Filter $apa_e_filter -ExpandProperty target -All
185+
$apa_w = @(Get-MgEntitlementManagementAssignment -Filter $apa_w_filter -ExpandProperty target -All)
186+
$apa_e = @(Get-MgEntitlementManagementAssignment -Filter $apa_e_filter -ExpandProperty target -All)
187187
$htt = @{}; foreach ($e in $apa_e) { if ($null -ne $e.Target -and $null -ne $e.Target.Id) {$htt[$e.Target.Id] = $e} }
188188
foreach ($w in $apa_w) { if ($null -ne $w.Target -and $null -ne $w.Target.Id -and $htt.ContainsKey($w.Target.Id)) { write-output $w.Target.Email } }
189189
```

articles/active-directory/governance/identity-governance-automation.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,12 @@ $TenantId = Get-AutomationVariable -Name 'TenantId'
171171
$Thumbprint = Get-AutomationVariable -Name 'Thumbprint'
172172
$auth = Connect-MgGraph -clientId $ClientId -tenantid $TenantId -certificatethumbprint $Thumbprint
173173
Import-Module Microsoft.Graph.Identity.Governance
174-
$ap = Get-MgEntitlementManagementAccessPackage -All -ErrorAction Stop
175-
$ap | Select-Object -Property Id,DisplayName | ConvertTo-Json
174+
$ap = @(Get-MgEntitlementManagementAccessPackage -All -ErrorAction Stop)
175+
if ($null -eq $ap -or $ap.Count -eq 0) {
176+
ConvertTo-Json @()
177+
} else {
178+
$ap | Select-Object -Property Id,DisplayName | ConvertTo-Json -AsArray
179+
}
176180
```
177181

178182
2. Select **Test pane**, and select **Start**. Wait a few seconds for the Azure Automation processing of your runbook script to complete.

articles/active-directory/hybrid/connect/reference-connect-version-history-archive.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1213,8 +1213,8 @@ Released: February 2016
12131213
12141214
* [Automatic upgrade](how-to-connect-install-automatic-upgrade.md) feature for Express settings customers.
12151215
* Support for the Hybrid Identity Administrator by using Azure AD Multi-Factor Authentication and Privileged Identity Management in the installation wizard.
1216-
* You need to allow your proxy to also allow traffic to `https://secure.aadcdn.microsoftonline-p.com` if you use Multi-Factor Authentication.
1217-
* You need to add https://secure.aadcdn.microsoftonline-p.com to your trusted sites list for Multi-Factor Authentication to properly work.
1216+
* You need to allow your proxy to also allow traffic to ```https://secure.aadcdn.microsoftonline-p.com``` if you use Multi-Factor Authentication.
1217+
* You need to add ```https://secure.aadcdn.microsoftonline-p.com``` to your trusted sites list for Multi-Factor Authentication to properly work.
12181218
* Allow changing the user's sign-in method after initial installation.
12191219
* Allow [Domain and OU filtering](how-to-connect-install-custom.md#domain-and-ou-filtering) in the installation wizard. This also allows connecting to forests where not all domains are available.
12201220
* [Scheduler](how-to-connect-sync-feature-scheduler.md) is built in to the sync engine.

articles/active-directory/saas-apps/cernercentral-provisioning-tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ In order to provision user accounts to Cerner Central, you’ll need to request
9292
* In the **Tenant URL** field, enter a URL in the format below, replacing "User-Roster-Realm-ID" with the realm ID you acquired in step #4.
9393

9494
> Sandbox:
95-
> https://user-roster-api.sandboxcernercentral.com/scim/v1/Realms/User-Roster-Realm-ID/
95+
> ```https://user-roster-api.sandboxcernercentral.com/scim/v1/Realms/User-Roster-Realm-ID/```
9696
>
9797
> Production:
98-
> https://user-roster-api.cernercentral.com/scim/v1/Realms/User-Roster-Realm-ID/
98+
> ```https://user-roster-api.cernercentral.com/scim/v1/Realms/User-Roster-Realm-ID/```
9999
100100
* In the **Secret Token** field, enter the OAuth bearer token you generated in step #3 and click **Test Connection**.
101101

articles/ai-services/openai/faq.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ sections:
196196
- question: |
197197
Is there a token limit on the system message?
198198
answer:
199-
Yes, the token limit on the system message is 200. If the system message is more than 200 tokens, the rest of the tokens beyond the first 200 will be ignored.
199+
Yes, the token limit on the system message is 400. If the system message is more than 400 tokens, the rest of the tokens beyond the first 400 will be ignored.
200200
- question: |
201201
Do the query language and the data source language need to be the same?
202202
answer:

articles/ai-services/speech-service/speech-services-private-link.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,10 +326,14 @@ Follow these steps to modify your code:
326326
```
327327
```python
328328
import azure.cognitiveservices.speech as speechsdk
329-
speech_config = speechsdk.SpeechConfig(endpoint=endPoint, subscription=speechKey)
329+
config = speechsdk.SpeechConfig(endpoint=endPoint, subscription=speechKey)
330330
```
331331
```objectivec
332-
SPXSpeechConfiguration *speechConfig = [[SPXSpeechConfiguration alloc] initWithEndpoint:endPoint subscription:speechKey];
332+
SPXSpeechConfiguration *config = [[SPXSpeechConfiguration alloc] initWithEndpoint:endPoint subscription:speechKey];
333+
```
334+
```javascript
335+
import * as sdk from "microsoft.cognitiveservices.speech.sdk";
336+
config: sdk.SpeechConfig = sdk.SpeechConfig.fromEndpoint(new URL(endPoint), speechKey);
333337
```
334338

335339
> [!TIP]

articles/azure-monitor/faq.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1079,7 +1079,22 @@ sections:
10791079
[OpenCensus](https://opencensus.io/) is the precursor to [OpenTelemetry](https://opentelemetry.io/). Microsoft helped bring together [OpenTracing](https://opentracing.io/) and OpenCensus to create OpenTelemetry, a single observability standard for the world. The current [production-recommended Python SDK](app/opencensus-python.md) for Azure Monitor is based on OpenCensus. Eventually, all Azure Monitor SDKs will be based on OpenTelemetry.
10801080
10811081
- name: Container insights
1082+
10821083
questions:
1084+
- question: |
1085+
Why do I see info banner "You do not have the right cluster permissions which will restrict your access to Container Insights features. Please reach out to your cluster admin to get the right permission"?
1086+
answer: |
1087+
Container Insights has historically allowed users to access the Azure portal experience based on the access permission of the Log Analytics workspace. It now checks cluster-level permission to provide access to the Azure portal experience. You may need your cluster admin to assign this permission.
1088+
1089+
For basic read-only cluster level access, assign the **Monitoring Reader** role for the following types of clusters.
1090+
1091+
- AKS without Kubernetes role-based access control (RBAC) authorization enabled
1092+
- AKS enabled with Azure Active Directory (Azure AD) SAML-based single sign-on
1093+
- AKS enabled with Kubernetes RBAC authorization
1094+
- AKS configured with the cluster role binding clusterMonitoringUser
1095+
- [Azure Arc-enabled Kubernetes clusters](https://learn.microsoft.com/azure/azure-arc/kubernetes/overview)
1096+
1097+
See [Assign role permissions to a user or group](../aks/control-kubeconfig-access.md#assign-role-permissions-to-a-user-or-group) for details on how to assign these roles for AKS and [Access and identity options for Azure Kubernetes Service (AKS)](../aks/concepts-identity.md) to learn more about role assignments.
10831098
- question: |
10841099
What does "Other processes" represent under the Node view?
10851100
answer: |

0 commit comments

Comments
 (0)