Skip to content

Commit 62f0990

Browse files
authored
Merge pull request #262120 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 fe7403b + 1a524df commit 62f0990

File tree

12 files changed

+63
-19
lines changed

12 files changed

+63
-19
lines changed

articles/azure-functions/storage-considerations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ You can mount existing Azure Files shares to your Linux function apps. By mounti
182182

183183
In this command, `share-name` is the name of the existing Azure Files share, and `custom-id` can be any string that uniquely defines the share when mounted to the function app. Also, `mount-path` is the path from which the share is accessed in your function app. `mount-path` must be in the format `/dir-name`, and it can't start with `/home`.
184184

185-
For a complete example, see the scripts in [Create a Python function app and mount a Azure Files share](scripts/functions-cli-mount-files-storage-linux.md).
185+
For a complete example, see the scripts in [Create a Python function app and mount an Azure Files share](scripts/functions-cli-mount-files-storage-linux.md).
186186

187187
# [Azure PowerShell](#tab/azure-powershell)
188188

articles/azure-monitor/app/worker-service.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ You must have a valid Application Insights connection string. This string is req
3333

3434
```xml
3535
<ItemGroup>
36-
<PackageReference Include="Microsoft.ApplicationInsights.WorkerService" Version="2.13.1" />
36+
<PackageReference Include="Microsoft.ApplicationInsights.WorkerService" Version="2.22.0" />
3737
</ItemGroup>
3838
```
3939

articles/azure-resource-manager/bicep/user-defined-data-types.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ param serviceConfig ServiceConfig = { type: 'bar', value: true }
256256
output config object = serviceConfig
257257
```
258258

259-
The parameter value is validated based on the discriminated property value. In the preceeding example, if the *serviceConfig* parameter value is of type *foo*, it undergoes validation using the *FooConfig*type. Likewise, if the parameter value is of type *bar*, validation is performed using the *BarConfig* type, and this pattern continues for other types as well.
259+
The parameter value is validated based on the discriminated property value. In the preceding example, if the *serviceConfig* parameter value is of type *foo*, it undergoes validation using the *FooConfig*type. Likewise, if the parameter value is of type *bar*, validation is performed using the *BarConfig* type, and this pattern continues for other types as well.
260260

261261
## Import types between Bicep files (Preview)
262262

articles/azure-resource-manager/management/resource-name-rules.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -537,9 +537,9 @@ In the following tables, the term alphanumeric refers to:
537537
> [!div class="mx-tableFixed"]
538538
> | Entity | Scope | Length | Valid Characters |
539539
> | --- | --- | --- | --- |
540-
> | workspaces | resource group | 3-33 | Alphanumerics and hyphens |
540+
> | workspaces | resource group | 3-33 | Alphanumerics, hyphens, and underscores. |
541541
> | workspaces / computes | workspace | 3-24 for compute instance<br>3-32 for AML compute<br>2-16 for other compute types | Alphanumerics and hyphens. |
542-
> | workspaces / datastores | workspace | Maximum 255 characters for datastore name| Datastore name consists only of lowercase letters, digits, and underscores |
542+
> | workspaces / datastores | workspace | Maximum 255 characters for datastore name| Datastore name consists only of lowercase letters, digits, and underscores. |
543543
544544
## Microsoft.ManagedIdentity
545545

articles/container-apps/dapr-component-resiliency.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ resource myPolicyDoc 'Microsoft.App/managedEnvironments/daprComponents/resilienc
5959
maxIntervalInMilliseconds: 10000
6060
}
6161
}
62-
},
62+
}
6363
inboundPolicy: {
6464
timeoutPolicy: {
6565
responseTimeoutInSeconds: 15
@@ -208,7 +208,7 @@ properties: {
208208
timeoutPolicy: {
209209
responseTimeoutInSeconds: 15
210210
}
211-
},
211+
}
212212
inbound: {
213213
timeoutPolicy: {
214214
responseTimeoutInSeconds: 15
@@ -236,7 +236,7 @@ properties: {
236236
maxIntervalInMilliseconds: 10000
237237
}
238238
}
239-
},
239+
}
240240
inbound: {
241241
httpRetryPolicy: {
242242
maxRetries: 5

articles/container-instances/container-instances-egress-ip-address.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ View the container logs to confirm the IP address is the same as the public IP a
163163

164164
```azurecli
165165
az container logs \
166-
--sed 's/$RESOURCE_GROUP_NAME/$resourceGroup/g'
166+
--resource-group $resourceGroup \
167167
--name testegress
168168
```
169169

articles/cosmos-db/introduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Today's applications are required to be highly responsive and always online. To
1919

2020
Recently, the surge of AI-powered applications created another layer of complexity, because many of these applications currently integrate a multitude of data stores. For example, some teams built applications that simultaneously connect to MongoDB, Postgres, and Gremlin. These databases differ in implementation workflow and operational performances, posing extra complexity for scaling applications. Azure Cosmos DB can simplify and expedite your development by being the single AI database for your applications. Azure Cosmos DB accommodates all your operational data models, including relational, document, vector, key-value, graph, and table.
2121

22-
Azure Cosmos DB is a fully managed NoSQL and relational database for modern app development including; AI, digital commerce, Internet of Things, booking management, and other types of solutions. Azure Cosmos DB offers single-digit millisecond response times, automatic and instant scalability, along with guaranteed speed at any scale. Business continuity is assured with [SLA-backed](https://azure.microsoft.com/support/legal/sla/cosmos-db) availability and enterprise-grade security.
22+
Azure Cosmos DB is a fully managed NoSQL and relational database for modern app development including AI, digital commerce, Internet of Things, booking management, and other types of solutions. Azure Cosmos DB offers single-digit millisecond response times, automatic and instant scalability, along with guaranteed speed at any scale. Business continuity is assured with [SLA-backed](https://azure.microsoft.com/support/legal/sla/cosmos-db) availability and enterprise-grade security.
2323

2424
App development is faster and more productive thanks to:
2525

articles/databox-online/azure-stack-edge-gpu-manage-shares.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Do the following steps in the Azure portal to create a share.
6969
3. Select a **Type** for the share. The type can be **SMB** or **NFS**, with SMB being the default. SMB is the standard for Windows clients, and NFS is used for Linux clients. Depending upon whether you choose SMB or NFS shares, options presented are slightly different.
7070

7171
> [!IMPORTANT]
72-
> Make sure that the Azure Storage account that you use doesn't have immutability policies set on it if you're using it with a Azure Stack Edge Pro or Data Box Gateway device. For more information, see [Set and manage immutability policies for blob storage](../storage/blobs/immutable-policy-configure-version-scope.md).
72+
> Make sure that the Azure Storage account that you use doesn't have immutability policies set on it if you're using it with an Azure Stack Edge Pro or Data Box Gateway device. For more information, see [Set and manage immutability policies for blob storage](../storage/blobs/immutable-policy-configure-version-scope.md).
7373
7474
4. To easily access the shares from Edge compute modules, use the local mount point. Select **Use the share with Edge compute** so that the Edge module can use the compute with the local mount point.
7575

@@ -236,4 +236,4 @@ Do the following steps in the Azure portal to sync your storage access key.
236236

237237
## Next steps
238238

239-
- Learn how to [Manage users via Azure portal](azure-stack-edge-gpu-manage-users.md).
239+
- Learn how to [Manage users via Azure portal](azure-stack-edge-gpu-manage-users.md).

articles/machine-learning/v1/azure-machine-learning-release-notes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ __RSS feed__: Get notified when this page is updated by copying and pasting the
4242
+ Support of features/regressors known at the time of forecast in AutoML forecasting TCN models.
4343
+ **azureml-core**
4444
+ Add appinsights location swap for qatarcentral to point to uaenorth
45+
+ [Python 3.7 reached end-of-life on June 27th 2023](https://devguide.python.org/versions/). Consequently, 3.7 will be deprecated in azureml-core starting in October 2023 and azureml-core will end support for 3.7 in February 2024.
4546
+ **azureml-mlflow**
4647
+ Fix for loading models with MLflow load_model APIs when passing an AzureML URI
4748
+ **azureml-pipeline-core**

articles/service-fabric/service-fabric-cluster-creation-setup-aad.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ A Service Fabric cluster offers several entry points to its management functiona
3131
> [!NOTE]
3232
> Microsoft Entra ID now requires an application (app registration) publishers domain to be verified or use of default scheme. See [Configure an application's publisher domain](../active-directory/develop/howto-configure-publisher-domain.md) and [AppId Uri in single tenant applications will require use of default scheme or verified domains](../active-directory/develop/reference-breaking-changes.md#appid-uri-in-single-tenant-applications-will-require-use-of-default-scheme-or-verified-domains) for additional information.
3333
34+
> [!NOTE]
35+
> Starting in Service Fabric 11.0, Service Fabric Explorer will require a Single-page application Redirect URI instead of a Web Redirect URI.
36+
37+
3438
## Prerequisites
3539

3640
In this article, we assume that you have already created a tenant. If you have not, start by reading [How to get a Microsoft Entra tenant][active-directory-howto-tenant].
@@ -61,7 +65,7 @@ Run `SetupApplications.ps1` and provide the tenant ID, cluster name, web applica
6165

6266
- **clusterName:** *ClusterName* is used to prefix the Microsoft Entra applications that are created by the script. It does not need to match the actual cluster name exactly. It is intended only to make it easier to map Microsoft Entra artifacts to the Service Fabric cluster that they're being used with.
6367

64-
- **webApplicationReplyUrl:** *WebApplicationReplyUrl* is the default endpoint that Microsoft Entra ID returns to your users after they finish signing in. Set this endpoint as the Service Fabric Explorer endpoint for your cluster. If you are creating Microsoft Entra applications to represent an existing cluster, make sure this URL matches your existing cluster's endpoint. If you are creating applications for a new cluster, plan the endpoint your cluster will have and make sure not to use the endpoint of an existing cluster. By default the Service Fabric Explorer endpoint is: `https://<cluster_domain>:19080/Explorer`
68+
- **SpaApplicationReplyUrl:** *SpaApplicationReplyUrl* is the default endpoint that Microsoft Entra ID returns to your users after they finish signing in. Set this endpoint as the Service Fabric Explorer endpoint for your cluster. If you are creating Microsoft Entra applications to represent an existing cluster, make sure this URL matches your existing cluster's endpoint. If you are creating applications for a new cluster, plan the endpoint your cluster will have and make sure not to use the endpoint of an existing cluster. By default the Service Fabric Explorer endpoint is: `https://<cluster_domain>:19080/Explorer/index.html`
6569

6670
- **webApplicationUri:** *WebApplicationUri* is either the URI of a 'verified domain' or URI using API scheme format of api://{{tenant Id}}/{{cluster name}}. See [AppId Uri in single tenant applications will require use of default scheme or verified domains](../active-directory/develop/reference-breaking-changes.md#appid-uri-in-single-tenant-applications-will-require-use-of-default-scheme-or-verified-domains) for additional information.
6771

@@ -78,13 +82,13 @@ Run `SetupApplications.ps1` and provide the tenant ID, cluster name, web applica
7882
7983
$tenantId = '0e3d2646-78b3-4711-b8be-74a381d9890c'
8084
$clusterName = 'mysftestcluster'
81-
$webApplicationReplyUrl = 'https://mysftestcluster.eastus.cloudapp.azure.com:19080/Explorer/index.html' # <--- client browser redirect url
85+
$spaApplicationReplyUrl = 'https://mysftestcluster.eastus.cloudapp.azure.com:19080/Explorer/index.html' # <--- client browser redirect url
8286
#$webApplicationUri = 'https://mysftestcluster.contoso.com' # <--- must be verified domain due to AAD changes
8387
$webApplicationUri = "api://$tenantId/$clusterName" # <--- does not have to be verified domain
8488
8589
$configObj = .\SetupApplications.ps1 -TenantId $tenantId `
8690
-ClusterName $clusterName `
87-
-WebApplicationReplyUrl $webApplicationReplyUrl `
91+
-SpaApplicationReplyUrl $spaApplicationReplyUrl `
8892
-AddResourceAccess `
8993
-WebApplicationUri $webApplicationUri `
9094
-Verbose
@@ -183,7 +187,7 @@ It may be necessary to 'Grant admin consent' for the 'API permissions' being con
183187

184188
## Verifying Microsoft Entra Configuration
185189

186-
Navigate to the Service Fabric Explorer (SFX) URL. This should be the same as the parameter webApplicationReplyUrl. An Azure authentication dialog should be displayed. Log on with an account configured with the new Microsoft Entra configuration. Verify that the administrator account has read/write access and that the user has read access. Any modification to the cluster, for example, performing an action, is an administrative action.
190+
Navigate to the Service Fabric Explorer (SFX) URL. This should be the same as the parameter spaApplicationReplyUrl. An Azure authentication dialog should be displayed. Log on with an account configured with the new Microsoft Entra configuration. Verify that the administrator account has read/write access and that the user has read access. Any modification to the cluster, for example, performing an action, is an administrative action.
187191

188192

189193
<a name='troubleshooting-help-in-setting-up-azure-active-directory'></a>

0 commit comments

Comments
 (0)