Skip to content

Commit 6028f74

Browse files
authored
Merge pull request #194121 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 4cdbb09 + 77ab97a commit 6028f74

File tree

7 files changed

+20
-26
lines changed

7 files changed

+20
-26
lines changed

articles/active-directory/develop/msal-authentication-flows.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ In the preceding diagram:
132132

133133
## Implicit grant
134134

135-
The implicit grant has been replaced by the [authorization code flow with PCKE](scenario-spa-overview.md) as the preferred and more secure token grant flow for client-side single page-applications (SPAs). If you're building a SPA, use the authorization code flow with PKCE instead.
135+
The implicit grant has been replaced by the [authorization code flow with PKCE](scenario-spa-overview.md) as the preferred and more secure token grant flow for client-side single page-applications (SPAs). If you're building a SPA, use the authorization code flow with PKCE instead.
136136

137137
Single-page web apps written in JavaScript (including frameworks like Angular, Vue.js, or React.js) are downloaded from the server and their code runs directly in the browser. Because their client-side code runs in the browser and not on a web server, they have different security characteristics than traditional server-side web applications. Prior to the availability of Proof Key for Code Exchange (PKCE) for the authorization code flow, the implicit grant flow was used by SPAs for improved responsiveness and efficiency in getting access tokens.
138138

articles/azure-sql/database/auditing-overview.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ You can use SQL Database auditing to:
4242
- **Hierarchical namespace** for **Azure Data Lake Storage Gen2 storage account** is currently **not supported**.
4343
- Enabling auditing on a paused **Azure Synapse** is not supported. To enable auditing, resume Azure Synapse.
4444
- Auditing for **Azure Synapse SQL pools** supports default audit action groups **only**.
45+
- When you configure the auditing in Azure SQL Server or Azure SQL Database with log destination as the storage account, the target storage account must be enabled with access to storage account keys. If the storage account is configured to use Azure AD authentication only and not configured for access key usage, the auditing cannot be configured. <!-- REST API reference: - https://docs.microsoft.com/rest/api/sql/2021-08-01-preview/server-blob-auditing-policies/create-or-update -->
4546

4647

4748
#### <a id="server-vs-database-level"></a>Define server-level vs. database-level auditing policy

articles/azure-vmware/attach-disk-pools-to-azure-vmware-solution-hosts.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
---
2-
title: Attach disk pools to Azure VMware Solution hosts (Preview)
3-
description: Learn how to attach a disk pool surfaced through an iSCSI target as the VMware datastore of an Azure VMware Solution private cloud. Once the datastore is configured, you can create volumes on it and attach them to your VMware instance.
2+
title: Attach Azure disk pools to Azure VMware Solution hosts (Preview)
3+
description: Learn how to attach an Azure disk pool surfaced through an iSCSI target as the VMware vSphere datastore of an Azure VMware Solution private cloud. Once the datastore is configured, you can create volumes on it and consume them from your Azure VMware Solution private cloud.
44
ms.topic: how-to
55
ms.date: 11/02/2021
6-
#Customer intent: As an Azure service administrator, I want to scale my AVS hosts using disk pools instead of scaling clusters. So that I can use block storage for active working sets and tier less frequently accessed data from vSAN to disks. I can also replicate data from on-premises or primary VMware environment to disk storage for the secondary site.
6+
#Customer intent: As an Azure service administrator, I want to scale my AVS hosts using disk pools instead of scaling clusters. So that I can use block storage for active working sets and tier less frequently accessed data from vSAN to disks. I can also replicate data from on-premises or primary VMware vSphere environment to disk storage for the secondary site.
77
ms.custom: ignite-fall-2021, devx-track-azurecli
88
ms.devlang: azurecli
99
---
1010

1111
# Attach disk pools to Azure VMware Solution hosts (Preview)
1212

13-
[Azure disk pools](../virtual-machines/disks-pools.md) offer persistent block storage to applications and workloads backed by Azure Disks. You can use disks as the persistent storage for Azure VMware Solution for optimal cost and performance. For example, you can scale up by using disk pools instead of scaling clusters if you host storage-intensive workloads. You can also use disks to replicate data from on-premises or primary VMware environments to disk storage for the secondary site. To scale storage independent of the Azure VMware Solution hosts, we support surfacing [ultra disks](../virtual-machines/disks-types.md#ultra-disks), [premium SSD](../virtual-machines/disks-types.md#premium-ssds) and [standard SSD](../virtual-machines/disks-types.md#standard-ssds) as the datastores.
13+
[Azure disk pools](../virtual-machines/disks-pools.md) offer persistent block storage to applications and workloads backed by Azure Disks. You can use disks as the persistent storage for Azure VMware Solution for optimal cost and performance. For example, you can scale up by using disk pools instead of scaling clusters if you host storage-intensive workloads. You can also use disks to replicate data from on-premises or primary VMware vSphere environments to disk storage for the secondary site. To scale storage independent of the Azure VMware Solution hosts, we support surfacing [ultra disks](../virtual-machines/disks-types.md#ultra-disks), [premium SSD](../virtual-machines/disks-types.md#premium-ssds) and [standard SSD](../virtual-machines/disks-types.md#standard-ssds) as the datastores.
1414

1515
>[!IMPORTANT]
1616
>Azure disk pools on Azure VMware Solution (Preview) is currently in public preview.

articles/azure-vmware/configure-alerts-for-azure-vmware-solution.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ The following metrics are visible through Azure Monitor Metrics.
4848

4949
1. Under **Condition**, select **Add condition**, and in the window that opens, selects the signal you want to create for the alert rule.
5050

51-
In our example, we've selected **Percentage Datastore Disk Used**, which is relevant from an [Azure VMware Solution SLA](https://aka.ms/avs/sla) perspective.
51+
In our example, we've selected **Percentage Datastore Disk Used**, which is relevant from an [Azure VMware Solution SLA](https://azure.microsoft.com/support/legal/sla/azure-vmware/v1_1/) perspective.
5252

5353
:::image type="content" source="media/configure-alerts-for-azure-vmware-solution/configure-signal-logic-options.png" alt-text="Screenshot showing the Configure signal logic window with signals to create for the alert rule.":::
5454

articles/azure-vmware/deploy-traffic-manager-balance-workloads.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ms.topic: how-to
55
ms.date: 02/08/2021
66
---
77

8-
# Deploy Traffic Manager to balance Azure VMware Solution workloads
8+
# Deploy Azure Traffic Manager to balance Azure VMware Solution workloads
99

1010
This article walks through the steps of how to integrate [Azure Traffic Manager](../traffic-manager/traffic-manager-overview.md) with Azure VMware Solution. The integration balances application workloads across multiple endpoints. This article also walks through the steps of how to configure Traffic Manager to direct traffic between three [Azure Application Gateway](../application-gateway/overview.md) spanning several Azure VMware Solution regions.
1111

articles/frontdoor/standard-premium/how-to-enable-private-link-internal-load-balancer.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,16 @@ In this section, you'll map the Private Link service to a private endpoint creat
4949

5050
| Setting | Value |
5151
| ------- | ----- |
52-
| Name | Enter a name to identify this storage blog origin. |
53-
| Origin Type | Storage (Azure Blobs) |
52+
| Name | Enter a name to identify this custom origin. |
53+
| Origin Type | Custom |
5454
| Host name | Select the host from the dropdown that you want as an origin. |
5555
| Origin host header | You can customize the host header of the origin or leave it as default. |
5656
| HTTP port | 80 (default) |
5757
| HTTPS port | 443 (default) |
5858
| Priority | Different origin can have different priorities to provide primary, secondary, and backup origins. |
5959
| Weight | 1000 (default). Assign weights to your different origin when you want to distribute traffic.|
6060
| Resource | If you select **In my directory**, specify the ILB resource in your subscription. |
61-
| ID/alias | If you select **By ID or alias**, specify the resource ID of the ILB resource you want to enable private link to. |
61+
| ID/alias | If you select **By ID or alias**, specify the resource ID of the Private Link Service resource you want to enable private link to. |
6262
| Region | Select the region that is the same or closest to your origin. |
6363
| Request message | Customize message or choose the default. |
6464

articles/machine-learning/data-science-virtual-machine/tools-included.md

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ The Data Science Virtual Machine comes with the most useful data-science tools p
4141
| Dlib | <span class='red-x'>&#10060;</span> | <span class='green-check'>&#9989;</span> | |
4242
| Docker | <span class='green-check'>&#9989;</span> <br/> (Windows containers only) | <span class='green-check'>&#9989;</span> | |
4343
| Nccl | <span class='red-x'>&#10060;</span> | <span class='green-check'>&#9989;</span> | |
44-
| Rattle | <span class='red-x'>&#10060;</span> | <span class='green-check'>&#9989;</span> | |
44+
| Rattle | <span class='red-x'>&#10060;</span> | <span class='red-x'>&#10060;</span> | |
4545
| ONNX Runtime | <span class='red-x'>&#10060;</span> | <span class='green-check'>&#9989;</span> | |
4646

4747

@@ -55,7 +55,7 @@ The Data Science Virtual Machine comes with the most useful data-science tools p
5555
| [Azure Storage Explorer](https://azure.microsoft.com/features/storage-explorer/) | <span class='green-check'>&#9989;</span></br> | <span class='green-check'>&#9989;</span></br> | |
5656
| [Azure CLI](/cli/azure) | <span class='green-check'>&#9989;</span></br> | <span class='green-check'>&#9989;</span></br> | |
5757
| [AzCopy](../../storage/common/storage-use-azcopy-v10.md) | <span class='green-check'>&#9989;</span></br> | <span class='red-x'>&#10060;</span> | [AzCopy on the DSVM](./dsvm-tools-ingestion.md#azcopy) |
58-
| [Blob FUSE driver](https://github.com/Azure/azure-storage-fuse) | <span class='red-x'>&#10060;</span> | <span class='green-check'>&#9989;</span></br> | [blobfuse on the DSVM](./dsvm-tools-ingestion.md#blobfuse) |
58+
| [Blob FUSE driver](https://github.com/Azure/azure-storage-fuse) | <span class='red-x'>&#10060;</span> | <span class='red-x'>&#10060;</span></br> | [blobfuse on the DSVM](./dsvm-tools-ingestion.md#blobfuse) |
5959
| [Azure Cosmos DB Data Migration Tool](../../cosmos-db/import-data.md) | <span class='green-check'>&#9989;</span> | <span class='red-x'>&#10060;</span> | [Cosmos DB on the DSVM](./dsvm-tools-ingestion.md#azure-cosmos-db-data-migration-tool) |
6060
| Unix/Linux command-line tools | <span class='red-x'>&#10060;</span> | <span class='green-check'>&#9989;</span> | |
6161
| Apache Spark 3.1 (standalone) | <span class='green-check'>&#9989;</span> | <span class='green-check'>&#9989;</span></br> | |
@@ -77,27 +77,20 @@ The Data Science Virtual Machine comes with the most useful data-science tools p
7777
| &nbsp;&nbsp;&nbsp;&nbsp; PySpark | | | [pySpark Jupyter Samples](./dsvm-samples-and-walkthroughs.md#sparkml) |
7878

7979
**Ubuntu 18.04 DSVM and Windows Server 2019 DSVM** has the following Jupyter Kernels:-</br>
80-
* Python 3.8 - default</br> 
81-
* Python 3.8 - PyTorch</br> 
82-
* Python 3.8 - TensorFlow</br> 
83-
* Python 3.6 - AzureML - TensorFlow</br> 
84-
* Python 3.6 - AzureML - PyTorch</br> 
85-
* Python 3.6 - AzureML – AutoML</br> 
80+
* Python3.8-default</br> 
81+
* Python3.8-Tensorflow-Pytorch</br> 
82+
* Python3.8-AzureML</br> 
8683
* R</br> 
8784
* Python 3.7 - Spark (local)</br> 
88-
* Julia 1.2.0</br> 
85+
* Julia 1.6.0</br> 
8986
* R Spark – HDInsight</br> 
9087
* Scala Spark – HDInsight</br> 
9188
* Python 3 Spark – HDInsight</br> 
9289

9390
**Ubuntu 18.04 DSVM and Windows Server 2019 DSVM** has the following conda environments:-</br>
94-
* py38_default  </br>
95-
* py38_tensorflow </br>
96-
* py38_pytorch  </br>
97-
* azureml_py36_tensorflow  </br>
98-
* azureml_py36_pytorch  </br>
99-
* azureml_py36_automl  </br>
100-
91+
* Python3.8-default  </br>
92+
* Python3.8-Tensorflow-Pytorch </br>
93+
* Python3.8-AzureML  </br>
10194

10295
## Use your preferred editor or IDE
10396

0 commit comments

Comments
 (0)