Skip to content

Commit 3e3ee37

Browse files
authored
Merge pull request #236665 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 f178728 + ffb6dd8 commit 3e3ee37

23 files changed

+76
-68
lines changed

articles/active-directory/external-identities/user-properties.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ This property indicates the relationship of the user to the host tenancy. This p
7575
7676
### Identities
7777

78-
This property indicates the user’s primary identity provider. A user can have several identity providers, which can be viewed by selecting the link next to **Identities** in the user’s profile or by querying the `onPremisesSyncEnabled` property via the Microsoft Graph API.
78+
This property indicates the user’s primary identity provider. A user can have several identity providers, which can be viewed by selecting the link next to **Identities** in the user’s profile or by querying the `identities` property via the Microsoft Graph API.
7979

8080
> [!NOTE]
8181
> Identities and UserType are independent properties. A value of Identities does not imply a particular value for UserType

articles/api-management/api-management-howto-integrate-internal-vnet-appgateway.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ The following example shows how to create a virtual network by using Resource Ma
179179
180180
The following example shows how to create an API Management instance in a virtual network configured for internal access only.
181181
182-
1. API Management stv2 requires a public IP with a `DomainNameLabel`:
182+
1. API Management stv2 requires a public IP with a unique `DomainNameLabel`:
183183
184184
```powershell
185185
$apimPublicIpAddressId = New-AzPublicIpAddress -ResourceGroupName $resGroupName -name "pip-apim" -location $location `
@@ -213,17 +213,17 @@ To set up custom domain names in API Management:
213213
1. Initialize the following variables with the details of the certificates with private keys for the domains and the trusted root certificate. In this example, we use `api.contoso.net`, `portal.contoso.net`, and `management.contoso.net`.
214214
215215
```powershell
216-
$gatewayHostname = "api.$domain" # API gateway host
217-
$portalHostname = "portal.$domain" # API developer portal host
218-
$managementHostname = "management.$domain" # API management endpoint host
219-
$gatewayCertPfxPath = "C:\Users\Contoso\gateway.pfx" # Full path to api.contoso.net .pfx file
220-
$portalCertPfxPath = "C:\Users\Contoso\portal.pfx" # Full path to portal.contoso.net .pfx file
221-
$managementCertPfxPath = "C:\Users\Contoso\management.pfx" # Full path to management.contoso.net .pfx file
222-
$gatewayCertPfxPassword = "certificatePassword123" # Password for api.contoso.net pfx certificate
223-
$portalCertPfxPassword = "certificatePassword123" # Password for portal.contoso.net pfx certificate
224-
$managementCertPfxPassword = "certificatePassword123" # Password for management.contoso.net pfx certificate
216+
$gatewayHostname = "api.$domain" # API gateway host
217+
$portalHostname = "portal.$domain" # API developer portal host
218+
$managementHostname = "management.$domain" # API management endpoint host
219+
$gatewayCertPfxPath = "C:\Users\Contoso\gateway.pfx" # Full path to api.contoso.net .pfx file
220+
$portalCertPfxPath = "C:\Users\Contoso\portal.pfx" # Full path to portal.contoso.net .pfx file
221+
$managementCertPfxPath = "C:\Users\Contoso\management.pfx" # Full path to management.contoso.net .pfx file
222+
$gatewayCertPfxPassword = "certificatePassword123" # Password for api.contoso.net pfx certificate
223+
$portalCertPfxPassword = "certificatePassword123" # Password for portal.contoso.net pfx certificate
224+
$managementCertPfxPassword = "certificatePassword123" # Password for management.contoso.net pfx certificate
225225
# Path to trusted root CER file used in Application Gateway HTTP settings
226-
$trustedRootCertCerPath = "C:\Users\Contoso\trustedroot.cer" # Full path to contoso.net trusted root .cer file
226+
$trustedRootCertCerPath = "C:\Users\Contoso\trustedroot.cer" # Full path to contoso.net trusted root .cer file
227227
228228
$certGatewayPwd = ConvertTo-SecureString -String $gatewayCertPfxPassword -AsPlainText -Force
229229
$certPortalPwd = ConvertTo-SecureString -String $portalCertPfxPassword -AsPlainText -Force

articles/api-management/api-management-howto-log-event-hubs.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ resource ehLoggerWithSystemAssignedIdentity 'Microsoft.ApiManagement/service/log
132132
loggerType: 'azureEventHub'
133133
description: 'Event hub logger with system-assigned managed identity'
134134
credentials: {
135-
endpointAddress: 'https://<EventHubsNamespace>.servicebus.windows.net/<EventHubName>'
135+
endpointAddress: '<EventHubsNamespace>.servicebus.windows.net/<EventHubName>'
136136
identityClientId: 'systemAssigned'
137137
name: 'ApimEventHub'
138138
}
@@ -154,7 +154,7 @@ Include a JSON snippet similar to the following in your Azure Resource Manager t
154154
"description": "Event hub logger with system-assigned managed identity",
155155
"resourceId": "<EventHubsResourceID>",
156156
"credentials": {
157-
"endpointAddress": "https://<EventHubsNamespace>.servicebus.windows.net/<EventHubName>",
157+
"endpointAddress": "<EventHubsNamespace>.servicebus.windows.net/<EventHubName>",
158158
"identityClientId": "SystemAssigned",
159159
"name": "ApimEventHub"
160160
},
@@ -182,7 +182,7 @@ resource ehLoggerWithUserAssignedIdentity 'Microsoft.ApiManagement/service/logge
182182
loggerType: 'azureEventHub'
183183
description: 'Event hub logger with user-assigned managed identity'
184184
credentials: {
185-
endpointAddress: 'https://<EventHubsNamespace>.servicebus.windows.net/<EventHubName>'
185+
endpointAddress: '<EventHubsNamespace>.servicebus.windows.net/<EventHubName>'
186186
identityClientId: '<ClientID>'
187187
name: 'ApimEventHub'
188188
}
@@ -204,7 +204,7 @@ Include a JSON snippet similar to the following in your Azure Resource Manager t
204204
"description": "Event hub logger with user-assigned managed identity",
205205
"resourceId": "<EventHubsResourceID>",
206206
"credentials": {
207-
"endpointAddress": "https://<EventHubsNamespace>.servicebus.windows.net/<EventHubName>",
207+
"endpointAddress": "<EventHubsNamespace>.servicebus.windows.net/<EventHubName>",
208208
"identityClientId": "<ClientID>",
209209
"name": "ApimEventHub"
210210
},

articles/app-service/app-service-key-vault-references.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ In order to read secrets from Key Vault, you need to have a vault created and gi
2828

2929
### Access network-restricted vaults
3030

31-
If your vault is configured with [network restrictions](../key-vault/general/overview-vnet-service-endpoints.md), you will also need to ensure that the application has network access.
31+
If your vault is configured with [network restrictions](../key-vault/general/overview-vnet-service-endpoints.md), you will also need to ensure that the application has network access. Vaults shouldn't depend on the app's public outbound IPs because the origin IP of the secret request could be different. Instead, the vault should be configured to accept traffic from a virtual network used by the app.
3232

3333
1. Make sure the application has outbound networking capabilities configured, as described in [App Service networking features](./networking-features.md) and [Azure Functions networking options](../azure-functions/functions-networking-options.md).
3434

@@ -50,9 +50,11 @@ If your vault is configured with [network restrictions](../key-vault/general/ove
5050
5151
2. Make sure that the vault's configuration accounts for the network or subnet through which your app will access it.
5252
53+
5354
> [!NOTE]
5455
> Windows container currently does not support Key Vault references over VNet Integration.
5556
57+
5658
### Access vaults with a user-assigned identity
5759
5860
Some apps need to reference secrets at creation time, when a system-assigned identity would not yet be available. In these cases, a user-assigned identity can be created and given access to the vault in advance.
@@ -173,9 +175,9 @@ An example pseudo-template for a function app might look like the following:
173175
"[resourceId('Microsoft.KeyVault/vaults/secrets', variables('keyVaultName'), variables('appInsightsKeyName'))]"
174176
],
175177
"properties": {
176-
"AzureWebJobsStorage": "[concat('@Microsoft.KeyVault(SecretUri=', reference(variables('storageConnectionStringResourceId')).secretUriWithVersion, ')')]",
177-
"WEBSITE_CONTENTAZUREFILECONNECTIONSTRING": "[concat('@Microsoft.KeyVault(SecretUri=', reference(variables('storageConnectionStringResourceId')).secretUriWithVersion, ')')]",
178-
"APPINSIGHTS_INSTRUMENTATIONKEY": "[concat('@Microsoft.KeyVault(SecretUri=', reference(variables('appInsightsKeyResourceId')).secretUriWithVersion, ')')]",
178+
"AzureWebJobsStorage": "[concat('@Microsoft.KeyVault(SecretUri=', reference(variables('storageConnectionStringName')).secretUriWithVersion, ')')]",
179+
"WEBSITE_CONTENTAZUREFILECONNECTIONSTRING": "[concat('@Microsoft.KeyVault(SecretUri=', reference(variables('storageConnectionStringName')).secretUriWithVersion, ')')]",
180+
"APPINSIGHTS_INSTRUMENTATIONKEY": "[concat('@Microsoft.KeyVault(SecretUri=', reference(variables('appInsightsKeyName')).secretUriWithVersion, ')')]",
179181
"WEBSITE_ENABLE_SYNC_UPDATE_SITE": "true"
180182
//...
181183
}

articles/app-service/quickstart-golang.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ author: msangapu-msft
1414
> Go on App Service on Linux is _experimental_.
1515
>
1616
17-
In this quickstart, you'll deploy a Go web app to Azure App Service. Azure App Service is a fully managed web hosting service that supports Go 1.18 and higher apps hosted in a Linux server environment.
17+
In this quickstart, you'll deploy a Go web app to Azure App Service. Azure App Service is a fully managed web hosting service that supports Go 1.19 and higher apps hosted in a Linux server environment.
1818

1919
To complete this quickstart, you need:
2020

2121
- An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free/?ref=microsoft.com&utm_source=microsoft.com&utm_medium=docs).
22-
- [Go 1.18](https://go.dev/dl/) or higher installed locally.
22+
- [Go 1.19](https://go.dev/dl/) or higher installed locally.
2323

2424
## 1 - Sample application
2525

@@ -67,7 +67,7 @@ az login
6767
Create the webapp and other resources, then deploy your code to Azure using [az webapp up](/cli/azure/webapp#az-webapp-up).
6868

6969
```azurecli
70-
az webapp up --runtime GO:1.18 --os linux --sku B1
70+
az webapp up --runtime GO:1.19 --os linux --sku B1
7171
```
7272

7373
* The `--runtime` parameter specifies what version of Go your app is running. This example uses Go 1.18. To list all available runtimes, use the command `az webapp list-runtimes --os linux --output table`.
@@ -95,7 +95,7 @@ You can launch the app at http://&lt;app-name>.azurewebsites.net
9595
"name": "&lt;app-name>",
9696
"os": "&lt;os-type>",
9797
"resourcegroup": "&lt;group-name>",
98-
"runtime_version": "go|1.18",
98+
"runtime_version": "go|1.19",
9999
"runtime_version_detected": "0.0",
100100
"sku": "FREE",
101101
"src_path": "&lt;your-folder-location>"

articles/app-service/quickstart-wordpress.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.custom: mvc
1111
---
1212
# Create a WordPress site
1313

14-
[WordPress](https://www.wordpress.org) is an open source content management system (CMS) used by over 40% of the web to create websites, blogs, and other applications. WordPress can be run on a few different Azure services: [AKS](../mysql/flexible-server/tutorial-deploy-wordpress-on-aks.md), [Virtual Machines](../virtual-machines/linux/tutorial-lamp-stack.md#install-wordpress), and App Service. For a full list of WordPress options on Azure, see [WordPress on Azure Marketplace](https://azuremarketplace.microsoft.com/marketplace/apps?search=wordpress&page=1).
14+
[WordPress](https://www.wordpress.org) is an open source content management system (CMS) used by over 40% of the web to create websites, blogs, and other applications. WordPress can be run on a few different Azure services: [AKS](../mysql/flexible-server/tutorial-deploy-wordpress-on-aks.md), [Virtual Machines](../virtual-machines/linux/tutorial-lamp-stack.md#install-wordpress), [Azure Container Apps](https://github.com/Azure-Samples/apptemplate-wordpress-on-ACA) and App Service. For a full list of WordPress options on Azure, see [WordPress on Azure Marketplace](https://azuremarketplace.microsoft.com/marketplace/apps?search=wordpress&page=1).
1515

1616
In this quickstart, you'll learn how to create and deploy your first [WordPress](https://www.wordpress.org/) site to [Azure App Service on Linux](overview.md#app-service-on-linux) with [Azure Database for MySQL - Flexible Server](../mysql/flexible-server/index.yml) using the [WordPress Azure Marketplace item by App Service](https://azuremarketplace.microsoft.com/marketplace/apps/WordPress.WordPress?tab=Overview). This quickstart uses the **Basic** tier for your app and a **Burstable, B1ms** tier for your database, and incurs a cost for your Azure Subscription. For pricing, visit [App Service pricing](https://azure.microsoft.com/pricing/details/app-service/linux/) and [Azure Database for MySQL pricing](https://azure.microsoft.com/pricing/details/mysql/flexible-server/).
1717

articles/azure-functions/durable/durable-functions-bindings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ public static string SayHello([ActivityTrigger] string name)
361361
In the .NET-isolated worker, only serializable types representing your input are supported for the `[ActivityTrigger]`.
362362

363363
```csharp
364-
[FunctionName("SayHello")]
364+
[Function("SayHello")]
365365
public static string SayHello([ActivityTrigger] string name)
366366
{
367367
return $"Hello {name}!";

articles/azure-monitor/app/javascript-sdk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ Check the data flow by going to the Azure portal and navigating to the Applicati
131131

132132
Additionally, you can use the SDK's trackPageView() method to manually send a page view event and verify that it appears in the portal.
133133

134-
If you can't run the application or you aren't getting data as expected, wee the dedicated [troubleshooting article](/troubleshoot/azure/azure-monitor/app-insights/javascript-sdk-troubleshooting).
134+
If you can't run the application or you aren't getting data as expected, see the dedicated [troubleshooting article](/troubleshoot/azure/azure-monitor/app-insights/javascript-sdk-troubleshooting).
135135

136136
### Analytics
137137

articles/batch/batch-mpi.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ myCloudPool.TaskSlotsPerNode = 1;
6161

6262
> [!NOTE]
6363
> If you try to run a multi-instance task in a pool with internode communication disabled, or with a *taskSlotsPerNode* value greater than 1, the task is never scheduled--it remains indefinitely in the "active" state.
64+
>
65+
> Pools with InterComputeNodeCommunication enabled will not allow automatically the deprovision of the node.
6466

6567
### Use a StartTask to install MPI
6668

@@ -307,4 +309,4 @@ Sample complete, hit ENTER to exit...
307309
## Next steps
308310

309311
- Read more about [MPI support for Linux on Azure Batch](/archive/blogs/windowshpc/introducing-mpi-support-for-linux-on-azure-batch).
310-
- Learn how to [create pools of Linux compute nodes](batch-linux-nodes.md) for use in your Azure Batch MPI solutions.
312+
- Learn how to [create pools of Linux compute nodes](batch-linux-nodes.md) for use in your Azure Batch MPI solutions.

articles/batch/create-pool-extensions.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ Request Body
9797
"resizeTimeout": "PT15M"
9898
}
9999
}
100+
}
101+
}
100102
```
101103

102104
## Get extension data from a pool
@@ -106,7 +108,7 @@ The example below retrieves data from the Azure Key Vault extension.
106108
REST API URI
107109

108110
```http
109-
GET https://<accountname>.<region>.batch.azure.com/pools/test3/nodes/tvmps_a3ce79db285d6c124399c5bd3f3cf308d652c89675d9f1f14bfc184476525278_d/extensions/secretext?api-version=2010-01-01
111+
GET https://<accountName>.<region>.batch.azure.com/pools/<poolName>/nodes/<tvmNodeName>/extensions/secretext?api-version=2010-01-01
110112
```
111113

112114
Response Body

0 commit comments

Comments
 (0)