Skip to content

Commit 7a9848b

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into tamram-0506
2 parents a054a15 + 596bf69 commit 7a9848b

File tree

9 files changed

+69
-82
lines changed

9 files changed

+69
-82
lines changed

articles/cognitive-services/LUIS/luis-concept-data-alteration.md

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Data alteration - LUIS
33
description: Learn how data can be changed before predictions in Language Understanding (LUIS)
44
ms.topic: conceptual
5-
ms.date: 05/05/2020
5+
ms.date: 05/06/2020
66
---
77

88
# Alter utterance data before or during prediction
@@ -70,18 +70,15 @@ The Bing spell check API used in LUIS does not support a list of words to ignore
7070
## Change time zone of prebuilt datetimeV2 entity
7171
When a LUIS app uses the prebuilt [datetimeV2](luis-reference-prebuilt-datetimev2.md) entity, a datetime value can be returned in the prediction response. The timezone of the request is used to determine the correct datetime to return. If the request is coming from a bot or another centralized application before getting to LUIS, correct the timezone LUIS uses.
7272

73-
### Endpoint querystring parameter
74-
The timezone is corrected by adding the user's timezone to the endpoint using the appropriate parameter based on the API version. The value of the parameter should be the positive or negative number, in minutes, to alter the time.
73+
### V3 prediction API to alter timezone
7574

76-
|API version|Querystring parameter|
77-
|--|--|
78-
|v2|`timezoneOffset`|
79-
|v3|`datetimeReference`|
75+
In V3, the `datetimeReference` determines the timezone offset. Learn more about [V3 predictions](luis-migration-api-v3.md#v3-post-body).
8076

81-
### Daylight savings example
82-
If you need the returned prebuilt datetimeV2 to adjust for daylight savings time, you should use the querystring parameter with a +/- value in minutes for the [endpoint](https://go.microsoft.com/fwlink/?linkid=2092356) query.
77+
### V2 prediction API to alter timezone
78+
The timezone is corrected by adding the user's timezone to the endpoint using the `timezoneOffset` parameter based on the API version. The value of the parameter should be the positive or negative number, in minutes, to alter the time.
8379

84-
#### [V2 prediction endpoint request](#tab/V2)
80+
#### V2 prediction daylight savings example
81+
If you need the returned prebuilt datetimeV2 to adjust for daylight savings time, you should use the querystring parameter with a +/- value in minutes for the [endpoint](https://go.microsoft.com/fwlink/?linkid=2092356) query.
8582

8683
Add 60 minutes:
8784

@@ -91,21 +88,7 @@ Remove 60 minutes:
9188

9289
`https://{region}.api.cognitive.microsoft.com/luis/v2.0/apps/{appId}?q=Turn the lights on?timezoneOffset=-60&verbose={boolean}&spellCheck={boolean}&staging={boolean}&bing-spell-check-subscription-key={string}&log={boolean}`
9390

94-
#### [V3 prediction endpoint request](#tab/V3)
95-
96-
Add 60 minutes:
97-
98-
`https://{region}.api.cognitive.microsoft.com/luis/v3.0-preview/apps/{appId}/slots/production/predict?query=Turn the lights on?datetimeReference=60&spellCheck={boolean}&bing-spell-check-subscription-key={string}&log={boolean}`
99-
100-
Remove 60 minutes:
101-
102-
`https://{region}.api.cognitive.microsoft.com/luis/v3.0-preview/apps/{appId}/slots/production/predict?query=Turn the lights on?datetimeReference=-60&spellCheck={boolean}&bing-spell-check-subscription-key={string}&log={boolean}`
103-
104-
Learn more about the [V3 prediction endpoint](luis-migration-api-v3.md).
105-
106-
* * *
107-
108-
## C# code determines correct value of parameter
91+
#### V2 prediction C# code determines correct value of parameter
10992

11093
The following C# code uses the [TimeZoneInfo](https://docs.microsoft.com/dotnet/api/system.timezoneinfo) class's [FindSystemTimeZoneById](https://docs.microsoft.com/dotnet/api/system.timezoneinfo.findsystemtimezonebyid#examples) method to determine the correct offset value based on system time:
11194

articles/iot-central/core/howto-configure-rules.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ manager: philmea
1212

1313
# Configure rules
1414

15-
16-
1715
*This article applies to operators, builders, and administrators.*
1816

1917
Rules in IoT Central serve as a customizable response tool that trigger on actively monitored events from connected devices. The following sections describe how rules are evaluated.
@@ -32,6 +30,12 @@ In the following screenshot, the conditions check when the temperature is greate
3230

3331
![Conditions](media/howto-configure-rules/conditions.png)
3432

33+
### Use a cloud property in a value field
34+
35+
You can reference a cloud property from the device template in the **Value** field for a condition. The cloud property and telemetry value must have similar types. For example, if **Temperature** is a double, then only cloud properties of type double show as options in the **Value** drop-down.
36+
37+
If you choose an event type telemetry value, the **Value** drop-down includes the option **Any**. The **Any** option means the rule fires when your application receives an event of that type, whatever the payload.
38+
3539
## Use aggregate windowing
3640

3741
Rules evaluate aggregate time windows as tumbling windows. In the screenshot below, the time window is five minutes. Every five minutes, the rule evaluates on the last five minutes of data. The data is only evaluated once in the window to which it corresponds.

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

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: logic-apps
55
ms.suite: integration
66
ms.reviewer: jonfan, logicappspm
77
ms.topic: conceptual
8-
ms.date: 05/01/2020
8+
ms.date: 05/05/2020
99
---
1010

1111
# Connect to Azure virtual networks from Azure Logic Apps by using an integration service environment (ISE)
@@ -81,48 +81,49 @@ To make sure that your ISE is accessible and that the logic apps in that ISE can
8181
8282
* If you created a new Azure virtual network and subnets without any constraints, you don't need to set up [network security groups (NSGs)](../virtual-network/security-overview.md#network-security-groups) in your virtual network to control traffic across subnets.
8383

84-
* On an existing virtual network, you can *optionally* set up NSGs by [filtering network traffic across subnets](../virtual-network/tutorial-filter-network-traffic.md). If you want to go this route, or if you're already using NSGs, make sure that you [open the ports in this table](#network-ports-for-ise) on the virtual network where you have NSGs or want to set up NSGs.
84+
* For an existing virtual network, you can *optionally* set up [network security groups (NSGs)](../virtual-network/security-overview.md#network-security-groups) to [filter network traffic across subnets](../virtual-network/tutorial-filter-network-traffic.md). If you want to go this route, or if you're already using NSGs, make sure that you [open the ports described in this table](#network-ports-for-ise) for those NSGs.
8585

86-
> [!NOTE]
87-
> If you use [NSG security rules](../virtual-network/security-overview.md#security-rules),
88-
> you need to use *both* the TCP and UDP protocols. NSG security rules describe the ports
89-
> that you must open for the IP addresses that need access to those ports. Make sure that
90-
> any firewalls, routers, or other items that exist between these endpoints also keep those
91-
> ports accessible to those IP addresses.
86+
When you set up [NSG security rules](../virtual-network/security-overview.md#security-rules), you need to use *both* the **TCP** and **UDP** protocols, or you can select **Any** instead so you don't have to create separate rules for each protocol. NSG security rules describe the ports that you must open for the IP addresses that need access to those ports. Make sure that any firewalls, routers, or other items that exist between these endpoints also keep those ports accessible to those IP addresses.
9287

9388
<a name="network-ports-for-ise"></a>
9489

9590
### Network ports used by your ISE
9691

97-
This table describes the ports in your Azure virtual network that your ISE uses and where those ports get used. To help reduce complexity when you create security rules, the [service tags](../virtual-network/service-tags-overview.md) in the table represent groups of IP address prefixes for a specific Azure service.
92+
This table describes the ports that your ISE requires to be accessible and the purpose for those ports. To help reduce complexity when you set up security rules, the table uses [service tags](../virtual-network/service-tags-overview.md) that represent groups of IP address prefixes for a specific Azure service. Where noted, *internal ISE* and *external ISE* refer to the [access endpoint that's selected during ISE creation](connect-virtual-network-vnet-isolated-environment.md#create-environment). For more information, see [Endpoint access](../logic-apps/connect-virtual-network-vnet-isolated-environment-overview.md#endpoint-access).
9893

9994
> [!IMPORTANT]
100-
> Source ports are ephemeral, so make sure that you set them to `*` for all rules. Where noted, internal ISE and external ISE refer to the
101-
> [endpoint that's selected at ISE creation](connect-virtual-network-vnet-isolated-environment.md#create-environment).
102-
> For more information, see [Endpoint access](../logic-apps/connect-virtual-network-vnet-isolated-environment-overview.md#endpoint-access).
103-
104-
| Purpose | Direction | Destination ports | Source service tag | Destination service tag | Notes |
105-
|---------|-----------|-------------------|--------------------|-------------------------|-------|
106-
| Intersubnet communication within your virtual network | Inbound & Outbound | * | The address space for the virtual network that has your ISE's subnets | The address space for the virtual network that has your ISE's subnets | Required for traffic to flow *between* the subnets in your virtual network. <p><p>**Important**: For traffic to flow between the *components* in each subnet, make sure that you open all the ports within each subnet. |
107-
| Communication to your logic app | Inbound | 443 | Internal ISE: <br>VirtualNetwork <p><p>External ISE: <br>Internet <br>(see **Notes** column) | VirtualNetwork | Rather than use the **Internet** service tag, you can specify the source IP address for the computer or service that calls any request triggers or webhooks in your logic app. <p><p>**Important**: Closing or blocking this port prevents HTTP calls to logic apps that have request triggers. |
108-
| Logic app run history | Inbound | 443 | Internal ISE: <br>VirtualNetwork <p><p>External ISE: <br>Internet <br>(see **Notes** column) | VirtualNetwork | Rather than use the **Internet** service tag, you can specify the source IP address for the computer or service from where you want to view your logic app's run history. <p><p>**Important**: Although closing or blocking this port doesn't prevent you from viewing the run history, you can't view the inputs and outputs for each step in that run history. |
109-
| Logic Apps Designer - dynamic properties | Inbound | 454 | LogicAppsManagement | VirtualNetwork | Requests come from the Logic Apps access endpoint [inbound](../logic-apps/logic-apps-limits-and-config.md#inbound) IP addresses for that region. |
110-
| Connector deployment | Inbound | 454 | AzureConnectors | VirtualNetwork | Required for deploying and updating connectors. Closing or blocking this port causes ISE deployments to fail and prevents connector updates or fixes. |
111-
| Network health check | Inbound | 454 | LogicApps | VirtualNetwork | Requests come from the Logic Apps access endpoint for both [inbound](../logic-apps/logic-apps-limits-and-config.md#inbound) and [outbound](../logic-apps/logic-apps-limits-and-config.md#outbound) IP addresses for that region. |
112-
| App Service Management dependency | Inbound | 454, 455 | AppServiceManagement | VirtualNetwork | |
113-
| Communication from Azure Traffic Manager | Inbound | Internal ISE: 454 <p><p>External ISE: 443 | AzureTrafficManager | VirtualNetwork | |
114-
| API Management - management endpoint | Inbound | 3443 | APIManagement | VirtualNetwork | |
115-
| Connector policy deployment | Inbound | 3443 | APIManagement | VirtualNetwork | Required for deploying and updating connectors. Closing or blocking this port causes ISE deployments to fail and prevents connector updates or fixes. |
116-
| Communication from your logic app | Outbound | 80, 443 | VirtualNetwork | Varies based on destination | The endpoints for the external service with which your logic app needs to communicate. |
117-
| Azure Active Directory | Outbound | 80, 443 | VirtualNetwork | AzureActiveDirectory | |
118-
| Connection management | Outbound | 443 | VirtualNetwork | AppService | |
119-
| Publish Diagnostic Logs & Metrics | Outbound | 443 | VirtualNetwork | AzureMonitor | |
120-
| Azure Storage dependency | Outbound | 80, 443, 445 | VirtualNetwork | Storage | |
121-
| Azure SQL dependency | Outbound | 1433 | VirtualNetwork | SQL | |
122-
| Azure Resource Health | Outbound | 1886 | VirtualNetwork | AzureMonitor | Required for publishing health status to Resource Health |
123-
| Dependency from Log to Event Hub policy and monitoring agent | Outbound | 5672 | VirtualNetwork | EventHub | |
124-
| Access Azure Cache for Redis Instances between Role Instances | Inbound <br>Outbound | 6379 - 6383 | VirtualNetwork | VirtualNetwork | Also, for ISE to work with Azure Cache for Redis, you must open these [outbound and inbound ports described in the Azure Cache for Redis FAQ](../azure-cache-for-redis/cache-how-to-premium-vnet.md#outbound-port-requirements). |
125-
||||||
95+
> For all rules, make sure that you set source ports to `*` because source ports are ephemeral.
96+
97+
#### Inbound security rules
98+
99+
| Purpose | Source service tag or IP addresses | Source ports | Destination service tag or IP addresses | Destination ports | Notes |
100+
|---------|------------------------------------|--------------|-----------------------------------------|-------------------|-------|
101+
| Intersubnet communication within virtual network | Address space for the virtual network with ISE subnets | * | Address space for the virtual network with ISE subnets | * | Required for traffic to flow *between* the subnets in your virtual network. <p><p>**Important**: For traffic to flow between the *components* in each subnet, make sure that you open all the ports within each subnet. |
102+
| Both: <p>Communication to your logic app <p><p>Runs history for logic app| Internal ISE: <br>**VirtualNetwork** <p><p>External ISE: **Internet** or see **Notes** | * | **VirtualNetwork** | 443 | Rather than use the **Internet** service tag, you can specify the source IP address for these items: <p><p>- The computer or service that calls any request triggers or webhooks in your logic app <p>- The computer or service from where you want to access logic app runs history <p><p>**Important**: Closing or blocking this port prevents calls to logic apps that have request triggers or webhooks. You're also prevented from accessing inputs and outputs for each step in runs history. However, you're not prevented from accessing logic app runs history.|
103+
| Logic Apps designer - dynamic properties | **LogicAppsManagement** | * | **VirtualNetwork** | 454 | Requests come from the Logic Apps access endpoint's [inbound IP addresses](../logic-apps/logic-apps-limits-and-config.md#inbound) for that region. |
104+
| Connector deployment | **AzureConnectors** | * | **VirtualNetwork** | 454 | Required to deploy and update connectors. Closing or blocking this port causes ISE deployments to fail and prevents connector updates and fixes. |
105+
| Network health check | **LogicApps** | * | **VirtualNetwork** | 454 | Requests come from the Logic Apps access endpoint's [inbound IP addresses](../logic-apps/logic-apps-limits-and-config.md#inbound) and [outbound IP addresses](../logic-apps/logic-apps-limits-and-config.md#outbound) for that region. |
106+
| App Service Management dependency | **AppServiceManagement** | * | **VirtualNetwork** | 454, 455 ||
107+
| Communication from Azure Traffic Manager | **AzureTrafficManager** | * | **VirtualNetwork** | Internal ISE: 454 <p><p>External ISE: 443 ||
108+
| Both: <p>Connector policy deployment <p>API Management - management endpoint | **APIManagement** | * | **VirtualNetwork** | 3443 | For connector policy deployment, port access is required to deploy and update connectors. Closing or blocking this port causes ISE deployments to fail and prevents connector updates and fixes. |
109+
| Access Azure Cache for Redis Instances between Role Instances | **VirtualNetwork** | * | **VirtualNetwork** | 6379 - 6383, plus see **Notes**| For ISE to work with Azure Cache for Redis, you must open these [outbound and inbound ports described by the Azure Cache for Redis FAQ](../azure-cache-for-redis/cache-how-to-premium-vnet.md#outbound-port-requirements). |
110+
|||||||
111+
112+
#### Outbound security rules
113+
114+
| Purpose | Source service tag or IP addresses | Source ports | Destination service tag or IP addresses | Destination ports | Notes |
115+
|---------|------------------------------------|--------------|-----------------------------------------|-------------------|-------|
116+
| Intersubnet communication within virtual network | Address space for the virtual network with ISE subnets | * | Address space for the virtual network with ISE subnets | * | Required for traffic to flow *between* the subnets in your virtual network. <p><p>**Important**: For traffic to flow between the *components* in each subnet, make sure that you open all the ports within each subnet. |
117+
| Communication from your logic app | **VirtualNetwork** | * | Varies based on destination | 80, 443 | Destination varies based on the endpoints for the external service with which your logic app needs to communicate. |
118+
| Azure Active Directory | **VirtualNetwork** | * | **AzureActiveDirectory** | 80, 443 ||
119+
| Azure Storage dependency | **VirtualNetwork** | * | **Storage** | 80, 443, 445 ||
120+
| Connection management | **VirtualNetwork** | * | **AppService** | 443 ||
121+
| Publish diagnostic logs & metrics | **VirtualNetwork** | * | **AzureMonitor** | 443 ||
122+
| Azure SQL dependency | **VirtualNetwork** | * | **SQL** | 1433 ||
123+
| Azure Resource Health | **VirtualNetwork** | * | **AzureMonitor** | 1886 | Required for publishing health status to Resource Health. |
124+
| Dependency from Log to Event Hub policy and monitoring agent | **VirtualNetwork** | * | **EventHub** | 5672 ||
125+
| Access Azure Cache for Redis Instances between Role Instances | **VirtualNetwork** | * | **VirtualNetwork** | 6379 - 6383, plus see **Notes**| For ISE to work with Azure Cache for Redis, you must open these [outbound and inbound ports described by the Azure Cache for Redis FAQ](../azure-cache-for-redis/cache-how-to-premium-vnet.md#outbound-port-requirements). |
126+
|||||||
126127

127128
<a name="create-environment"></a>
128129

articles/marketplace/partner-center-portal/create-new-managed-service-offer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Create a Managed Service offer in the Microsoft commercial marketplace
2+
title: Create a Managed Service offer in Microsoft commercial marketplace
33
description: How to create a new Managed Service offer for listing in Azure Marketplace using the Commercial Marketplace portal in Partner Center.
44
author: JnHs
55
ms.author: jenhayes

articles/storage/common/storage-import-export-encryption-key-portal.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: storage
55
author: alkohli
66
ms.service: storage
77
ms.topic: how-to
8-
ms.date: 03/12/2020
8+
ms.date: 05/06/2020
99
ms.author: alkohli
1010
ms.subservice: common
1111
---
@@ -85,9 +85,8 @@ Configuring customer-managed key for your Import/Export service is optional. By
8585

8686
In the **Encryption** blade, you can see the key vault and the key selected for your customer managed key.
8787

88-
## Disable keys
89-
90-
You can only disable Microsoft managed keys and move to customer managed keys at any stage of the import/export job. However, you cannot disable the customer managed key once you have created it.
88+
> [!IMPORTANT]
89+
> You can only disable Microsoft managed keys and move to customer managed keys at any stage of the import/export job. However, you cannot disable the customer managed key once you have created it.
9190
9291
## Troubleshoot customer managed key errors
9392

Loading

0 commit comments

Comments
 (0)