Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into mrb_05_08_2020_APM_2_1

Author: mrbullwinkle

articles/azure-monitor/app/api-custom-events-metrics.md

@@ -2,7 +2,7 @@
 title: Application Insights API for custom events and metrics | Microsoft Docs
 description: Insert a few lines of code in your device or desktop app, webpage, or service, to track usage and diagnose issues.
 ms.topic: conceptual
-ms.date: 03/27/2019
+ms.date: 05/11/2020
 
 ---
 
@@ -1094,17 +1094,15 @@ To determine how long data is kept, see [Data retention and privacy](../../azure
 * [Java reference](https://docs.microsoft.com/java/api/overview/azure/appinsights?view=azure-java-stable/)
 * [JavaScript reference](https://github.com/Microsoft/ApplicationInsights-JS/blob/master/API-reference.md)
 
-
 ## SDK code
 
-* [ASP.NET Core SDK](https://github.com/Microsoft/ApplicationInsights-aspnetcore)
+* [ASP.NET Core SDK](https://github.com/Microsoft/ApplicationInsights-dotnet)
 * [ASP.NET](https://github.com/Microsoft/ApplicationInsights-dotnet)
-* [Windows Server packages](https://github.com/Microsoft/applicationInsights-dotnet-server)
+* [Windows Server packages](https://github.com/Microsoft/ApplicationInsights-dotnet)
 * [Java SDK](https://github.com/Microsoft/ApplicationInsights-Java)
 * [Node.js SDK](https://github.com/Microsoft/ApplicationInsights-Node.js)
 * [JavaScript SDK](https://github.com/Microsoft/ApplicationInsights-JS)
 
-
 ## Questions
 
 * *What exceptions might Track_() calls throw?*

articles/azure-monitor/app/separate-resources.md

@@ -1,14 +1,14 @@
 ---
-title: Separating telemetry in Azure Application Insights
+title: How to design your Application Insights deployment - One vs many resources?
 description: Direct telemetry to different resources for development, test, and production stamps.
 ms.topic: conceptual
-ms.date: 04/29/2020
+ms.date: 05/11/2020
 
 ---
 
-# Separating telemetry from Development, Test, and Production
+# How many Application Insights resources should I deploy
 
-When you are developing the next version of a web application, you don't want to mix up the [Application Insights](../../azure-monitor/app/app-insights-overview.md) telemetry from the new version and the already released version. To avoid confusion, send the telemetry from different development stages to separate Application Insights resources, with separate instrumentation keys (ikeys). To make it easier to change the instrumentation key as a version moves from one stage to another, it can be useful to set the ikey in code instead of in the configuration file. 
+When you are developing the next version of a web application, you don't want to mix up the [Application Insights](../../azure-monitor/app/app-insights-overview.md) telemetry from the new version and the already released version. To avoid confusion, send the telemetry from different development stages to separate Application Insights resources, with separate instrumentation keys (ikeys). To make it easier to change the instrumentation key as a version moves from one stage to another, it can be useful to set the ikey in code instead of in the configuration file.
 
 (If your system is an Azure Cloud Service, there's [another method of setting separate ikeys](../../azure-monitor/app/cloudservices.md).)
 
@@ -18,7 +18,7 @@ When you set up Application Insights monitoring for your web app, you create an
 
 Each Application Insights resource comes with metrics that are available out-of-box. If completely separate components report to the same Application Insights resource, these metrics may not make sense to dashboard/alert on.
 
-### Use a single Application Insights resource
+### When to use a single Application Insights resource
 
 -	For application components that are deployed together. Usually developed by a single team, managed by the same set of DevOps/ITOps users.
 -	If it makes sense to aggregate Key Performance Indicators (KPIs) such as response durations, failure rates in dashboard etc., across all of them by default (you can choose to segment by role name in the Metrics Explorer experience).

articles/azure-monitor/app/worker-service.md

@@ -2,7 +2,7 @@
 title: Application Insights for Worker Service apps (non-HTTP apps)
 description: Monitoring .NET Core/.NET Framework non-HTTP apps with Azure Monitor Application Insights.
 ms.topic: conceptual
-ms.date: 12/16/2019
+ms.date: 05/11/2020
 
 ---
 
@@ -422,7 +422,8 @@ The following automatic-collection modules are enabled by default. These modules
 * `DependencyTrackingTelemetryModule`
 * `PerformanceCollectorModule`
 * `QuickPulseTelemetryModule`
-* `AppServicesHeartbeatTelemetryModule`
+* `AppServicesHeartbeatTelemetryModule` - (There is currently an issue involving this telemetry module. For a temporary workaround see [GitHub Issue 1689](https://github.com/microsoft/ApplicationInsights-dotnet/issues/1689
+).)
 * `AzureInstanceMetadataTelemetryModule`
 
 To configure any default `TelemetryModule`, use the extension method `ConfigureTelemetryModule<T>` on `IServiceCollection`, as shown in the following example.

articles/azure-monitor/faq.md

@@ -6,7 +6,7 @@ ms.subservice:
 ms.topic: conceptual
 author: bwren
 ms.author: bwren
-ms.date: 03/26/2020
+ms.date: 05/11/2020
 
 ---
 
@@ -192,12 +192,16 @@ View Designer is only available for users assigned with Contributor permissions
 * [Azure diagnostics](platform/diagnostics-extension-to-application-insights.md)
 * [Java web app](app/java-troubleshoot.md)
 
-*I get no data from my server*
+*I get no data from my server:*
 
 * [Set firewall exceptions](app/ip-addresses.md)
 * [Set up an ASP.NET server](app/monitor-performance-live-website-now.md)
 * [Set up a Java server](app/java-agent.md)
 
+*How many Application Insights should I deploy?:*
+
+* [How to design your Application Insights deployment: One versus many Application Insights resources?](app/separate-resources.md)
+
 ### Can I use Application Insights with ...?
 
 * [Web apps on an IIS server in Azure VM or Azure virtual machine scale set](app/azure-vm-vmss-apps.md)

articles/storage/common/storage-import-export-service-faq.md

@@ -5,7 +5,7 @@ author: alkohli
 services: storage
 ms.service: storage
 ms.topic: article
-ms.date: 03/12/2020
+ms.date: 05/06/2020
 ms.author: alkohli
 ms.subservice: common
 ---
@@ -148,7 +148,7 @@ No. The WAImportExport tool is only compatible with 64-bit Windows operating sys
 
 ### Does Azure Import/Export support AES-256 encryption?
 
-No. Azure Import/Export service uses AES-128 BitLocker encryption.
+Yes. Azure Import/Export service uses AES-256 BitLocker encryption.
 
 ## Next steps