Skip to content

Commit 2d846fa

Browse files
authored
Merge pull request #214795 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 865d308 + 8cd31c2 commit 2d846fa

File tree

8 files changed

+28
-13
lines changed

8 files changed

+28
-13
lines changed

articles/azure-monitor/agents/azure-monitor-agent-manage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ Policy initiatives for Windows and Linux virtual machines, scale sets consist of
418418
#### Known issues
419419

420420
- Managed Identity default behavior. [Learn more](../../active-directory/managed-identities-azure-resources/managed-identities-faq.md#what-identity-will-imds-default-to-if-dont-specify-the-identity-in-the-request).
421-
- Possible race condition with using built-in user-assigned identity creation policy. [Learn more](../../active-directory/managed-identities-azure-resources/how-to-assign-managed-identity-via-azure-policy.md#known-issues).
421+
- Possible rare condition with using built-in user-assigned identity creation policy. [Learn more](../../active-directory/managed-identities-azure-resources/how-to-assign-managed-identity-via-azure-policy.md#known-issues).
422422
- Assigning policy to resource groups. If the assignment scope of the policy is a resource group and not a subscription, the identity used by policy assignment (different from the user-assigned identity used by agent) must be manually granted [these roles](../../active-directory/managed-identities-azure-resources/how-to-assign-managed-identity-via-azure-policy.md#required-authorization) prior to assignment/remediation. Failing to do this step will result in *deployment failures*.
423423
- Other [Managed Identity limitations](../../active-directory/managed-identities-azure-resources/managed-identities-faq.md#limitations).
424424

articles/azure-monitor/agents/azure-monitor-agent-migration-tools.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Tools for migrating to Azure Monitor Agent from legacy agents
33
description: This article describes various migration tools and helpers available for migrating from existing legacy agents to the new Azure Monitor agent (AMA) and data collection rules (DCR).
44
ms.topic: conceptual
5-
author: guywild
5+
author: guywi-ms
66
ms.author: guywild
77
ms.reviewer: shseth
88
ms.date: 8/18/2022
@@ -14,7 +14,7 @@ ms.custom: devx-track-azurepowershell, devx-track-azurecli
1414

1515
# Tools for migrating from Log Analytics Agent to Azure Monitor Agent
1616

17-
Azure Monitor Agent (AMA) replaces the Log Analytics Agent (MMA/OMS) for Windows and Linux virtual machines, scale sets, and on premise and Arc-enabled servers. The [benefits of migrating to Azure Monitor Agent](../agents/azure-monitor-agent-migration.md) include enhanced security, cost-effectiveness, performance, manageability and reliability. This article explains how to use the AMA Migration Helper and DCR Config Generator tools to help automate and track the migration from Log Analytics Agent to Azure Monitor Agent.
17+
Azure Monitor Agent (AMA) replaces the Log Analytics Agent (MMA/OMS) for Windows and Linux virtual machines, scale sets, on premise, 3rd party clouds and Arc-enabled servers. The [benefits of migrating to Azure Monitor Agent](../agents/azure-monitor-agent-migration.md) include enhanced security, cost-effectiveness, performance, manageability and reliability. This article explains how to use the AMA Migration Helper and DCR Config Generator tools to help automate and track the migration from Log Analytics Agent to Azure Monitor Agent.
1818

1919
![Flow diagram that shows the steps involved in agent migration and how the migration tools help in generating DCRs and tracking the entire migration process.](media/azure-monitor-agent-migration/mma-to-ama-migration-steps.png)
2020

articles/batch/virtual-file-mount.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Mounting the file system to the pool, instead of letting tasks retrieve their ow
2929

3030
Consider a scenario with multiple tasks requiring access to a common set of data, like rendering a movie. Each task renders one or more frames at a time from the scene files. By mounting a drive that contains the scene files, it's easier for compute nodes to access shared data.
3131

32-
Additionally, the underlying file system can be chosen and scaled independently based on the performance and scale (throughput and IOPS) required by the number of compute nodes concurrently accessing the data. For example, you can use an [Avere vFXT](../avere-vfxt/avere-vfxt-overview.md) distributed in-memory cache to support large motion picture-scale renders with thousands of concurrent render nodes, accessing source data that is on-premises. Instead, for data that already is in cloud-based Blob storage, [blobfuse](../storage/blobs/storage-how-to-mount-container-linux.md) can be used to mount this data as a local file system. Blobfuse is only available on Linux nodes, though [Azure Files](../storage/files/storage-files-introduction.md) provides a similar workflow and is available on both Windows and Linux.
32+
Additionally, the underlying file system can be chosen and scaled independently based on the performance and scale (throughput and IOPS) required by the number of compute nodes concurrently accessing the data. For example, you can use an [Avere vFXT](../avere-vfxt/avere-vfxt-overview.md) distributed in-memory cache to support large motion picture-scale renders with thousands of concurrent render nodes, accessing source data that is on-premises. Instead, for data that already is in cloud-based Blob storage, [blobfuse](../storage/blobs/storage-how-to-mount-container-linux.md) can be used to mount this data as a local file system. Blobfuse is only available on Linux nodes (excluding Ubuntu 22.04), though [Azure Files](../storage/files/storage-files-introduction.md) provides a similar workflow and is available on both Windows and Linux.
3333

3434
## Mount a virtual file system on a pool
3535

@@ -447,9 +447,11 @@ Azure Batch supports the following virtual file system types for node agents pro
447447

448448
| OS Type | Azure Files Share | Azure Blob container | NFS mount | CIFS mount |
449449
|---|---|---|---|---|
450-
| Linux | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
450+
| Linux | :heavy_check_mark: | :heavy_check_mark:* | :heavy_check_mark: | :heavy_check_mark: |
451451
| Windows | :heavy_check_mark: | :x: | :x: | :x: |
452452

453+
_*Azure Blob container is **not** supported on Ubuntu 22.04_
454+
453455
## Networking requirements
454456

455457
When using virtual file mounts with [Azure Batch pools in a virtual network](batch-virtual-network.md), keep in mind the following requirements and ensure no required traffic is blocked.

articles/firewall/firewall-faq.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,17 +156,18 @@ sections:
156156
answer: |
157157
- **URL** - Asterisks work when placed on the right-most or left-most side. If it is on the left, it can't be part of the FQDN.
158158
- **FQDN** - Asterisks work when placed on the left-most side.
159+
- **GENERAL** - Asterisks on the left-most side mean literally _anything_ to the left will match, meaning multiple subdomains and/or potentially unwanted domain name variations will be matched - see examples below.
159160
160161
Examples:
161162
162163
163164
|Type |Rule |Supported? |Positive examples |
164165
|---------|---------|---------|---------|
165166
|TargetURL |`www.contoso.com` |Yes|`www.contoso.com`<br>`www.contoso.com/`|
166-
|TargetURL |`*.contoso.com` |Yes|`any.contoso.com/`|
167-
|TargetURL |`*contoso.com`|Yes |`example.anycontoso.com`<br>`sub1.example.anycontoso.com`<br>`contoso.com`|
167+
|TargetURL |`*.contoso.com` |Yes|`any.contoso.com/`<br>`sub1.any.contoso.com`|
168+
|TargetURL |`*contoso.com`|Yes |`example.anycontoso.com`<br>`sub1.example.contoso.com`<br>`contoso.com`<br>Warning: this usage of wildcard will also allow potentially undesired/risky variations such as `th3re4lcontoso.com` - use with caution.|
168169
|TargetURL |`www.contoso.com/test`|Yes|`www.contoso.com/test`<br>`www.contoso.com/test/`<br>`www.contoso.com/test?with_query=1`|
169-
|TargetURL |`www.contoso.com/test/*`|Yes|`www.contoso.com/test/anything`<br>Note - `www.contoso.com/test` will **not** match (last slash)|
170+
|TargetURL |`www.contoso.com/test/*`|Yes|`www.contoso.com/test/anything`<br>Note: `www.contoso.com/test` will **not** match (last slash)|
170171
|TargetURL |`www.contoso.*/test/*`|No| |
171172
|TargetURL |`www.contoso.com/test?example=1`|No| |
172173
|TargetURL |`www.contoso.*`|No| |
@@ -199,7 +200,7 @@ sections:
199200
answer: No. Azure Firewall doesn't need a subnet bigger than /26.
200201

201202
- question: How can I increase my firewall throughput?
202-
answer: Azure Firewall's initial throughput capacity is 2.5 - 3 Gbps and it scales out to 30 Gbps. It scales out automatically based on CPU usage and throughput.
203+
answer: Azure Firewall's initial throughput capacity is 2.5 - 3 Gbps and it scales out to 30 Gbps for Standard SKU and 100 Gbps for Premium SKU. It scales out automatically based on CPU usage and throughput.
203204

204205
- question: How long does it take for Azure Firewall to scale out?
205206
answer: |

articles/firewall/ftp-support.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,18 @@ The following table shows the configuration required to support various FTP scen
4141

4242
To deploy using Azure PowerShell, use the `AllowActiveFTP` parameter. For more information, see [Create a Firewall with Allow Active FTP](/powershell/module/az.network/new-azfirewall#16---create-a-firewall-with-allow-active-ftp-).
4343

44+
## Update an existing Azure Firewall by using Azure PowerShell
45+
46+
To update an existing Azure Firewall by using Azure PowerShell, switch the `AllowActiveFTP` parameter to 'True'.
47+
48+
```azurepowershell
49+
$rgName = "resourceGroupName"
50+
$afwName = "afwName"
51+
$afw = Get-AzFirewall -Name $afwName -ResourceGroupName $rgName
52+
$afw.AllowActiveFTP = $true
53+
$afw | Set-AzFirewall
54+
```
55+
4456
## Deploy using Azure CLI
4557

4658
To deploy using the Azure CLI, use the `--allow-active-ftp` parameter. For more information, see [az network firewall create](/cli/azure/network/firewall#az-network-firewall-create-optional-parameters).
@@ -58,4 +70,4 @@ For more information, see [Microsoft.Network azureFirewalls](/azure/templates/mi
5870

5971
## Next steps
6072

61-
To learn how to deploy an Azure Firewall, see [Deploy and configure Azure Firewall using Azure PowerShell](deploy-ps.md).
73+
To learn how to deploy an Azure Firewall, see [Deploy and configure Azure Firewall using Azure PowerShell](deploy-ps.md).

articles/machine-learning/how-to-configure-auto-train.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ Automated ML supports tabular data based tasks (classification, regression, fore
180180

181181
Automated machine learning tries different models and algorithms during the automation and tuning process. As a user, there's no need for you to specify the algorithm.
182182

183-
The task method determines the list of algorithms/models, to apply. Use the `allowed_algorithms` or `blocked_training_algorithms` parameters in the `set_training()` setter function to further modify iterations with the available models to include or exclude.
183+
The task method determines the list of algorithms/models, to apply. Use the `allowed_training_algorithms` or `blocked_training_algorithms` parameters in the `set_training()` setter function to further modify iterations with the available models to include or exclude.
184184

185185
In the following list of links you can explore the supported algorithms per machine learning task listed below.
186186

articles/virtual-desktop/security-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Enabling audit log collection lets you view user and admin activity related to A
8383

8484
### Use RemoteApps
8585

86-
When choosing a deployment model, you can either provide remote users access to entire virtual desktops or only select applications. Remote applications, or RemoteApps, provide a seamless experience as the user works with apps on their virtual desktop. RemoteApps reduce risk by only letting the user work with with a subset of the remote machine exposed by the application.
86+
When choosing a deployment model, you can either provide remote users access to entire virtual desktops or only select applications. Remote applications, or RemoteApps, provide a seamless experience as the user works with apps on their virtual desktop. RemoteApps reduce risk by only letting the user work with a subset of the remote machine exposed by the application.
8787

8888
### Monitor usage with Azure Monitor
8989

includes/firewall-limits.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
| Resource | Limit |
1414
| --- | --- |
1515
| Data throughput |30 Gbps|
16-
|Rule limits|10,000 unique source/destinations in network and application rules <br><br> **Unique source/destinations in network** = sum of (unique source addresses * unique destination addresses for each rule)|
16+
|Rule limits|10,000 unique source/destinations in network rules <br><br> **Unique source/destinations in network** = sum of (unique source addresses * unique destination addresses for each rule)|
1717
|Total size of rules within a single Rule Collection Group| 1 MB for Firewall policies created before July 2022<br>2 MB for Firewall policies created after July 2022|
1818
|Number of Rule Collection Groups in a firewall policy|50 for Firewall policies created before July 2022<br>100 for Firewall policies created after July 2022|
1919
|Maximum DNAT rules|250 maximum unique destinations (public IP address, port, and protocol)<br><br> The DNAT limitation is due to the underlying platform.<br><br>For example, you can configure 500 UDP rules to the same destination IP address and port (one unique destination), while 500 rules to the same IP address but to 500 different ports exceeds the limit (500 unique destinations).|

0 commit comments

Comments
 (0)