Skip to content

Commit 642a297

Browse files
authored
Merge pull request #110354 from MicrosoftDocs/master
4/6 9AM Publish
2 parents b129186 + e0eba9a commit 642a297

File tree

235 files changed

+7443
-96
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

235 files changed

+7443
-96
lines changed

articles/active-directory-domain-services/tutorial-configure-password-hash-sync.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ With Azure AD Connect installed and configured to synchronize with Azure AD, now
6666

6767
In this example screenshot, the following connectors are used:
6868

69-
* The Azure AD connector is named *aaddscontoso.onmicrosoft.com - AAD*
69+
* The Azure AD connector is named *contoso.onmicrosoft.com - AAD*
7070
* The on-premises AD DS connector is named *onprem.contoso.com*
7171

7272
1. Copy and paste the following PowerShell script to the computer with Azure AD Connect installed. The script triggers a full password sync that includes legacy password hashes. Update the `$azureadConnector` and `$adConnector` variables with the connector names from the previous step.

articles/active-directory/authentication/howto-sspr-deployment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ Audit logs for registration and password reset are available for 30 days. If sec
340340

341341
## Next steps
342342

343-
* To get started deploying SSPR, see [Enable Azure AD self-service password reset](https://docs.microsoft.com/azure/active-directory/authentication/tutorial-enable-sspr.md)
343+
* To get started deploying SSPR, see [Enable Azure AD self-service password reset](tutorial-enable-sspr.md)
344344

345345
* [Consider implementing Azure AD password protection](https://docs.microsoft.com/azure/active-directory/authentication/concept-password-ban-bad)
346346

articles/aks/egress-outboundtype.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -540,3 +540,6 @@ You should see an image of the Azure voting app.
540540
See [Azure networking UDR overview](https://docs.microsoft.com/azure/virtual-network/virtual-networks-udr-overview).
541541

542542
See [how to create, change, or delete a route table](https://docs.microsoft.com/azure/virtual-network/manage-route-table).
543+
544+
<!-- LINKS - internal -->
545+
[az-aks-get-credentials]: /cli/azure/aks?view=azure-cli-latest#az-aks-get-credentials

articles/automation/automation-tutorial-update-management.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: This article provides an overview of how to use Azure Automation Up
44
services: automation
55
ms.subservice: update-management
66
ms.topic: tutorial
7-
ms.date: 03/04/2020
7+
ms.date: 04/06/2020
88
ms.custom: mvc
99
---
1010
# Manage updates and patches for your Azure VMs
@@ -117,7 +117,7 @@ Under **New update deployment**, specify the following information:
117117

118118
For descriptions of the classification types, see [Update classifications](automation-view-update-assessments.md#update-classifications).
119119

120-
* **Updates to include/exclude** - Opens the Include/Exclude page. Updates to be included or excluded are on separate tabs.
120+
* **Updates to include/exclude** - Opens the Include/Exclude page. Updates to be included or excluded are on separate tabs by specifying the KB Article ID numbers. When specifying one or more ID numbers, you need to remove or un-check all classifications with the update deployment. This ensures that no other updates are included in your update package when specifying update IDs.
121121

122122
> [!NOTE]
123123
> It's important to know that exclusions override inclusions. For instance, if you define an exclusion rule of `*`, Update Management installs no patches or packages, as they're all excluded. Excluded patches still show as missing from the machine. For Linux machines, if you include a package that has a dependent package that has been excluded, Update Management doesn't install the main package.

articles/azure-monitor/platform/alerts-metric-create-templates.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,7 @@ az group deployment create \
557557
558558
## Template for a static threshold metric alert that monitors multiple criteria
559559

560-
Newer metric alerts support alerting on multi-dimensional metrics as well as supporting multiple criteria. You can use the following template to create a more advanced metric alert rule on dimensional metrics and specify multiple criteria.
560+
Newer metric alerts support alerting on multi-dimensional metrics as well as support defining multiple criteria (up to 5 criterions per alert rule). You can use the following template to create a more advanced metric alert rule on dimensional metrics and specify multiple criteria.
561561

562562
Please note the following constraints when using dimensions in an alert rule that contains multiple criteria:
563563
- You can only select one value per dimension within each criterion.

articles/backup/backup-azure-arm-restore-vms.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Azure Backup provides a number of ways to restore a VM.
1717
--- | ---
1818
**Create a new VM** | Quickly creates and gets a basic VM up and running from a restore point.<br/><br/> You can specify a name for the VM, select the resource group and virtual network (VNet) in which it will be placed, and specify a storage account for the restored VM. The new VM must be created in the same region as the source VM.
1919
**Restore disk** | Restores a VM disk, which can then be used to create a new VM.<br/><br/> Azure Backup provides a template to help you customize and create a VM. <br/><br> The restore job generates a template that you can download and use to specify custom VM settings, and create a VM.<br/><br/> The disks are copied to the Resource Group you specify.<br/><br/> Alternatively, you can attach the disk to an existing VM, or create a new VM using PowerShell.<br/><br/> This option is useful if you want to customize the VM, add configuration settings that weren't there at the time of backup, or add settings that must be configured using the template or PowerShell.
20-
**Replace existing** | You can restore a disk, and use it to replace a disk on the existing VM.<br/><br/> The current VM must exist. If it's been deleted, this option can't be used.<br/><br/> Azure Backup takes a snapshot of the existing VM before replacing the disk, and stores it in the staging location you specify. Existing disks connected to the VM are replaced with the selected restore point.<br/><br/> The snapshot is copied to the vault, and retained in accordance with the retention policy. <br/><br/> After the replace disk operation, the original disk is retained in the resource group. You can choose to manually delete the original disks if they are not needed. <br/><br/>Replace existing is supported for unencrypted managed VMs. It's not supported for unmanaged disks, [generalized VMs](https://docs.microsoft.com/azure/virtual-machines/windows/capture-image-resource), or for VMs [created using custom images](https://azure.microsoft.com/resources/videos/create-a-custom-virtual-machine-image-in-azure-resource-manager-with-powershell/).<br/><br/> If the restore point has more or less disks than the current VM, then the number of disks in the restore point will only reflect the VM configuration.<br><br> Replace existing isn't supported for VMs with linked resources (like [user-assigned managed-identity](https://docs.microsoft.com/azure/active-directory/managed-identities-azure-resources/overview) or [Key Vault](https://docs.microsoft.com/azure/key-vault/key-vault-overview)) because the backup client-app doesn't have permissions on these resources while performing the restore.<br/><br/>Classic VMs are not supported.
20+
**Replace existing** | You can restore a disk, and use it to replace a disk on the existing VM.<br/><br/> The current VM must exist. If it's been deleted, this option can't be used.<br/><br/> Azure Backup takes a snapshot of the existing VM before replacing the disk, and stores it in the staging location you specify. Existing disks connected to the VM are replaced with the selected restore point.<br/><br/> The snapshot is copied to the vault, and retained in accordance with the retention policy. <br/><br/> After the replace disk operation, the original disk is retained in the resource group. You can choose to manually delete the original disks if they are not needed. <br/><br/>Replace existing is supported for unencrypted managed VMs, including VMs [created using custom images](https://azure.microsoft.com/resources/videos/create-a-custom-virtual-machine-image-in-azure-resource-manager-with-powershell/). It is unsupported for classic VMs.<br/><br/> If the restore point has more or less disks than the current VM, then the number of disks in the restore point will only reflect the VM configuration.<br><br> Replace existing isn't supported for VMs with linked resources (like [user-assigned managed-identity](https://docs.microsoft.com/azure/active-directory/managed-identities-azure-resources/overview) or [Key Vault](https://docs.microsoft.com/azure/key-vault/key-vault-overview)) because the backup client-app doesn't have permissions on these resources while performing the restore.
2121
**Cross Region (secondary region)** | Cross Region restore can be used to restore Azure VMs in the secondary region, which is an [Azure paired region](https://docs.microsoft.com/azure/best-practices-availability-paired-regions#what-are-paired-regions).<br><br> You can restore all the Azure VMs for the selected recovery point if the backup is done in the secondary region.<br><br> This feature is available for the options below:<br> * [Create a VM](https://docs.microsoft.com/azure/backup/backup-azure-arm-restore-vms#create-a-vm) <br> * [Restore Disks](https://docs.microsoft.com/azure/backup/backup-azure-arm-restore-vms#restore-disks) <br><br> We don't currently support the [Replace existing disks](https://docs.microsoft.com/azure/backup/backup-azure-arm-restore-vms#replace-existing-disks) option.<br><br> Permissions<br> The restore operation on secondary region can be performed by Backup Admins and App admins.
2222

2323
> [!NOTE]
@@ -70,7 +70,7 @@ If you don't have permissions, you can [restore a disk](#restore-disks), and the
7070
As one of the [restore options](#restore-options), you can create a VM quickly with basic settings from a restore point.
7171

7272
1. In **Restore configuration** > **Create new** > **Restore Type**, select **Create a virtual machine**.
73-
2. In **Virtual machine name**, specify a VM that doesnt exist in the subscription.
73+
2. In **Virtual machine name**, specify a VM that doesn't exist in the subscription.
7474
3. In **Resource group**, select an existing resource group for the new VM, or create a new one with a globally unique name. If you assign a name that already exists, Azure assigns the group the same name as the VM.
7575
4. In **Virtual network**, select the VNet in which the VM will be placed. All VNets associated with the subscription are displayed. Select the subnet. The first subnet is selected by default.
7676
5. In **Storage Location**, specify the storage account for the VM. [Learn more](#storage-accounts).
@@ -95,7 +95,7 @@ As one of the [restore options](#restore-options), you can create a disk from a
9595

9696
4. In **Restore configuration**, select **OK**. In **Restore**, click **Restore** to trigger the restore operation.
9797

98-
When your virtual machine uses managed disks and you select the **Create virtual machine** option, Azure Backup doesnt use the specified storage account. In the case of **Restore disks** and **Instant Restore**, the storage account is used only for storing the template. Managed disks are created in the specified resource group.
98+
When your virtual machine uses managed disks and you select the **Create virtual machine** option, Azure Backup doesn't use the specified storage account. In the case of **Restore disks** and **Instant Restore**, the storage account is used only for storing the template. Managed disks are created in the specified resource group.
9999
When your virtual machine uses unmanaged disks, they are restored as blobs to the storage account.
100100

101101
### Use templates to customize a restored VM

articles/blockchain/service/limits.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Azure Blockchain Service limits
33
description: Overview of the service and functional limits in Azure Blockchain Service
4-
ms.date: 03/30/2020
4+
ms.date: 04/02/2020
55
ms.topic: conceptual
66
ms.reviewer: ravastra
77
#Customer intent: As an operator or architect, I want to understand service and functional limits for Azure Blockchain Service.
@@ -31,7 +31,6 @@ Changing the pricing tier between basic and standard after member creation is no
3131
The maximum amount of storage that can be used per node for ledger data and logs is 1.8 terabytes.
3232

3333
Decreasing ledger and log storage size is not supported.
34-
3534
## Consortium limits
3635

3736
* **Consortium and member names must be unique** from other consortium and member names in the Azure Blockchain Service.
@@ -56,6 +55,12 @@ Decreasing ledger and log storage size is not supported.
5655

5756
For more information on the patching, updates, and ledger versions available in Azure Blockchain Service, see [Patching, updates, and versions](ledger-versions.md).
5857

58+
## Performance
59+
60+
Do not use *eth.estimate* gas function for each transaction submission. The *eth.estimate* function is memory intensive. Calling the function multiple times reduces transactions per second drastically.
61+
62+
If possible, use a conservative gas value for submitting transactions and minimize the use of *eth.estimate*.
63+
5964
## Next steps
6065

6166
Learn more about policies regarding systems patching and upgrades - [Patching, updates, and versions](ledger-versions.md).

articles/cosmos-db/mongodb-compass.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Cosmos DB is Microsoft's globally distributed multi-model database service. You
1717

1818
## Pre-requisites
1919

20-
To connect to your Cosmos DB account using Robo 3T, you must:
20+
To connect to your Cosmos DB account using MongoDB Compass, you must:
2121

2222
* Download and install [Compass](https://www.mongodb.com/download-center/compass?jmp=hero)
2323
* Have your Cosmos DB [connection string](connect-mongodb-account.md) information
@@ -49,4 +49,4 @@ To connect your Cosmos DB account to Compass, you can follow the below steps:
4949
## Next steps
5050

5151
- Learn how to [use Studio 3T](mongodb-mongochef.md) with Azure Cosmos DB's API for MongoDB.
52-
- Explore MongoDB [samples](mongodb-samples.md) with Azure Cosmos DB's API for MongoDB.
52+
- Explore MongoDB [samples](mongodb-samples.md) with Azure Cosmos DB's API for MongoDB.

articles/cost-management-billing/reservations/billing-understand-dedicated-hosts-reservation-charges.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ can't carry forward unused reserved hours.
2323

2424
When you delete a dedicated host, the reservation discount automatically applies
2525
to another matching resource in the specified scope. If no matching resources
26-
are found in the specified scope, then the reserved hours are *lost*.
26+
are found in the specified scope, then the reserved hours are *lost*.
2727

2828
## Reservation discount for Dedicated Hosts
2929

articles/firewall/firewall-faq.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,4 +207,8 @@ Set-AzFirewall -AzureFirewall $fw
207207

208208
## Why can a TCP ping and similar tools successfully connect to a target FQDN even when no rule on Azure Firewall allows that traffic?
209209

210-
A TCP ping is not actually connecting to the target FQDN. This happens because Azure Firewall's transparent proxy listens on port 80/443 for outbound traffic. The TCP ping establishes a connection with the firewall, which then drops the packet and logs the connection. This behavior doesn't have any security impact. However, to avoid confusion we're investigating potential changes to this behavior.
210+
A TCP ping is not actually connecting to the target FQDN. This happens because Azure Firewall's transparent proxy listens on port 80/443 for outbound traffic. The TCP ping establishes a connection with the firewall, which then drops the packet and logs the connection. This behavior doesn't have any security impact. However, to avoid confusion we're investigating potential changes to this behavior.
211+
212+
## Are there limits for the number of IP addresses supported by IP Groups?
213+
214+
Yes. For more information, see [Azure subscription and service limits, quotas, and constraints](../azure-resource-manager/management/azure-subscription-service-limits.md#azure-firewall-limits)

0 commit comments

Comments
 (0)