Skip to content

Commit dcb8da6

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into mrb_05_21_2020_retire_old_workbooks
2 parents 4dbbbc8 + caf1ecc commit dcb8da6

File tree

9 files changed

+13
-7
lines changed

9 files changed

+13
-7
lines changed

articles/analysis-services/analysis-services-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ This tier is recommended for evaluation, development, and test scenarios. A sing
4343

4444
### Basic tier
4545

46-
The tier is recommended for production solutions with smaller tabular models, limited user concurrency, and simple data refresh requirements. Query replica scale-out *is not available* for this tier. Perspectives, multiple partitions, and DirectQuery tabular model features *are not supported* in this tier.
46+
This tier is recommended for production solutions with smaller tabular models, limited user concurrency, and simple data refresh requirements. Query replica scale-out *is not available* for this tier. Perspectives, multiple partitions, and DirectQuery tabular model features *are not supported* in this tier.
4747

4848
|Plan |QPUs |Memory (GB) |
4949
|---------|---------|---------|
Loading
Binary file not shown.
753 Bytes
Loading

articles/azure-databricks/service-endpoint-cosmosdb.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,6 @@ Before you start, do the following:
104104

105105
1. Navigate to your Azure Databricks service in the [Azure portal](https://portal.azure.com) and select **Launch Workspace**.
106106

107-
![Launch Databricks workspace](./media/service-endpoint-cosmosdb/launch-workspace.png)
108-
109107
2. Create a new cluster. Choose a Cluster Name and accept the remaining default settings.
110108

111109
![New cluster settings](./media/service-endpoint-cosmosdb/create-cluster.png)

articles/azure-monitor/app/profiler.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ If you want to enable the profiler for other clouds, you can use the below app s
5959

6060
## Disable Profiler
6161

62-
To stop or restart Profiler for an individual app's instance, under **Web Jobs**, go to the app resource. To delete Profiler, go to **Extensions**.
62+
To stop or restart Profiler for an individual app's instance, under **WebJobs** and stop the webjob named ApplicationInsightsProfiler3. Even if the profiler is disabled using the switch on the Application Insights page as described above, the profiler process will still run. The profiler will check to see if it's enabled. If it's disabled, it will go to sleep for a period of time before checking again. It doesn't do any profiling if it's disabled. If you disable this webjob, the profiler process won't run at all, even to check to see if it's enabled.
6363

64-
![Disable Profiler for a web job][disable-profiler-webjob]
64+
![Disable Profiler for a web job][disable-profiler-webjob]
6565

6666
We recommend that you have Profiler enabled on all your apps to discover any performance issues as early as possible.
6767

articles/azure-resource-manager/templates/toc.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,12 @@
2222
href: ../../backup/quick-backup-vm-template.md?toc=/azure/azure-resource-manager/templates/toc.json
2323
- name: Cognitive Search
2424
href: ../../search/search-get-started-arm.md?toc=/azure/azure-resource-manager/templates/toc.json
25+
- name: Container Instances
26+
href: ../../container-instances/container-instances-quickstart-template.md?toc=/azure/azure-resource-manager/templates/toc.json
2527
- name: Cosmos DB
2628
href: ../../cosmos-db/quick-create-template.md?toc=/azure/azure-resource-manager/templates/toc.json
29+
- name: Database for MySQL
30+
href: ../../mysql/quickstart-create-mysql-server-database-using-arm-template.md?toc=/azure/azure-resource-manager/templates/toc.json
2731
- name: Event Grid
2832
href: ../../event-grid/blob-event-quickstart-template.md?toc=/azure/azure-resource-manager/templates/toc.json
2933
- name: Event Hub

articles/load-balancer/load-balancer-tcp-idle-timeout.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ TCP keep-alive works for scenarios where battery life isn't a constraint. It isn
3838

3939
The following sections describe how to change idle timeout settings for public IP and load balancer resources.
4040

41+
>[!NOTE]
42+
> TCP idle timeout does not affect load balancing rules on UDP protocol.
43+
44+
4145
## Configure the TCP timeout for your instance-level public IP to 15 minutes
4246

4347
```azurepowershell-interactive

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: jonfan, logicappspm
77
ms.topic: article
8-
ms.date: 05/04/2020
8+
ms.date: 05/23/2020
99
---
1010

1111
# Limits and configuration information for Azure Logic Apps
@@ -204,7 +204,7 @@ Here are the limits for custom connectors that you can create from web APIs.
204204
| Name | Limit |
205205
|------|-------|
206206
| Managed identities per logic app | Either the system-assigned identity or 1 user-assigned identity |
207-
| Number of logic apps that have a managed identity in an Azure subscription per region | 250 |
207+
| Number of logic apps that have a managed identity in an Azure subscription per region | 500 |
208208
|||
209209

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

0 commit comments

Comments
 (0)