Skip to content

Commit 82c7a7a

Browse files
authored
Merge pull request #103302 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents d6953b2 + fcf2490 commit 82c7a7a

File tree

7 files changed

+43
-29
lines changed

7 files changed

+43
-29
lines changed

articles/azure-monitor/app/profiler-troubleshooting.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ ms.reviewer: mbullwin
1313

1414
# Troubleshoot problems enabling or viewing Application Insights Profiler
1515

16+
## Active issues
17+
18+
* Profiling for ASP.NET Core 3.x applications isn't supported yet.
19+
* If you must have Profiler on, a workaround is to use [Application Insights Profiler for ASP.NET Core](https://github.com/microsoft/ApplicationInsights-Profiler-AspNetCore). The profiler is labeled for Linux, but it also works with .NET Core 3.0+ applications on Windows. For details, see [Supported versions](https://github.com/microsoft/ApplicationInsights-Profiler-AspNetCore#supported-versions).
20+
1621
## <a id="troubleshooting"></a>General troubleshooting
1722

1823
### Profiles are uploaded only if there are requests to your application while Profiler is running

articles/cloud-shell/troubleshooting.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ Known resolutions for troubleshooting issues in Azure Cloud Shell include:
3232

3333
### Disabling Cloud Shell in a locked down network environment
3434

35-
- **Details**: Administrators may wish to disable access to Cloud Shell for their users. Cloud Shell utilizes access to the `ux.console.azure.com` domain, which can be denied, stopping any access to Cloud Shell's entrypoints including portal.azure.com, shell.azure.com, Visual Studio Code Azure Account extension, and docs.microsoft.com.
36-
- **Resolution**: Restrict access to `ux.console.azure.com` via network settings to your environment. The Cloud Shell icon will still exist in portal.azure.com, but will not successfully connect to the service.
35+
- **Details**: Administrators may wish to disable access to Cloud Shell for their users. Cloud Shell utilizes access to the `ux.console.azure.com` domain, which can be denied, stopping any access to Cloud Shell's entrypoints including portal.azure.com, shell.azure.com, Visual Studio Code Azure Account extension, and docs.microsoft.com. In the US Government cloud, the entrypoint is `ux.console.azure.us`; there is no corresponding shell.azure.us.
36+
- **Resolution**: Restrict access to `ux.console.azure.com` or `ux.console.azure.us` via network settings to your environment. The Cloud Shell icon will still exist in the Azure portal, but will not successfully connect to the service.
3737

3838
### Storage Dialog - Error: 403 RequestDisallowedByPolicy
3939

articles/cognitive-services/personalizer/concepts-features.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,8 @@ It is possible to improve your feature sets by editing them to make them larger
128128

129129
For example, a timestamp down to the second is a very sparse feature. It could be made more dense (effective) by classifying times into "morning", "midday", "afternoon", etc.
130130

131+
Location information also typically benefits from creating broader classifications. For example, a Latitude-Longitude coordinate such as Lat: 47.67402° N, Long: 122.12154° W is too precise, and forces the model to learn latitude and longitude as distinct dimensions. When you are trying to personalize based on location information, it helps to group location information in larger sectors. An easy way to do that is to choose an appropriate rounding precision for the Lat-Long numbers, and combine latitude and longitude into "areas" by making them into one string. For example, a good way to represent 47.67402° N, Long: 122.12154° W in regions approximately a few kilometers wide would be "location":"34.3 , 12.1".
132+
131133

132134
#### Expand feature sets with extrapolated information
133135

articles/governance/policy/how-to/author-policies-for-arrays.md

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,9 @@ expression. To resolve this error message, change `equals` to either `in` or `no
163163

164164
Aliases that have **\[\*\]** attached to their name indicate the **type** is an _array_. Instead of
165165
evaluating the value of the entire array, **\[\*\]** makes it possible to evaluate each element of
166-
the array. There are three standard scenarios this per item evaluation is useful in: None, Any, and
167-
All. For complex scenarios, use [count](../concepts/definition-structure.md#count).
166+
the array individually, with logical AND between them. There are three standard scenarios this per
167+
item evaluation is useful in: _None_, _Any_, or _All_ elements match.
168+
For complex scenarios, use [count](../concepts/definition-structure.md#count).
168169

169170
The policy engine triggers the **effect** in **then** only when the **if** rule evaluates as true.
170171
This fact is important to understand in context of the way **\[\*\]** evaluates each individual
@@ -209,16 +210,16 @@ For each condition example below, replace `<field>` with `"field": "Microsoft.St
209210
The following outcomes are the result of the combination of the condition and the example policy
210211
rule and array of existing values above:
211212

212-
|Condition |Outcome |Explanation |
213-
|-|-|-|
214-
|`{<field>,"notEquals":"127.0.0.1"}` |Nothing |One array element evaluates as false (127.0.0.1 != 127.0.0.1) and one as true (127.0.0.1 != 192.168.1.1), so the **notEquals** condition is _false_ and the effect isn't triggered. |
215-
|`{<field>,"notEquals":"10.0.4.1"}` |Policy effect |Both array elements evaluate as true (10.0.4.1 != 127.0.0.1 and 10.0.4.1 != 192.168.1.1), so the **notEquals** condition is _true_ and the effect is triggered. |
216-
|`"not":{<field>,"Equals":"127.0.0.1"}` |Policy effect |One array element evaluates as true (127.0.0.1 == 127.0.0.1) and one as false (127.0.0.1 == 192.168.1.1), so the **Equals** condition is _false_. The logical operator evaluates as true (**not** _false_), so the effect is triggered. |
217-
|`"not":{<field>,"Equals":"10.0.4.1"}` |Policy effect |Both array elements evaluate as false (10.0.4.1 == 127.0.0.1 and 10.0.4.1 == 192.168.1.1), so the **Equals** condition is _false_. The logical operator evaluates as true (**not** _false_), so the effect is triggered. |
218-
|`"not":{<field>,"notEquals":"127.0.0.1" }` |Policy effect |One array element evaluates as false (127.0.0.1 != 127.0.0.1) and one as true (127.0.0.1 != 192.168.1.1), so the **notEquals** condition is _false_. The logical operator evaluates as true (**not** _false_), so the effect is triggered. |
219-
|`"not":{<field>,"notEquals":"10.0.4.1"}` |Nothing |Both array elements evaluate as true (10.0.4.1 != 127.0.0.1 and 10.0.4.1 != 192.168.1.1), so the **notEquals** condition is _true_. The logical operator evaluates as false (**not** _true_), so the effect isn't triggered. |
220-
|`{<field>,"Equals":"127.0.0.1"}` |Nothing |One array element evaluates as true (127.0.0.1 == 127.0.0.1) and one as false (127.0.0.1 == 192.168.1.1), so the **Equals** condition is _false_ and the effect isn't triggered. |
221-
|`{<field>,"Equals":"10.0.4.1"}` |Nothing |Both array elements evaluate as false (10.0.4.1 == 127.0.0.1 and 10.0.4.1 == 192.168.1.1), so the **Equals** condition is _false_ and the effect isn't triggered. |
213+
|Condition |Outcome | Scenario |Explanation |
214+
|-|-|-|-|
215+
|`{<field>,"notEquals":"127.0.0.1"}` |Nothing |None match |One array element evaluates as false (127.0.0.1 != 127.0.0.1) and one as true (127.0.0.1 != 192.168.1.1), so the **notEquals** condition is _false_ and the effect isn't triggered. |
216+
|`{<field>,"notEquals":"10.0.4.1"}` |Policy effect |None match |Both array elements evaluate as true (10.0.4.1 != 127.0.0.1 and 10.0.4.1 != 192.168.1.1), so the **notEquals** condition is _true_ and the effect is triggered. |
217+
|`"not":{<field>,"notEquals":"127.0.0.1" }` |Policy effect |One or more match |One array element evaluates as false (127.0.0.1 != 127.0.0.1) and one as true (127.0.0.1 != 192.168.1.1), so the **notEquals** condition is _false_. The logical operator evaluates as true (**not** _false_), so the effect is triggered. |
218+
|`"not":{<field>,"notEquals":"10.0.4.1"}` |Nothing |One or more match |Both array elements evaluate as true (10.0.4.1 != 127.0.0.1 and 10.0.4.1 != 192.168.1.1), so the **notEquals** condition is _true_. The logical operator evaluates as false (**not** _true_), so the effect isn't triggered. |
219+
|`"not":{<field>,"Equals":"127.0.0.1"}` |Policy effect |Not all match |One array element evaluates as true (127.0.0.1 == 127.0.0.1) and one as false (127.0.0.1 == 192.168.1.1), so the **Equals** condition is _false_. The logical operator evaluates as true (**not** _false_), so the effect is triggered. |
220+
|`"not":{<field>,"Equals":"10.0.4.1"}` |Policy effect |Not all match |Both array elements evaluate as false (10.0.4.1 == 127.0.0.1 and 10.0.4.1 == 192.168.1.1), so the **Equals** condition is _false_. The logical operator evaluates as true (**not** _false_), so the effect is triggered. |
221+
|`{<field>,"Equals":"127.0.0.1"}` |Nothing |All match |One array element evaluates as true (127.0.0.1 == 127.0.0.1) and one as false (127.0.0.1 == 192.168.1.1), so the **Equals** condition is _false_ and the effect isn't triggered. |
222+
|`{<field>,"Equals":"10.0.4.1"}` |Nothing |All match |Both array elements evaluate as false (10.0.4.1 == 127.0.0.1 and 10.0.4.1 == 192.168.1.1), so the **Equals** condition is _false_ and the effect isn't triggered. |
222223

223224
## The append effect and arrays
224225

@@ -238,4 +239,4 @@ For more information, see the [append examples](../concepts/effects.md#append-ex
238239
- Review [Understanding policy effects](../concepts/effects.md).
239240
- Understand how to [programmatically create policies](programmatically-create.md).
240241
- Learn how to [remediate non-compliant resources](remediate-resources.md).
241-
- Review what a management group is with [Organize your resources with Azure management groups](../../management-groups/overview.md).
242+
- Review what a management group is with [Organize your resources with Azure management groups](../../management-groups/overview.md).

articles/private-link/private-endpoint-overview.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ A private link resource is the destination target of a given private endpoint. T
5757
|**Azure Database for PostgreSQL -Single server** | Microsoft.DBforPostgreSQL/servers | postgresqlServer |
5858
|**Azure Database for MySQL** | Microsoft.DBforMySQL/servers | mysqlServer |
5959
|**Azure Database for MariaDB** | Microsoft.DBforMariaDB/servers | mariadbServer |
60+
|**Azure Key Vault** | Microsoft.KeyVault/vaults | vault |
6061

6162
## Network security of private endpoints
6263
When using private endpoints for Azure services, traffic is secured to a specific private link resource. The platform performs an access control to validate network connections reaching only the specified private link resource. To access additional resources within the same Azure service, additional private endpoints are required.
@@ -114,6 +115,7 @@ For Azure services, use the recommended zone names as described in the following
114115
|Azure Database for PostgreSQL - Single server (Microsoft.DBforPostgreSQL/servers)|postgresqlServer|privatelink.postgres.database.azure.com|
115116
|Azure Database for MySQL (Microsoft.DBforMySQL/servers)|mysqlServer|privatelink.mysql.database.azure.com|
116117
|Azure Database for MariaDB (Microsoft.DBforMariaDB/servers)|mariadbServer|privatelink.mariadb.database.azure.com|
118+
|Azure Key Vault (Microsoft.KeyVault/vaults)|vault|privatelink.vaultcore.azure.net|
117119

118120
Azure will create a canonical name DNS record (CNAME) on the public DNS to redirect the resolution to the suggested domain names. You'll be able to override the resolution with the private IP address of your private endpoints.
119121

articles/virtual-desktop/create-host-pools-azure-marketplace.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Here's what you do for the **Basics** blade:
5050
3. Enter a comma-separated list of users who can sign in to the Windows Virtual Desktop clients and access a desktop after the Azure Marketplace offering finishes. For example, if you want to assign [email protected] and [email protected] access, enter "[email protected],[email protected]."
5151
4. Select **Create new** and provide a name for the new resource group.
5252
5. For **Location**, select the same location as the virtual network that has connectivity to the Active Directory server.
53-
6. Select **OK**.
53+
6. Select **Next : Configure virtual machines >**.
5454

5555
>[!IMPORTANT]
5656
>If you're using a pure Azure Active Directory Domain Services and Azure Active Directory solution, make sure to deploy your host pool in the same region as your Azure Active Directory Domain Services to avoid domain-join and credential errors.
@@ -61,7 +61,7 @@ For the **Configure virtual machines** blade:
6161

6262
1. Either accept the defaults or customize the number and size of the VMs.
6363
2. Enter a prefix for the names of the virtual machines. For example, if you enter the name "prefix," the virtual machines will be called "prefix-0," "prefix-1," and so on.
64-
3. Select **OK**.
64+
3. Select **Next : Virtual machine settings**.
6565

6666
### Virtual machine settings
6767

@@ -75,7 +75,7 @@ For the **Virtual machine settings** blade:
7575
1. For **Image source**, select the source and enter the appropriate information for how to find it and how to store it. If you choose not to use managed disks, select the storage account that contains the .vhd file.
7676
2. Enter the user principal name and password for the domain account that will join the VMs to the Active Directory domain. This same username and password will be created on the virtual machines as a local account. You can reset these local accounts later.
7777
3. Select the virtual network that has connectivity to the Active Directory server, and then choose a subnet to host the virtual machines.
78-
4. Select **OK**.
78+
4. Select **Next: Windows Virtual Desktop information**.
7979

8080
### Windows Virtual Desktop tenant information
8181

@@ -85,15 +85,14 @@ For the **Windows Virtual Desktop tenant information** blade:
8585
2. For **Windows Virtual Desktop tenant name**, enter the name of the tenant where you'll be creating this host pool.
8686
3. Specify the type of credentials that you want to use to authenticate as the Windows Virtual Desktop tenant RDS Owner. If you completed the [Create service principals and role assignments with PowerShell tutorial](./create-service-principal-role-powershell.md), select **Service principal**. When **Azure AD tenant ID** appears, enter the ID for the Azure Active Directory instance that contains the service principal.
8787
4. Enter the credentials for the tenant admin account. Only service principals with a password credential are supported.
88-
5. Select **OK**.
88+
5. Select **Next : Review + create**.
8989

9090
## Complete setup and create the virtual machine
9191

9292
For the last two blades:
9393

94-
1. On the **Summary** blade, review the setup information. If you need to change something, go back to the appropriate blade and make your change before continuing. If the information looks right, select **OK**.
95-
2. On the **Buy** blade, review the additional information about your purchase from the Azure Marketplace.
96-
3. Select **Create** to deploy your host pool.
94+
1. On the **Review and Create** blade, review the setup information. If you need to change something, go back to the appropriate blade and make your change before continuing. If the information looks right, select **OK**.
95+
2. Select **Create** to deploy your host pool.
9796

9897
Depending on how many VMs you’re creating, this process can take 30 minutes or more to complete.
9998

articles/vpn-gateway/vpn-gateway-vpn-faq.md

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,15 @@ Policy-based gateways implement policy-based VPNs. Policy-based VPNs encrypt and
6363

6464
Route-based gateways implement the route-based VPNs. Route-based VPNs use "routes" in the IP forwarding or routing table to direct packets into their corresponding tunnel interfaces. The tunnel interfaces then encrypt or decrypt the packets in and out of the tunnels. The policy or traffic selector for route-based VPNs are configured as any-to-any (or wild cards).
6565

66-
### Can I update my Policy-based VPN gateway to Route-based?
66+
### Can I update my policy-based VPN gateway to route-based?
67+
6768
No. An Azure Vnet gateway type cannot be changed from policy-based to route-based or the other way. The gateway must be deleted and recreated, a process taking around 60 minutes. The IP address of the gateway will not be preserved nor will the Pre-Shared Key (PSK).
6869
1. Delete any connections associated with the gateway to be deleted.
6970
1. Delete the gateway:
70-
1. [Azure portal](vpn-gateway-delete-vnet-gateway-portal.md)
71-
1. [Azure PowerShell](vpn-gateway-delete-vnet-gateway-powershell.md)
72-
1. [Azure Powershell - classic](vpn-gateway-delete-vnet-gateway-classic-powershell.md)
73-
1. [Create a new gateway of desired type and complete the VPN setup](vpn-gateway-howto-site-to-site-resource-manager-portal.md#VNetGateway)
71+
- [Azure portal](vpn-gateway-delete-vnet-gateway-portal.md)
72+
- [Azure PowerShell](vpn-gateway-delete-vnet-gateway-powershell.md)
73+
- [Azure PowerShell - classic](vpn-gateway-delete-vnet-gateway-classic-powershell.md)
74+
1. [Create a new gateway of the type you want and complete the VPN setup](vpn-gateway-howto-site-to-site-resource-manager-portal.md#VNetGateway).
7475

7576
### Do I need a 'GatewaySubnet'?
7677

@@ -84,11 +85,15 @@ No.
8485

8586
### Can I get my VPN gateway IP address before I create it?
8687

87-
No. You have to create your gateway first to get the IP address. The IP address changes if you delete and recreate your VPN gateway.
88+
Zone-redundant and zonal gateways (gateway SKUs that have _AZ_ in the name) both rely on a _Standard SKU_ Azure public IP resource. Azure Standard SKU public IP resources must use a static allocation method. Therefore, you will have the public IP address for your VPN gateway as soon as you create the Standard SKU public IP resource you intend to use for it.
89+
90+
For non-zone-redundant and non-zonal gateways (gateway SKUs that do _not_ have _AZ_ in the name), you cannot get the VPN gateway IP address before it is created. The IP address changes only if you delete and re-create your VPN gateway.
8891

8992
### Can I request a Static Public IP address for my VPN gateway?
9093

91-
No. Only Dynamic IP address assignment is supported. However, this does not mean that the IP address changes after it has been assigned to your VPN gateway. The only time the VPN gateway IP address changes is when the gateway is deleted and re-created. The VPN gateway public IP address doesn't change across resizing, resetting, or other internal maintenance/upgrades of your VPN gateway.
94+
As stated above, zone-redundant and zonal gateways (gateway SKUs that have _AZ_ in the name) both rely on a _Standard SKU_ Azure public IP resource. Azure Standard SKU public IP resources must use a static allocation method.
95+
96+
For non-zone-redundant and non-zonal gateways (gateway SKUs that do _not_ have _AZ_ in the name), only dynamic IP address assignment is supported. However, this doesn't mean that the IP address changes after it has been assigned to your VPN gateway. The only time the VPN gateway IP address changes is when the gateway is deleted and then re-created. The VPN gateway public IP address doesn't change when you resize, reset, or complete other internal maintenance and upgrades of your VPN gateway.
9297

9398
### How does my VPN tunnel get authenticated?
9499

0 commit comments

Comments
 (0)