Skip to content

Commit fa61edb

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-availability-zones-regions
2 parents 14d0bb5 + 749691e commit fa61edb

File tree

5 files changed

+15
-6
lines changed

5 files changed

+15
-6
lines changed

articles/active-directory/authentication/concept-authentication-passwordless.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ The following providers offer FIDO2 security keys of different form factors that
116116
| eWBM | [https://www.ewbm.com/support](https://www.ewbm.com/support) |
117117
| AuthenTrend | [https://authentrend.com/about-us/#pg-35-3](https://authentrend.com/about-us/#pg-35-3) |
118118
| Gemalto (Thales Group) | [https://safenet.gemalto.com/multi-factor-authentication/authenticators/passwordless-authentication/](https://safenet.gemalto.com/multi-factor-authentication/authenticators/passwordless-authentication/) |
119-
| OneSpan Inc. | [https://www.onespan.com/sites/default/files/2019-01/OneSpan-FIDO-Authentication.pdf](https://www.onespan.com/sites/default/files/2019-01/OneSpan-FIDO-Authentication.pdf) |
119+
| OneSpan Inc. | [https://www.onespan.com/products/fido](https://www.onespan.com/products/fido) |
120120
| IDmelon Technologies Inc. | [https://www.idmelon.com/#idmelon](https://www.idmelon.com/#idmelon) |
121121

122122
> [!NOTE]

articles/api-management/api-management-using-with-vnet.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.service: api-management
1111
ms.workload: mobile
1212
ms.tgt_pltfrm: na
1313
ms.topic: article
14-
ms.date: 03/09/2020
14+
ms.date: 04/27/2020
1515
ms.author: apimpm
1616

1717
---
@@ -109,7 +109,7 @@ When an API Management service instance is hosted in a VNET, the ports in the fo
109109
| Source / Destination Port(s) | Direction | Transport protocol | [Service Tags](../virtual-network/security-overview.md#service-tags) <br> Source / Destination | Purpose (\*) | Virtual Network type |
110110
|------------------------------|--------------------|--------------------|---------------------------------------|-------------------------------------------------------------|----------------------|
111111
| * / [80], 443 | Inbound | TCP | INTERNET / VIRTUAL_NETWORK | Client communication to API Management | External |
112-
| * / 3443 | Inbound | TCP | ApiManagement / VIRTUAL_NETWORK | Management endpoint for Azure portal and Powershell | External & Internal |
112+
| * / 3443 | Inbound | TCP | ApiManagement / VIRTUAL_NETWORK | Management endpoint for Azure portal and PowerShell | External & Internal |
113113
| * / 443 | Outbound | TCP | VIRTUAL_NETWORK / Storage | **Dependency on Azure Storage** | External & Internal |
114114
| * / 443 | Outbound | TCP | VIRTUAL_NETWORK / AzureActiveDirectory | [Azure Active Directory](api-management-howto-aad.md) (where applicable) | External & Internal |
115115
| * / 1433 | Outbound | TCP | VIRTUAL_NETWORK / SQL | **Access to Azure SQL endpoints** | External & Internal |
@@ -149,7 +149,9 @@ When an API Management service instance is hosted in a VNET, the ports in the fo
149149

150150
+ **Azure portal Diagnostics**: To enable the flow of diagnostic logs from Azure portal when using the API Management extension from inside a Virtual Network, outbound access to `dc.services.visualstudio.com` on port 443 is required. This helps in troubleshooting issues you might face when using extension.
151151

152-
+ **Force Tunneling Traffic to On-premises Firewall Using Express Route or Network Virtual Appliance**: A common customer configuration is to define their own default route (0.0.0.0/0) which forces all traffic from the API Management delegated subnet to flow through an on-premises firewall or to an Network virtual appliance. This traffic flow invariably breaks connectivity with Azure API Management because the outbound traffic is either blocked on-premises, or NAT'd to an unrecognizable set of addresses that no longer work with various Azure endpoints. The solution requires you to do a couple of things:
152+
+ **Azure Load Balancer**: Allowing Inbound request from Service Tag `AZURE_LOAD_BALANCER` is not a requirement for the `Developer` SKU, since we only deploy one unit of Compute behind it. But Inbound from [168.63.129.16](../virtual-network/what-is-ip-address-168-63-129-16.md) becomes critical when scaling to higher SKU like `Premium`, as failure of Health Probe from Load Balancer, fails a deployment.
153+
154+
+ **Force Tunneling Traffic to On-premises Firewall Using Express Route or Network Virtual Appliance**: A common customer configuration is to define their own default route (0.0.0.0/0) which forces all traffic from the API Management delegated subnet to flow through an on-premises firewall or to a Network virtual appliance. This traffic flow invariably breaks connectivity with Azure API Management because the outbound traffic is either blocked on-premises, or NAT'd to an unrecognizable set of addresses that no longer work with various Azure endpoints. The solution requires you to do a couple of things:
153155

154156
* Enable service endpoints on the subnet in which the API Management service is deployed. [Service Endpoints][ServiceEndpoints] need to be enabled for Azure Sql, Azure Storage, Azure EventHub and Azure ServiceBus. Enabling endpoints directly from API Management delegated subnet to these services allows them to use the Microsoft Azure backbone network providing optimal routing for service traffic. If you use Service Endpoints with a forced tunneled Api Management, the above Azure services traffic isn't forced tunneled. The other API Management service dependency traffic is forced tunneled and can't be lost or the API Management service would not function properly.
155157

articles/data-factory/data-flow-expression-functions.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,13 @@ Returns the first not null value from a set of inputs. All inputs should be of t
117117
* ``coalesce(10, 20) -> 10``
118118
* ``coalesce(toString(null), toString(null), 'dumbo', 'bo', 'go') -> 'dumbo'``
119119
___
120+
### <code>collect</code>
121+
<code><b>collect(<i>&lt;value1&gt;</i> : any) => array</b></code><br/><br/>
122+
Collects all values of the expression in the aggregated group into a array. Structures can be collected and transformed to alternate structures during this process. The number of items will be equal to the number of rows in that group and can contain null values. The number of collected items should be small
123+
* ``collect(salesPerson)``
124+
* ``collect(firstName + lastName))``
125+
* ``collect(@(name = salesPerson, sales = salesAmount) )``
126+
___
120127
### <code>columnNames</code>
121128
<code><b>columnNames(<i>&lt;value1&gt;</i> : string) => array</b></code><br/><br/>
122129
Gets all output columns for a stream. You can pass a optional stream name as the second argument.

articles/sql-database/sql-database-high-availability.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Azure SQL Database runs on the latest stable version of SQL Server Database Engi
2828

2929
## Basic, Standard, and General Purpose service tier availability
3030

31-
These service tiers leverage the standard availability architecture. The following figure shows four different nodes with the separated compute and storage layers.
31+
The Basic, Standard, and General Purpose service tiers leverage the standard availability architecture for both serverless and provisioned compute. The following figure shows four different nodes with the separated compute and storage layers.
3232

3333
![Separation of compute and storage](media/sql-database-high-availability/general-purpose-service-tier.png)
3434

articles/virtual-machines/mv2-series.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Write Accelerator: [Supported](https://docs.microsoft.com/azure/virtual-machines
3232
| Standard_M416ms_v2<sup>1</sup> | 416 | 11400 | 8192 | 64 | 250000 / 1600 (14080) | 80000 / 2000 | 8 / 32000 |
3333
| Standard_M416s_v2<sup>1</sup> | 416 | 5700 | 8192 | 64 | 250000 / 1600 (14080) | 80000 / 2000 | 8 / 32000 |
3434

35-
<sup>1</sup> Mv2-series VMs are generation 2 only. If you're using Linux, see [Support for generation 2 VMs on Azure](./linux/generation-2.md) for instructions on how to find and select an image. If you're using Windows, see [Support for generation 2 VMs on Azure](./windows/generation-2.md) for instructions on how to find and select an image. Minimum operating system releases required for all the four different Mv2-series VM types list like:
35+
<sup>1</sup> Mv2-series VMs are generation 2 only and support a subset of generation 2 supported Images. Please see below for the complete list of supported images for Mv2-series. If you're using Linux, see [Support for generation 2 VMs on Azure](./linux/generation-2.md) for instructions on how to find and select an image. If you're using Windows, see [Support for generation 2 VMs on Azure](./windows/generation-2.md) for instructions on how to find and select an image.
3636

3737
- Windows Server 2019 or later
3838
- SUSE Linux Enterprise Server 12 SP4 and later or SUSE Linux Enterprise Server 15 SP1 and later

0 commit comments

Comments
 (0)