Skip to content

Commit 613313d

Browse files
authored
Merge pull request #180780 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents 48d5774 + 8549c4f commit 613313d

File tree

10 files changed

+38
-16
lines changed

10 files changed

+38
-16
lines changed

articles/active-directory/privileged-identity-management/pim-create-azure-ad-roles-and-resource-roles-review.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ The need for access to privileged Azure resource and Azure AD roles by employees
3939

4040
:::image type="content" source="./media/pim-create-azure-ad-roles-and-resource-roles-review/identity-governance.png" alt-text="Select Identity Governance in Azure Portal screenshot." lightbox="./media/pim-create-azure-ad-roles-and-resource-roles-review/identity-governance.png":::
4141

42-
4. For **Azure AD roles**, select **Azure AD roles** again under **Manage**. For **Azure resources**, select the resource you want to manage, such as a subscription.
42+
4. For **Azure AD roles**, select **Azure AD roles** again under **Manage**. For **Azure resources**, select the subscription you want to manage.
4343

4444

4545
5. Under Manage, select **Access reviews**, and then select **New** to create a new access review.

articles/azure-cache-for-redis/cache-how-to-scale.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ Choose a pricing tier on the right and then choose **Select**.
4545

4646
:::image type="content" source="media/cache-how-to-scale/select-a-tier.png" alt-text="Azure Cache for Redis tiers":::
4747

48+
> [!NOTE]
49+
> Scaling is currently not avaialble with Enterprise Tier.
50+
>
51+
4852
You can scale to a different pricing tier with the following restrictions:
4953

5054
- You can't scale from a higher pricing tier to a lower pricing tier.

articles/azure-cache-for-redis/cache-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ The Enterprise tiers rely on Redis Enterprise, a commercial variant of Redis fro
9494
> separately from cache instances themselves. For more information, see [Load Balancer pricing](https://azure.microsoft.com/pricing/details/load-balancer/).
9595
> If an Enterprise cache is configured for multiple Availability Zones, data
9696
> transfer will be billed at the [standard network bandwidth rates](https://azure.microsoft.com/pricing/details/bandwidth/)
97-
> starting from July 1, 2021.
97+
> starting from July 1, 2022.
9898
>
9999
> In addition, data persistence adds Managed Disks. The use of these resources will be free during
100100
> the public preview of Enterprise data persistence. This may change when the feature becomes
@@ -111,4 +111,4 @@ The Enterprise tiers rely on Redis Enterprise, a commercial variant of Redis fro
111111
* [Use Azure Cache for Redis in .NET Framework](cache-dotnet-how-to-use-azure-redis-cache.md)
112112
* [Use Azure Cache for Redis in Node.js](cache-nodejs-get-started.md)
113113
* [Use Azure Cache for Redis in Java](cache-java-get-started.md)
114-
* [Use Azure Cache for Redis in Python](cache-python-get-started.md)
114+
* [Use Azure Cache for Redis in Python](cache-python-get-started.md)

articles/azure-monitor/logs/private-link-design.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.date: 08/01/2021
1010
# Design your Private Link setup
1111

1212
Before you set up your Azure Monitor Private Link, consider your network topology, and specifically your DNS routing topology.
13-
As discussed in [How it work](./private-link-security.md#how-it-works), setting up a Private Link affects traffic to all Azure Monitor resources. That's especially true for Application Insights resources. Additionally, it affects not only the network connected to the Private Endpoint but also all other networks the share the same DNS.
13+
As discussed in [How it works](./private-link-security.md#how-it-works), setting up a Private Link affects traffic to all Azure Monitor resources. That's especially true for Application Insights resources. Additionally, it affects not only the network connected to the Private Endpoint but also all other networks sharing the same DNS.
1414

1515
The simplest and most secure approach would be:
1616
1. Create a single Private Link connection, with a single Private Endpoint and a single AMPLS. If your networks are peered, create the Private Link connection on the shared (or hub) VNet.
@@ -203,4 +203,4 @@ The [`externaldata` operator](/azure/data-explorer/kusto/query/externaldata-oper
203203
## Next steps
204204
- Learn how to [configure your Private Link](private-link-configure.md)
205205
- Learn about [private storage](private-storage.md) for Custom Logs and Customer managed keys (CMK)
206-
- Learn about [Private Link for Automation](../../automation/how-to/private-link-security.md)
206+
- Learn about [Private Link for Automation](../../automation/how-to/private-link-security.md)

articles/azure-resource-manager/management/move-limitations/virtual-machines-move-limitations.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ The following scenarios aren't yet supported:
2525
You can't move a virtual machine that is integrated with a key vault to implement [Azure Disk Encryption for Linux VMs](../../../virtual-machines/linux/disk-encryption-overview.md) or [Azure Disk Encryption for Windows VMs](../../../virtual-machines/windows/disk-encryption-overview.md). To move the VM, you must disable encryption.
2626

2727
```azurecli-interactive
28-
az vm encryption disable --resource-group demoRG --name myVm1
28+
az vm encryption disable --resource-group demoRG --name myVm1 --volume-type all
2929
```
3030

3131
```azurepowershell-interactive
32-
Disable-AzVMDiskEncryption -ResourceGroupName demoRG -VMName myVm1
32+
Disable-AzVMDiskEncryption -ResourceGroupName demoRG -VMName myVm1 -VolumeType all
3333
```
3434

3535
## Virtual machines with Marketplace plans

articles/storage/blobs/data-lake-storage-migrate-gen1-to-gen2-azure-portal.md

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ As you create the account, make sure to configure settings with the following va
6262
> [!NOTE]
6363
> The migration tool in the Azure portal doesn't move account settings. Therefore, after you've created the account, you'll have to manually configure settings such as encryption, network firewalls, data protection.
6464
65+
> [!IMPORTANT]
66+
> Ensure that you use a newly created Gen2 account that is empty. It's important that you don’t migrate to a previously used Gen2 account.
67+
6568
## Verify RBAC role assignments
6669

6770
For Gen2, ensure that the [Storage Blob Data Owner](../../role-based-access-control/built-in-roles.md#storage-blob-data-owner) role has been assigned to your Azure Active Directory (Azure AD) user identity in the scope of the storage account, parent resource group, or subscription.
@@ -100,7 +103,8 @@ If you perform a complete migration, data is copied from Gen1 to Gen2. Then, you
100103
> [!div class="mx-imgBorder"]
101104
> ![Checkbox to provide consent](./media/data-lake-storage-migrate-gen1-to-gen2-azure-portal/migration-consent.png)
102105
103-
While your data is being migrated, your Gen1 account becomes read-only, and your Gen2-enabled account is disabled. After the migration completes, you can read and write to both accounts.
106+
> [!IMPORTANT]
107+
> While your data is being migrated, your Gen1 account becomes read-only and your Gen2-enabled account is disabled. When the migration is finished, you can read and write to both accounts.
104108
105109
You can stop the migration at any time by selecting the **Stop migration** button.
106110

@@ -128,9 +132,12 @@ If you perform a complete migration, data is copied from Gen1 to Gen2. Then, you
128132
> [!div class="mx-imgBorder"]
129133
> ![Consent checkbox](./media/data-lake-storage-migrate-gen1-to-gen2-azure-portal/migration-consent.png)
130134
131-
- While your data is being migrated, your Gen1 account becomes read-only, and the Gen2-enabled account is disabled.
132-
- While the Gen1 URI is being redirected, both accounts are disabled.
133-
- After the migration completes, your Gen1 account is disabled, and you can read and write to your Gen2-enabled account.
135+
> [!IMPORTANT]
136+
> While your data is being migrated, your Gen1 account becomes read-only and the Gen2-enabled account is disabled.
137+
>
138+
> Also, while the Gen1 URI is being redirected, both accounts are disabled.
139+
>
140+
> When the migration is finished, your Gen1 account is disabled and you can read and write to your Gen2-enabled account.
134141
135142
You can stop the migration at any time before the URI is redirected by selecting the **Stop migration** button.
136143

@@ -201,6 +208,10 @@ Once the migration is complete, both in "Copy data" and "Complete migration" opt
201208

202209
When we copy the data over to your Gen2-enabled account, we automatically create a container named `Gen1`. If you choose to copy only data, then you can rename that container after the data copy is complete. If you perform a complete migration, and you plan to use the application compatibility layer, then you should avoid changing the container name. When you no longer want to use the compatibility layer, you can change the name of the container.
203210

211+
#### What should I consider in terms of migration performance?
212+
213+
When you copy the data over to your Gen2-enabled account, two factors that can affect performance are the number of files and the amount of metadata you have. For example, many small files can affect the performance of the migration.
214+
204215
## Next steps
205216

206217
- Learn about migration in general. For more information, see [Migrate Azure Data Lake Storage from Gen1 to Gen2](data-lake-storage-migrate-gen1-to-gen2.md).

articles/storage/blobs/data-lake-storage-migrate-gen1-to-gen2.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ To migrate to Gen2, we recommend the following approach.
5454

5555
Take this opportunity to clean up data sets that you no longer use. Unless you plan to migrate all of your data at one time, Take this time to identify logical groups of data that you can migrate in phases.
5656

57+
Perform an [Ageing Analysis](https://github.com/rukmani-msft/adlsgen1togen2migrationsamples/blob/master/src/Utilities/Ageing%20Analysis) (or similar) on your Gen1 account to identify which files or folders stay in inventory for a long time or are perhaps becoming obsolete.
58+
5759
2. Determine the impact that a migration will have on your business.
5860

5961
For example, consider whether you can afford any downtime while the migration takes place. These considerations can help you to identify a suitable migration pattern, and to choose the most appropriate tools.
@@ -223,4 +225,9 @@ Check out our sample code for the bidirectional sync pattern in our [Bidirection
223225

224226
- Learn about the various parts of setting up security for a storage account. For more information, see [Azure Storage security guide](./security-recommendations.md).
225227
- Optimize the performance for your Data Lake Store. See [Optimize Azure Data Lake Storage Gen2 for performance](./data-lake-storage-best-practices.md)
226-
- Review the best practices for managing your Data Lake Store. See [Best practices for using Azure Data Lake Storage Gen2](data-lake-storage-best-practices.md)
228+
- Review the best practices for managing your Data Lake Store. See [Best practices for using Azure Data Lake Storage Gen2](data-lake-storage-best-practices.md)
229+
230+
## See also
231+
232+
- [The Hitchhiker's Guide to the Data Lake](https://github.com/rukmani-msft/adlsguidancedoc/blob/master/Hitchhikers_Guide_to_the_Datalake.md)
233+
- [Access control model in Azure Data Lake Storage Gen2](data-lake-storage-access-control-model.md)

articles/storage/blobs/monitor-blob-storage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ If you choose to stream your logs to an event hub, you'll pay for the volume of
122122
> [!div class="mx-imgBorder"]
123123
> ![Diagnostic settings page event hub](media/monitor-blob-storage/diagnostic-logs-settings-pane-event-hub.png)
124124
125-
3. Click the **OK** button, and then select the **Save** button.
125+
3. Select the **Save** button.
126126

127127
#### Send logs to Azure Log Analytics
128128

articles/storage/blobs/upgrade-to-data-lake-storage-gen2-how-to.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Review the [Blob Storage feature support in Azure Storage accounts](storage-feat
5555
> [!div class="mx-imgBorder"]
5656
> ![Error json page](./media/upgrade-to-data-lake-storage-gen2-how-to/error-json.png)
5757
58-
Open the downloaded file to determine why the account did not pass the validation step.
58+
Open the downloaded file to determine why the account did not pass the validation step. If you have a Blob Storage feature that is fully supported, but which in Data Lake Storage Gen2 is supported only at the preview level or is not yet supported, validation might fail. To see how each Blob Storage feature is supported with Data Lake Storage Gen2, see [Blob Storage feature support in Azure Storage accounts](storage-feature-support-in-storage-accounts.md).
5959

6060
The following JSON indicates that an incompatible feature is enabled on the account. In this case, you would disable the feature and then start the validation process again.
6161

@@ -283,4 +283,4 @@ az storage account hns-migration stop -n <storage-account-name> -g <resource-gro
283283

284284
## See also
285285

286-
[Introduction to Azure Data Lake storage Gen2](data-lake-storage-introduction.md)
286+
[Introduction to Azure Data Lake storage Gen2](data-lake-storage-introduction.md)

articles/virtual-machines/linux/redhat-create-upload-vhd.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ This section assumes that you have already obtained an ISO file from the Red Hat
204204
```config-grub
205205
GRUB_CMDLINE_LINUX="rootdelay=300 console=tty1 console=ttyS0,115200n8 earlyprintk=ttyS0,115200 earlyprintk=ttyS0 net.ifnames=0"
206206
GRUB_TERMINAL_OUTPUT="serial console"
207-
GRUB_SERIAL_COMMAND="serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1
207+
GRUB_SERIAL_COMMAND="serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1"
208208
```
209209
210210
This will also ensure that all console messages are sent to the first serial port and enable interaction with the serial console, which can assist Azure support with debugging issues. This configuration also turns off the new RHEL 7 naming conventions for NICs.

0 commit comments

Comments
 (0)