Skip to content

Commit 26dd69f

Browse files
authored
Merge pull request #248478 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 e1b886f + d473978 commit 26dd69f

File tree

8 files changed

+16
-15
lines changed

8 files changed

+16
-15
lines changed

articles/active-directory/authentication/howto-mfa-nps-extension-errors.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ If you encounter errors with the NPS extension for Azure AD Multi-Factor Authent
3535
| **REQUEST_FORMAT_ERROR** <br> Radius Request missing mandatory Radius userName\Identifier attribute.Verify that NPS is receiving RADIUS requests | This error usually reflects an installation issue. The NPS extension must be installed in NPS servers that can receive RADIUS requests. NPS servers that are installed as dependencies for services like RDG and RRAS don't receive radius requests. NPS Extension does not work when installed over such installations and errors out since it cannot read the details from the authentication request. |
3636
| **REQUEST_MISSING_CODE** | Make sure that the password encryption protocol between the NPS and NAS servers supports the secondary authentication method that you're using. **PAP** supports all the authentication methods of Azure AD MFA in the cloud: phone call, one-way text message, mobile app notification, and mobile app verification code. **CHAPV2** and **EAP** support phone call and mobile app notification. |
3737
| **USERNAME_CANONICALIZATION_ERROR** | Verify that the user is present in your on-premises Active Directory instance, and that the NPS Service has permissions to access the directory. If you are using cross-forest trusts, [contact support](#contact-microsoft-support) for further help. |
38+
| **Challenge requested in Authentication Ext for User** | Organizations using a RADIUS protocol other than PAP will observe user VPN authorization failing with these events appearing in the AuthZOptCh event log of the NPS Extension server. You can configure the NPS Server to support PAP. If PAP is not an option, you can set OVERRIDE_NUMBER_MATCHING_WITH_OTP = FALSE to fall back to Approve/Deny push notifications. For further help, please check [Number matching using NPS Extension](how-to-mfa-number-match.md#nps-extension). |
3839

3940
### Alternate login ID errors
4041

articles/active-directory/verifiable-credentials/how-to-issuer-revoke.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ Verifiable credential data isn't stored by Microsoft. Therefore, the issuer need
112112

113113
## How does revocation work?
114114

115-
Microsoft Entra Verified ID implements the [W3C StatusList2021](https://github.com/w3c-ccg/vc-status-list-2021/tree/343b8b59cddba4525e1ef355356ae760fc75904e). When presentation to the Request Service API happens, the API will do the revocation check for you. The revocation check happens over an anonymous API call to Identity Hub and does not contain any data who is checking if the verifiable credential is still valid or revoked. With the **statusList2021**, Microsoft Entra Verified ID just keeps a flag by the hashed value of the indexed claim to keep track of the revocation status.
115+
Microsoft Entra Verified ID implements the [W3C StatusList2021](https://github.com/w3c/vc-status-list-2021/tree/343b8b59cddba4525e1ef355356ae760fc75904e). When presentation to the Request Service API happens, the API will do the revocation check for you. The revocation check happens over an anonymous API call to Identity Hub and does not contain any data who is checking if the verifiable credential is still valid or revoked. With the **statusList2021**, Microsoft Entra Verified ID just keeps a flag by the hashed value of the indexed claim to keep track of the revocation status.
116116

117117
### Verifiable credential data
118118

articles/ai-services/language-service/summarization/includes/quickstarts/python-sdk.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def sample_extractive_summarization(client):
9090
from azure.core.credentials import AzureKeyCredential
9191
from azure.ai.textanalytics import (
9292
TextAnalyticsClient,
93-
ExtractSummaryAction
93+
ExtractiveSummaryAction
9494
)
9595

9696
document = [
@@ -104,7 +104,7 @@ def sample_extractive_summarization(client):
104104
poller = client.begin_analyze_actions(
105105
document,
106106
actions=[
107-
ExtractSummaryAction(max_sentence_count=4)
107+
ExtractiveSummaryAction(max_sentence_count=4)
108108
],
109109
)
110110

articles/aks/cluster-autoscaler.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ This article requires Azure CLI version 2.0.76 or later. Run `az --version` to f
1919

2020
To adjust to changing application demands, such as between workdays and evenings or weekends, clusters often need a way to automatically scale. AKS clusters can scale in one of two ways:
2121

22-
* The **cluster autoscaler** watches for pods that can't be scheduled on nodes because of resource constraints. The cluster then automatically increases the number of nodes.
22+
* The **cluster autoscaler** watches for pods that can't be scheduled on nodes because of resource constraints. The cluster then automatically increases the number of nodes. For more information, see [How does scale-up work?](https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/FAQ.md#how-does-scale-up-work)
2323
* The **horizontal pod autoscaler** uses the Metrics Server in a Kubernetes cluster to monitor the resource demand of pods. If an application needs more resources, the number of pods is automatically increased to meet the demand.
2424

2525
![The cluster autoscaler and horizontal pod autoscaler often work together to support the required application demands](media/autoscaler/cluster-autoscaler.png)

articles/aks/configure-kubenet.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ For more information to help you decide which network model to use, see [Compare
137137
--service-cidr 10.0.0.0/16 \
138138
--dns-service-ip 10.0.0.10 \
139139
--pod-cidr 10.244.0.0/16 \
140-
--docker-bridge-address 172.17.0.1/16 \
141140
--vnet-subnet-id $SUBNET_ID
142141
```
143142
@@ -149,7 +148,6 @@ For more information to help you decide which network model to use, see [Compare
149148
* This address range must be large enough to accommodate the number of nodes that you expect to scale up to. You can't change this address range once the cluster is deployed.
150149
* The pod IP address range is used to assign a */24* address space to each node in the cluster. In the following example, the *--pod-cidr* of *10.244.0.0/16* assigns the first node *10.244.0.0/24*, the second node *10.244.1.0/24*, and the third node *10.244.2.0/24*.
151150
* As the cluster scales or upgrades, the Azure platform continues to assign a pod IP address range to each new node.
152-
* *--docker-bridge-address* is optional. The address lets the AKS nodes communicate with the underlying management platform. This IP address must not be within the virtual network IP address range of your cluster and shouldn't overlap with other address ranges in use on your network. The default value is 172.17.0.1/16.
153151
154152
> [!NOTE]
155153
> If you want to enable an AKS cluster to include a [Calico network policy][calico-network-policies], you can use the following command:
@@ -159,7 +157,8 @@ For more information to help you decide which network model to use, see [Compare
159157
> --resource-group myResourceGroup \
160158
> --name myAKSCluster \
161159
> --node-count 3 \
162-
> --network-plugin kubenet --network-policy calico \
160+
> --network-plugin kubenet \
161+
> --network-policy calico \
163162
> --vnet-subnet-id $SUBNET_ID
164163
> ```
165164

articles/aks/create-node-pools.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ The Azure Linux container host for AKS is an open-source Linux distribution avai
149149
az aks nodepool add \
150150
--resource-group myResourceGroup \
151151
--cluster-name myAKSCluster \
152-
--name azurelinuxpool \
152+
--name azlinuxpool \
153153
--os-sku AzureLinux
154154
```
155155

articles/container-apps/azure-arc-enable-cluster.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -226,12 +226,12 @@ A [Log Analytics workspace](../azure-monitor/logs/quick-create-workspace.md) pro
226226
--query customerId \
227227
--output tsv)
228228
LOG_ANALYTICS_WORKSPACE_ID_ENC=$(printf %s $LOG_ANALYTICS_WORKSPACE_ID | base64 -w0) # Needed for the next step
229-
lOG_ANALYTICS_KEY=$(az monitor log-analytics workspace get-shared-keys \
229+
LOG_ANALYTICS_KEY=$(az monitor log-analytics workspace get-shared-keys \
230230
--resource-group $GROUP_NAME \
231231
--workspace-name $WORKSPACE_NAME \
232232
--query primarySharedKey \
233233
--output tsv)
234-
lOG_ANALYTICS_KEY_ENC=$(printf %s $lOG_ANALYTICS_KEY | base64 -w0) # Needed for the next step
234+
LOG_ANALYTICS_KEY_ENC=$(printf %s $LOG_ANALYTICS_KEY | base64 -w0) # Needed for the next step
235235
```
236236
237237
# [PowerShell](#tab/azure-powershell)
@@ -243,12 +243,12 @@ A [Log Analytics workspace](../azure-monitor/logs/quick-create-workspace.md) pro
243243
--query customerId `
244244
--output tsv)
245245
$LOG_ANALYTICS_WORKSPACE_ID_ENC=[Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($LOG_ANALYTICS_WORKSPACE_ID))# Needed for the next step
246-
$lOG_ANALYTICS_KEY=$(az monitor log-analytics workspace get-shared-keys `
246+
$LOG_ANALYTICS_KEY=$(az monitor log-analytics workspace get-shared-keys `
247247
--resource-group $GROUP_NAME `
248248
--workspace-name $WORKSPACE_NAME `
249249
--query primarySharedKey `
250250
--output tsv)
251-
$lOG_ANALYTICS_KEY_ENC=[Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($lOG_ANALYTICS_KEY))
251+
$LOG_ANALYTICS_KEY_ENC=[Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($LOG_ANALYTICS_KEY))
252252
```
253253
254254
---
@@ -296,7 +296,7 @@ A [Log Analytics workspace](../azure-monitor/logs/quick-create-workspace.md) pro
296296
--configuration-settings "envoy.annotations.service.beta.kubernetes.io/azure-load-balancer-resource-group=${AKS_CLUSTER_GROUP_NAME}" \
297297
--configuration-settings "logProcessor.appLogs.destination=log-analytics" \
298298
--configuration-protected-settings "logProcessor.appLogs.logAnalyticsConfig.customerId=${LOG_ANALYTICS_WORKSPACE_ID_ENC}" \
299-
--configuration-protected-settings "logProcessor.appLogs.logAnalyticsConfig.sharedKey=${lOG_ANALYTICS_KEY_ENC}"
299+
--configuration-protected-settings "logProcessor.appLogs.logAnalyticsConfig.sharedKey=${LOG_ANALYTICS_KEY_ENC}"
300300
```
301301
302302
# [PowerShell](#tab/azure-powershell)
@@ -318,7 +318,7 @@ A [Log Analytics workspace](../azure-monitor/logs/quick-create-workspace.md) pro
318318
--configuration-settings "envoy.annotations.service.beta.kubernetes.io/azure-load-balancer-resource-group=${AKS_CLUSTER_GROUP_NAME}" `
319319
--configuration-settings "logProcessor.appLogs.destination=log-analytics" `
320320
--configuration-protected-settings "logProcessor.appLogs.logAnalyticsConfig.customerId=${LOG_ANALYTICS_WORKSPACE_ID_ENC}" `
321-
--configuration-protected-settings "logProcessor.appLogs.logAnalyticsConfig.sharedKey=${lOG_ANALYTICS_KEY_ENC}"
321+
--configuration-protected-settings "logProcessor.appLogs.logAnalyticsConfig.sharedKey=${LOG_ANALYTICS_KEY_ENC}"
322322
```
323323
324324
---

articles/private-link/private-endpoint-overview.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ A private-link resource is the destination target of a specified private endpoin
8080
| Azure Data Factory | Microsoft.DataFactory/factories | dataFactory |
8181
| Azure Data Explorer | Microsoft.Kusto/clusters | cluster |
8282
| Azure Database for MariaDB | Microsoft.DBforMariaDB/servers | mariadbServer |
83-
| Azure Database for MySQL | Microsoft.DBforMySQL/servers | mysqlServer |
83+
| Azure Database for MySQL - Single Server | Microsoft.DBforMySQL/servers | mysqlServer |
84+
| Azure Database for MySQL- Flexible Server | Microsoft.DBforMySQL/flexibleServers | mysqlServer |
8485
| Azure Database for PostgreSQL - Single server | Microsoft.DBforPostgreSQL/servers | postgresqlServer |
8586
| Azure Device Provisioning Service | Microsoft.Devices/provisioningServices | iotDps |
8687
| Azure IoT Hub | Microsoft.Devices/IotHubs | iotHub |

0 commit comments

Comments
 (0)