Skip to content

Commit d08b1be

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into ssmUpdates
2 parents da02f1c + e1efd19 commit d08b1be

7 files changed

+38
-39
lines changed

articles/active-directory/fundamentals/concept-fundamentals-security-defaults.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ One common method to improve protection for all users is to require a stronger f
6666

6767
To give your users easy access to your cloud apps, Azure AD supports a variety of authentication protocols, including legacy authentication. *Legacy authentication* is a term that refers to an authentication request made by:
6868

69-
- Older Office clients that don't use modern authentication (for example, an Office 2010 client).
69+
- Clients that don't use modern authentication (for example, an Office 2010 client).
7070
- Any client that uses older mail protocols such as IMAP, SMTP, or POP3.
7171

7272
Today, the majority of compromising sign-in attempts come from legacy authentication. Legacy authentication does not support Multi-Factor Authentication. Even if you have a Multi-Factor Authentication policy enabled on your directory, an attacker can authenticate by using an older protocol and bypass Multi-Factor Authentication.

articles/cosmos-db/cosmosdb-monitor-resource-logs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ For detailed information about how to create a diagnostic setting by using the A
9494
| summarize count = count() by OperationName, requestResourceType_s, bin(TimeGenerated, 1h)
9595
```
9696

97-
1. What is the maximum throughput that a partition provides?
97+
1. What is the maximum throughput that a partition has consumed?
9898

9999
```Kusto
100100
AzureDiagnostics

articles/logic-apps/add-artifacts-integration-service-environment-ise.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
---
2-
title: Add artifacts to integration service environments
2+
title: Add resources to integration service environments
33
description: Add logic apps, integration accounts, custom connectors, and managed connectors to your integration service environment (ISE)
44
services: logic-apps
55
ms.suite: integration
66
ms.reviewer: klam, logicappspm
77
ms.topic: conceptual
8-
ms.date: 02/10/2020
8+
ms.date: 02/28/2020
99
---
1010

11-
# Add artifacts to your integration service environment (ISE) in Azure Logic Apps
11+
# Add resources to your integration service environment (ISE) in Azure Logic Apps
1212

13-
After you create an [integration service environment (ISE)](../logic-apps/connect-virtual-network-vnet-isolated-environment-overview.md), add artifacts such as logic apps, integration accounts, and connectors so that they can access the resources in your Azure virtual network. For example, managed ISE connectors that become available after you create your ISE don't automatically appear in the Logic App Designer. Before you can use these ISE connectors, you have to manually [add and deploy those connectors to your ISE](#add-ise-connectors-environment) so that they appear in the Logic App Designer.
13+
After you create an [integration service environment (ISE)](../logic-apps/connect-virtual-network-vnet-isolated-environment-overview.md), add resources such as logic apps, integration accounts, and connectors so that they can access the resources in your Azure virtual network. For example, managed ISE connectors that become available after you create your ISE don't automatically appear in the Logic App Designer. Before you can use these ISE connectors, you have to manually [add and deploy those connectors to your ISE](#add-ise-connectors-environment) so that they appear in the Logic App Designer.
1414

1515
## Prerequisites
1616

1717
* An Azure subscription. If you don't have an Azure subscription, [sign up for a free Azure account](https://azure.microsoft.com/free/).
1818

1919
* The ISE that you created to run your logic apps. If you don't have an ISE, [create an ISE first](../logic-apps/connect-virtual-network-vnet-isolated-environment.md).
2020

21+
* To create, add, or update resources that are deployed to an ISE, you need to be assigned the Owner or Contributor role on that ISE, or you have permissions inherited through the Azure subscription or Azure resource group associated with the ISE. For people who don't have owner, contributor, or inherited permissions, they can be assigned the Integration Service Environment Contributor role or Integration Service Environment Developer role. For more information about role-based access control (RBAC), see [What is role-based access control (RBAC) for Azure resources](../role-based-access-control/overview.md)?
22+
2123
<a name="create-logic-apps-environment"></a>
2224

2325
## Create logic apps
@@ -77,7 +79,7 @@ To create an integration account that uses an ISE, follow these steps:
7779

7880
1. [Link your logic app to your integration account in the usual way](../logic-apps/logic-apps-enterprise-integration-create-integration-account.md#link-account).
7981

80-
1. Continue by adding artifacts to your integration account, such as [trading partners](../logic-apps/logic-apps-enterprise-integration-partners.md) and [agreements](../logic-apps/logic-apps-enterprise-integration-agreements.md).
82+
1. Continue by adding resources to your integration account, such as [trading partners](../logic-apps/logic-apps-enterprise-integration-partners.md) and [agreements](../logic-apps/logic-apps-enterprise-integration-agreements.md).
8183

8284
1. To manage integration accounts in your ISE, see [Manage your integration service environment](../logic-apps/ise-manage-integration-service-environment.md).
8385

articles/logic-apps/connect-virtual-network-vnet-isolated-environment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: logic-apps
55
ms.suite: integration
66
ms.reviewer: klam, logicappspm
77
ms.topic: conceptual
8-
ms.date: 02/13/2020
8+
ms.date: 02/28/2020
99
---
1010

1111
# Connect to Azure virtual networks from Azure Logic Apps by using an integration service environment (ISE)

articles/logic-apps/logic-apps-limits-and-config.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: logic-apps
55
ms.suite: integration
66
ms.reviewer: klam, logicappspm
77
ms.topic: article
8-
ms.date: 02/20/2020
8+
ms.date: 02/28/2020
99
---
1010

1111
# Limits and configuration information for Azure Logic Apps
@@ -191,7 +191,7 @@ Here are the limits for custom connectors that you can create from web APIs.
191191
| Name | Limit |
192192
|------|-------|
193193
| Managed identities per logic app | Either the system-assigned identity or 1 user-assigned identity |
194-
| Number of logic apps that have a managed identity in an Azure subscription per region | 100 |
194+
| Number of logic apps that have a managed identity in an Azure subscription per region | 250 |
195195
|||
196196

197197
<a name="integration-account-limits"></a>

articles/logic-apps/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
href: connect-virtual-network-vnet-isolated-environment.md
110110
- name: Set up access for multiple integration service environments
111111
href: connect-virtual-network-vnet-set-up-single-ip-address.md
112-
- name: Add artifacts to integration service environments
112+
- name: Add resources to integration service environments
113113
href: add-artifacts-integration-service-environment-ise.md
114114
- name: Set up customer-managed encryption keys for integration service environments
115115
href: customer-managed-keys-integration-service-environment.md

articles/virtual-network/tutorial-create-validate-nat-gateway-portal.md

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -31,27 +31,24 @@ Sign in to the [Azure portal](https://portal.azure.com).
3131

3232
We'll guide you through configuration of a full test environment and the execution of the tests itself in the next steps. We'll start with the source, which will use the NAT gateway resource we create in later steps.
3333

34-
### Create a virtual network
34+
## Virtual network and parameters
3535

3636
Before you deploy a VM and can use your NAT gateway, we need to create the resource group and virtual network.
3737

38-
1. On the upper-left side of the screen, select **Create a resource** > **Networking** > **Virtual network**, or search for **Virtual Network** in the Marketplace search.
38+
In this section you'll need to replace the following parameters in the steps with the information below:
3939

40-
2. In **Create virtual network**, enter or select this information:
40+
| Parameter | Value |
41+
|-----------------------------|----------------------|
42+
| **\<resource-group-name>** | myResourceGroupNAT |
43+
| **\<virtual-network-name>** | myVNetsource |
44+
| **\<region-name>** | East US 2 |
45+
| **\<IPv4 address space>** | 192.168.0.0\16 |
46+
| **\<subnet-name>** | mySubnetsource |
47+
| **\<subnet-address-range>** | 192.168.0.0\24 |
4148

42-
| Setting | Value |
43-
| ------- | ----- |
44-
| Name | Enter **myVNetsource**. |
45-
| Address space | Enter **192.168.0.0/16**. |
46-
| Subscription | Select your subscription.|
47-
| Resource group | Select create new - **myResourceGroupNAT**. |
48-
| Location | Select **East US 2**.|
49-
| Subnet - Name | Enter **mySubnetsource**. |
50-
| Subnet - Address range | Enter **192.168.0.0/24**. |
51-
52-
3. Leave the rest of the defaults and select **Create**.
49+
[!INCLUDE [virtual-networks-create-new](../../includes/virtual-networks-create-new.md)]
5350

54-
### Create source virtual machine
51+
## Create source virtual machine
5552

5653
We'll now create a VM to use the NAT service. This VM has a public IP to use as an instance-level Public IP to allow you to access the VM. NAT service is flow direction aware and will replace the default Internet destination in your subnet. The VM's public IP address won't be used for outbound connections.
5754

@@ -156,25 +153,25 @@ All outbound traffic to Internet destinations is now using the NAT service. It
156153

157154
We'll now create a destination for the outbound traffic translated by the NAT service to allow you to test it.
158155

159-
### Configure virtual network for destination
156+
157+
## Virtual network and parameters for destination
160158

161159
Before you deploy a VM for the destination, we need to create a virtual network where the destination virtual machine can reside. The following are the same steps as for the source VM with some small changes to expose the destination endpoint.
162160

163-
1. On the upper-left side of the screen, select **Create a resource** > **Networking** > **Virtual network**.
161+
In this section you'll need to replace the following parameters in the steps with the information below:
164162

165-
2. In **Create virtual network**, enter or select this information:
163+
| Parameter | Value |
164+
|-----------------------------|----------------------|
165+
| **\<resource-group-name>** | myResourceGroupNAT |
166+
| **\<virtual-network-name>** | myVNetdestination |
167+
| **\<region-name>** | East US 2 |
168+
| **\<IPv4 address space>** | 192.168.0.0\16 |
169+
| **\<subnet-name>** | mySubnetdestination |
170+
| **\<subnet-address-range>** | 192.168.0.0\24 |
166171

167-
| Setting | Value |
168-
| ------- | ----- |
169-
| Name | Enter **myVNetdestination**. |
170-
| Address space | Enter **192.168.0.0/16**. |
171-
| Subscription | Select your subscription.|
172-
| Resource group | Select create new - **myResourceGroupNAT**. |
173-
| Location | Select **East US 2**.|
174-
| Subnet - Name | Enter **mySubnetdestination**. |
175-
| Subnet - Address range | Enter **192.168.0.0/24**. |
172+
[!INCLUDE [virtual-networks-create-new](../../includes/virtual-networks-create-new.md)]
176173

177-
### Create destination virtual machine
174+
## Create destination virtual machine
178175

179176
1. On the upper-left side of the portal, select **Create a resource** > **Compute** > **Ubuntu Server 18.04 LTS**, or search for **Ubuntu Server 18.04 LTS** in the Marketplace search.
180177

0 commit comments

Comments
 (0)