Skip to content

Commit 325d164

Browse files
authored
Merge pull request #204026 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 9439a4d + e5ff982 commit 325d164

File tree

9 files changed

+19
-23
lines changed

9 files changed

+19
-23
lines changed

articles/cosmos-db/includes/cosmos-db-emulator-docdb-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ ms.reviewer: mjbrown
1919
ms.custom: "include file"
2020
---
2121

22-
You can [try Azure Cosmos DB for free](../try-free.md), without an Azure subscription, and with no commitment required. Alternatively, you can create an [Azure Cosmos DB free tier account](../optimize-dev-test.md#azure-cosmos-db-free-tier), with the first 400 RU/s and 5 GB of storage for free. You can also use the [Azure Cosmos DB emulator](../local-emulator.md) with a URI of `https://localhost:8081`. For the key to use with the emulator, see [Authenticating requests](../local-emulator.md#authenticate-requests).
22+
You can [try Azure Cosmos DB for free](../try-free.md), without an Azure subscription, and with no commitment required. Alternatively, you can create an [Azure Cosmos DB free tier account](../optimize-dev-test.md#azure-cosmos-db-free-tier), with the first 1000 RU/s and 25 GB of storage for free. You can also use the [Azure Cosmos DB emulator](../local-emulator.md) with a URI of `https://localhost:8081`. For the key to use with the emulator, see [Authenticating requests](../local-emulator.md#authenticate-requests).

articles/defender-for-cloud/quickstart-enable-database-protections.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ You can enable database protection on your subscription, or exclude specific dat
3030

3131
## Prerequisites
3232

33-
- You must have Subscription Owner access
33+
You must have:
34+
35+
- [Subscription Owner](../role-based-access-control/built-in-roles.md#owner) access.
3436
- An Azure account. If you don't already have an Azure account, you can [create your Azure free account today](https://azure.microsoft.com/free/).
3537

3638
## Enable database protection on your subscription

articles/machine-learning/how-to-troubleshoot-online-endpoints.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ When you access online endpoints with REST requests, the returned status codes a
303303
| 401 | Unauthorized | You don't have permission to do the requested action, such as score, or your token is expired. |
304304
| 404 | Not found | Your URL isn't correct. |
305305
| 408 | Request timeout | The model execution took longer than the timeout supplied in `request_timeout_ms` under `request_settings` of your model deployment config.|
306-
| 424 | Model Error | If your model container returns a non-200 response, Azure returns a 424. Check response headers `ms-azureml-model-error-statuscode` and `ms-azureml-model-error-reason` for more information. |
306+
| 424 | Model Error | If your model container returns a non-200 response, Azure returns a 424. Check the `Model Status Code` dimension under the `Requests Per Minute` metric on your endpoint's [Azure Monitor Metric Explorer](/azure/azure-monitor/essentials/metrics-getting-started). Or check response headers `ms-azureml-model-error-statuscode` and `ms-azureml-model-error-reason` for more information. |
307307
| 429 | Rate-limiting | You attempted to send more than 100 requests per second to your endpoint. |
308308
| 429 | Too many pending requests | Your model is getting more requests than it can handle. We allow 2 * `max_concurrent_requests_per_instance` * `instance_count` requests at any time. Additional requests are rejected. You can confirm these settings in your model deployment config under `request_settings` and `scale_settings`. If you are using auto-scaling, your model is getting requests faster than the system can scale up. With auto-scaling, you can try to resend requests with [exponential backoff](https://aka.ms/exponential-backoff). Doing so can give the system time to adjust. |
309309
| 500 | Internal server error | Azure ML-provisioned infrastructure is failing. |

articles/marketplace/partner-center-portal/commercial-marketplace-lead-management-instructions-azure-table.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ If your customer relationship management (CRM) system isn't explicitly supported
4646

4747
:::image type="content" source="media/commercial-marketplace-lead-management-instructions-azure-table/azure-storage-keys.png" alt-text="Azure storage key.":::
4848

49-
1. From your storage account pane, select **Tables**, and select **+ Table** to create a table. Enter a name for your table and select **OK**. Save this value because you'll need it if you want to configure a flow to receive email notifications when leads are received.
49+
1. (Optional) From your storage account pane, select **Tables**, and select **+ Table** to create a table. Enter a name for your table and select **OK**. Save this value because you'll need it if you want to configure a flow to receive email notifications when leads are received.
5050
5151
![Azure tables](./media/commercial-marketplace-lead-management-instructions-azure-table/azure-tables.png)
5252

articles/purview/register-scan-power-bi-tenant.md

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.author: csugunan
66
ms.service: purview
77
ms.subservice: purview-data-map
88
ms.topic: how-to
9-
ms.date: 06/28/2022
9+
ms.date: 07/07/2022
1010
ms.custom: template-how-to, ignite-fall-2021
1111
---
1212

@@ -27,11 +27,9 @@ This article outlines how to register a Power BI tenant in a **same-tenant scena
2727
|Public access with Azure IR |Allowed |Allowed |Azure Runtime | Microsoft Purview Managed Identity | [Review deployment checklist](#deployment-checklist) |
2828
|Public access with Self-hosted IR |Allowed |Allowed |Self-hosted runtime |Delegated Authentication | [Review deployment checklist](#deployment-checklist) |
2929
|Private access |Allowed |Denied |Self-hosted runtime |Delegated Authentication | [Review deployment checklist](#deployment-checklist) |
30-
|Private access |Denied |Allowed* |Self-hosted runtime |Delegated Authentication | [Review deployment checklist](#deployment-checklist) |
30+
|Private access |Denied |Allowed |Self-hosted runtime |Delegated Authentication | [Review deployment checklist](#deployment-checklist) |
3131
|Private access |Denied |Denied |Self-hosted runtime |Delegated Authentication | [Review deployment checklist](#deployment-checklist) |
3232

33-
\* Power BI tenant must have a private endpoint that is deployed in a Virtual Network accessible from the self-hosted integration runtime VM. For more information, see [private endpoint for Power BI tenant](/power-bi/enterprise/service-security-private-links).
34-
3533
### Known limitations
3634

3735
- If Microsoft Purview or Power BI tenant is protected behind a private endpoint, Self-hosted runtime is the only option to scan.
@@ -129,9 +127,9 @@ Use any of the following deployment checklists during the setup or for troublesh
129127
3. Microsoft Graph User.Read
130128
3. Under **Authentication**, **Allow public client flows** is enabled.
131129
2. Review network configuration and validate if:
132-
1. A [private endpoint for Power BI tenant](/power-bi/enterprise/service-security-private-links) is deployed.
130+
1. A [private endpoint for Power BI tenant](/power-bi/enterprise/service-security-private-links) is deployed. (Optional)
133131
2. All required [private endpoints for Microsoft Purview](/azure/purview/catalog-private-link-end-to-end) are deployed.
134-
3. Network connectivity from Self-hosted runtime to Power BI tenant is enabled through private network.
132+
3. Network connectivity from Self-hosted runtime to Power BI tenant is enabled.
135133
3. Network connectivity from Self-hosted runtime to Microsoft services is enabled through private network.
136134

137135
---
@@ -264,12 +262,9 @@ To create and run a new scan, do the following:
264262

265263
This scenario can be used when Microsoft Purview and Power BI tenant or both, are configured to use private endpoint and deny public access. Additionally, this option is also applicable if Microsoft Purview and Power BI tenant are configured to allow public access.
266264

267-
> [!IMPORTANT]
268-
> Additional configuration may be required for your Power BI tenant and Microsoft Purview account, if you are planning to scan Power BI tenant through private network where either Microsoft Purview account, Power BI tenant or both are configured with private endpoint with public access denied.
269-
>
270-
> For more information related to Power BI network, see [How to configure private endpoints for accessing Power BI](/power-bi/enterprise/service-security-private-links).
271-
>
272-
> For more information about Microsoft Purview network settings, see [Use private endpoints for your Microsoft Purview account](catalog-private-link.md).
265+
For more information related to Power BI network, see [How to configure private endpoints for accessing Power BI](/power-bi/enterprise/service-security-private-links).
266+
267+
For more information about Microsoft Purview network settings, see [Use private endpoints for your Microsoft Purview account](catalog-private-link.md).
273268

274269
To create and run a new scan, do the following:
275270

articles/spring-cloud/quickstart-deploy-apps-enterprise.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ Use the following steps to provision an Azure Spring Apps service instance.
171171
172172
az spring app create \
173173
--resource-group <resource-group-name> \
174-
--name catalog-service
174+
--name catalog-service \
175175
--service <Azure-Spring-Apps-service-instance-name>
176176
177177
az spring app create \

articles/storage/blobs/blob-inventory.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ The `BlobInventoryPolicyCompleted` event is generated when the inventory run com
269269
"policyRunStatus": "Succeeded",
270270
"policyRunStatusMessage": "Inventory run succeeded, refer manifest file for inventory details.",
271271
"policyRunId": "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
272-
"manifestBlobUrl": "https://testaccount.blob.core.windows.net/inventory-destination-container/2021/05/26/13-25-36/Rule_1/Rule_1.csv"
272+
"manifestBlobUrl": "https://testaccount.blob.core.windows.net/inventory-destination-container/2021/05/26/13-25-36/Rule_1/Rule_1-manifest.json"
273273
},
274274
"dataVersion": "1.0",
275275
"metadataVersion": "1",

articles/virtual-machines/linux/add-disk.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ In this example, we are using the nano editor, so when you are done editing the
148148
> [!NOTE]
149149
> Later removing a data disk without editing fstab could cause the VM to fail to boot. Most distributions provide either the *nofail* and/or *nobootwait* fstab options. These options allow a system to boot even if the disk fails to mount at boot time. Consult your distribution's documentation for more information on these parameters.
150150
>
151-
> The *nofail* option ensures that the VM starts even if the filesystem is corrupt or the disk does not exist at boot time. Without this option, you may encounter behavior as described in [Cannot SSH to Linux VM due to FSTAB errors](/archive/blogs/linuxonazure/cannot-ssh-to-linux-vm-after-adding-data-disk-to-etcfstab-and-rebooting)
151+
> The *nofail* option ensures that the VM starts even if the filesystem is corrupt or the disk does not exist at boot time. Without this option, you may encounter behavior as described in [Cannot SSH to Linux VM due to FSTAB errors](/troubleshoot/azure/virtual-machines/linux-virtual-machine-cannot-start-fstab-errors)
152152
>
153153
> The Azure VM Serial Console can be used for console access to your VM if modifying fstab has resulted in a boot failure. More details are available in the [Serial Console documentation](/troubleshoot/azure/virtual-machines/serial-console-linux).
154154
@@ -187,4 +187,4 @@ There are two ways to enable TRIM support in your Linux VM. As usual, consult yo
187187
## Next steps
188188

189189
* To ensure your Linux VM is configured correctly, review the [Optimize your Linux machine performance](/previous-versions/azure/virtual-machines/linux/optimization) recommendations.
190-
* Expand your storage capacity by adding additional disks and [configure RAID](/previous-versions/azure/virtual-machines/linux/configure-raid) for additional performance.
190+
* Expand your storage capacity by adding additional disks and [configure RAID](/previous-versions/azure/virtual-machines/linux/configure-raid) for additional performance.

articles/virtual-network-manager/concept-use-cases.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ Learn about use cases for Azure Virtual Network Manager including managing conne
2020
> For more information, see [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).
2121
2222

23-
## Connectivity
24-
Connectivity configuration allows you to create different network topologies based on your network needs. You create a connectivity configuration by adding new or existing virtual networks into [network groups](concept-network-groups.md) and creating a topology that meets your needs. The connectivity configuration offers three topology options: mesh, hub and spoke, or hub and spoke with direct connectivity.
23+
## Creating topology and connectivity
24+
Connectivity configuration allows you to create different network topologies based on your network needs. You create a connectivity configuration by adding new or existing virtual networks into [network groups](concept-network-groups.md) and creating a topology that meets your needs. The connectivity configuration offers three topology options: mesh, hub and spoke, or hub and spoke with direct connectivity between spoke virtual networks.
2525

2626
### Mesh topology
2727
When a [mesh topology](concept-connectivity-configuration.md#mesh-network-topology) is deployed, all virtual networks have direct connectivity with each other. They don't need to go through other hops on the network to communicate. Mesh topology is useful when all the virtual networks need to communicate directly with each other.
@@ -35,7 +35,6 @@ This topology combines the two above topologies. It's recommended when you have
3535
### Maintaining virtual network topology
3636
AVNM automatically maintains the desired topology you defined in the connectivity configuration when changes are made to your infrastructure. For example, when you add new spoke to the topology, AVNM can handle the changes necessary to create the connectivity to the spoke and its virtual networks.
3737

38-
3938
## Security
4039

4140
With Azure Virtual Network Manager, you create [security admin rules](concept-security-admins.md) to enforce security policies across virtual networks in your organization. Security admin rules take precedence over rules defined by network security groups, and they're applied first when analyzing traffic as seen in the following diagram:

0 commit comments

Comments
 (0)