Merge pull request #99016 from MicrosoftDocs/master

Merge master to live 5 PM

Author: ktoliver

articles/azure-functions/functions-monitor-log-analytics.md

@@ -29,40 +29,42 @@ In the setting page, choose **Send to Log Analytics**, and under **LOG** choose
 
 ![Add a diagnostic setting](media/functions-monitor-log-analytics/choose-table.png)
 
-## User generated logs
+## User-generated logs
 
 To generate custom logs, you can use the specific logging statement depending on your language, here are sample code snippets:
 
-**JavaScript**
+# [JavaScript](#tab/javascript)
 
 ```javascript
     context.log('My app logs here.');
 ```
 
-**Python**
+# [Python](#tab/python)
 
 ```python
     logging.info('My app logs here.')
 ```
 
-**.NET**
+# [C#](#tab/csharp)
 
 ```csharp
     log.LogInformation("My app logs here.");
 ```
 
-**Java**
+# [Java](#tab/java)
 
 ```java
     context.getLogger().info("My app logs here.");
 ```
 
-**PowerShell**
+# [PowerShell](#tab/powershell)
 
 ```powershell
     Write-Host "My app logs here."
 ```
 
+---
+
 ## Querying the logs
 
 To query the generated logs, go to the log analytics workspace and click **Logs**.

articles/azure-monitor/app/app-map.md

@@ -65,13 +65,13 @@ Select **go to details** to explore the end-to-end transaction experience, which
 
 ![Screenshot of end-to-end transaction details](media/app-map/end-to-end-transaction.png)
 
-### View in Analytics
+### View Logs (Analytics)
 
-To query and investigate your applications data further, click **view in analytics**.
+To query and investigate your applications data further, click **view in Logs (Analytics)**.
 
-![Screenshot of view in analytics button](media/app-map/view-in-analytics.png)
+![Screenshot of view in analytics button](media/app-map/view-logs.png)
 
-![Screenshot of analytics experience](media/app-map/analytics.png)
+![Screenshot of analytics experience. Line graph summarizing the average response duration of a request over the past 12 hours.](media/app-map/log-analytics.png)
 
 ### Alerts
 

articles/azure-monitor/app/media/app-map/log-analytics.png

@@ -43,7 +43,7 @@ Application Insights can gather telemetry data from any internet-connected appli
     | Settings        | Value           | Description  |
    | ------------- |:-------------|:-----|
    | **Name**      | Globally Unique Value | Name that identifies the app you are monitoring |
-   | **Resource Group**     | myResourceGroup      | Name for the new resource group to host App Insights data |
+   | **Resource Group**     | myResourceGroup      | Name for the new resource group to host App Insights data. You can create a new resource group or use an existing one. |
    | **Location** | East US | Choose a location near you, or near where your app is hosted |
 
 2. Click **Create**.
@@ -129,6 +129,9 @@ To learn more advanced configurations for monitoring websites, check out the [Ja
 
 If you plan to continue on to work with subsequent quickstarts or with the tutorials, do not clean up the resources created in this quickstart. Otherwise, if you do not plan to continue, use the following steps to delete all resources created by this quickstart in the Azure portal.
 
+> [!NOTE]
+> If you used an existing resource group the instructions below will not work and you will need to just delete the individual Application Insights resource. Keep in mind anytime you delete a resource group all underyling resources that are members of that group will be deleted.
+
 1. From the left-hand menu in the Azure portal, click **Resource groups** and then click **myResourceGroup**.
 2. On your resource group page, click **Delete**, type **myResourceGroup** in the text box, and then click **Delete**.
 

articles/azure-monitor/app/media/app-map/view-logs.png

@@ -49,11 +49,13 @@ Application Insights can gather telemetry data from any internet-connected appli
    | Settings        |  Value           | Description  |
    | ------------- |:-------------|:-----|
    | **Name**      | Globally Unique Value | Name that identifies the app you are monitoring |
-   | **Resource Group**     | myResourceGroup      | Name for the new resource group to host App Insights data |
+   | **Resource Group**     | myResourceGroup      | Name for the new resource group to host App Insights data. You can create a new resource group or use an existing one. |
    | **Location** | East US | Choose a location near you, or near where your app is hosted |
 
 2. Click **Create**.
 
+
+
 ## Configure App Insights SDK
 
 1. Open your ASP.NET Core Web App **project** in Visual Studio > Right-click on the AppName in the **Solution Explorer** > Select **Add** > **Application Insights Telemetry**.
@@ -103,6 +105,9 @@ Application Insights can gather telemetry data from any internet-connected appli
 ## Clean up resources
 When you are done testing, you can delete the resource group and all related resources. To do so follow the steps below.
 
+> [!NOTE]
+> If you used an existing resource group the instructions below will not work and you will need to just delete the individual Application Insights resource. Keep in mind anytime you delete a resource group all underyling resources that are members of that group will be deleted.
+
 1. From the left-hand menu in the Azure portal, click **Resource groups** and then click **myResourceGroup**.
 2. On your resource group page, click **Delete**, type **myResourceGroup** in the text box, and then click **Delete**.
 

articles/azure-monitor/app/website-monitoring.md

@@ -47,7 +47,7 @@ Application Insights can gather telemetry data from any internet-connected appli
     | Settings        | Value           | Description  |
    | ------------- |:-------------|:-----|
    | **Name**      | Globally Unique Value | Name that identifies the app you are monitoring |
-   | **Application Type** | Node.js Application | Type of app you are monitoring |
+   | **Resource Group**     | myResourceGroup      | Name for the new resource group to host App Insights data. You can create a new resource group or use an existing one. |
    | **Location** | East US | Choose a location near you, or near where your app is hosted |
 
 2. Select **Create**.
@@ -126,6 +126,9 @@ To learn more about monitoring Node.js, check out the [additional App Insights N
 
 When you are done testing, you can delete the resource group and all related resources. To do so follow the steps below.
 
+> [!NOTE]
+> If you used an existing resource group the instructions below will not work and you will need to just delete the individual Application Insights resource. Keep in mind anytime you delete a resource group all underyling resources that are members of that group will be deleted.
+
 1. From the left-hand menu in the Azure portal, select **Resource groups** and then select **myResourceGroup**.
 2. On your resource group page, select **Delete**, enter **myResourceGroup** in the text box, and then select **Delete**.
 

articles/azure-monitor/learn/dotnetcore-quick-start.md

@@ -5,7 +5,7 @@ author: sffamily
 ms.service: signalr
 ms.devlang: javascript
 ms.topic: quickstart
-ms.date: 03/04/2019
+ms.date: 12/14/2019
 ms.author: zhshang
 ---
 # Quickstart: Create a chat room with Azure Functions and SignalR Service using JavaScript
@@ -18,11 +18,9 @@ This quickstart can be run on macOS, Windows, or Linux.
 
 Make sure you have a code editor such as [Visual Studio Code](https://code.visualstudio.com/) installed.
 
-Install the [Azure Functions Core Tools (v2)](https://github.com/Azure/azure-functions-core-tools#installing) to run Azure Function apps locally.
+Install the [Azure Functions Core Tools](https://github.com/Azure/azure-functions-core-tools#installing) (version 2 or higher) to run Azure Function apps locally.
 
-Azure Functions requires [Node.js](https://nodejs.org/en/download/) version 8 or 10.
-
-In order to install extensions, Azure Functions Core Tools currently require the [.NET Core SDK](https://www.microsoft.com/net/download) installed. However, no knowledge of .NET is required to build JavaScript Azure Function apps.
+This quickstart uses [Node.js](https://nodejs.org/en/download/) 10.x but should work with other versions. Refer to the [Azure Functions runtime versions documentation](../azure-functions/functions-versions.md#languages) for more information on supported Node.js versions.
 
 [!INCLUDE [quickstarts-free-trial-note](../../includes/quickstarts-free-trial-note.md)]
 
@@ -57,13 +55,7 @@ Sign in to the Azure portal at <https://portal.azure.com/> with your Azure accou
     - **negotiate** - Uses the *SignalRConnectionInfo* input binding to generate and return valid connection information.
     - **messages** - Receives a chat message in the request body and uses the *SignalR* output binding to broadcast the message to all connected client applications.
 
-1. In the terminal, ensure that you are in the *src/chat/javascript* folder. Use the Azure Functions Core Tools to install extensions required to run the app.
-
-    ```bash
-    func extensions install
-    ```
-
-1. Run the function app.
+1. In the terminal, ensure that you are in the *src/chat/javascript* folder. Run the function app.
 
     ```bash
     func start

articles/azure-monitor/learn/nodejs-quick-start.md

@@ -5,7 +5,7 @@ author: anthonychu
 ms.service: signalr
 ms.devlang: python
 ms.topic: quickstart
-ms.date: 08/08/2019
+ms.date: 12/14/2019
 ms.author: antchu
 ---
 # Quickstart: Create a chat room with Azure Functions and SignalR Service using Python
@@ -18,11 +18,9 @@ This quickstart can be run on macOS, Windows, or Linux.
 
 Make sure you have a code editor such as [Visual Studio Code](https://code.visualstudio.com/) installed.
 
-Install the [Azure Functions Core Tools (v2)](https://github.com/Azure/azure-functions-core-tools#installing) (version 2.7.1505 or higher) to run Python Azure Function apps locally.
+Install the [Azure Functions Core Tools](https://github.com/Azure/azure-functions-core-tools#installing) (version 2.7.1505 or higher) to run Python Azure Function apps locally.
 
-Azure Functions requires [Python 3.6](https://www.python.org/downloads/).
-
-In order to install extensions, Azure Functions Core Tools currently require the [.NET Core SDK](https://www.microsoft.com/net/download) installed. However, no knowledge of .NET is required to build Python Azure Function apps.
+Azure Functions requires [Python 3.6 or 3.7](https://www.python.org/downloads/).
 
 [!INCLUDE [quickstarts-free-trial-note](../../includes/quickstarts-free-trial-note.md)]
 
@@ -48,19 +46,19 @@ Sign in to the Azure portal at <https://portal.azure.com/> with your Azure accou
 
 1. In your code editor, open the *src/chat/python* folder in the cloned repository.
 
-1. To locally develop and test Python functions, you must work in a Python 3.6 environment. Run the following commands to create and activate a virtual environment named `.venv`.
+1. To locally develop and test Python functions, you must work in a Python 3.6 or 3.7 environment. Run the following commands to create and activate a virtual environment named `.venv`.
 
     **Linux or macOS:**
 
     ```bash
-    python3.6 -m venv .venv
+    python3.7 -m venv .venv
     source .venv/bin/activate
     ```
 
     **Windows:**
 
     ```powershell
-    py -3.6 -m venv .venv
+    py -3.7 -m venv .venv
     .venv\scripts\activate
     ```
 
@@ -73,10 +71,10 @@ Sign in to the Azure portal at <https://portal.azure.com/> with your Azure accou
     - **negotiate** - Uses the *SignalRConnectionInfo* input binding to generate and return valid connection information.
     - **messages** - Receives a chat message in the request body and uses the *SignalR* output binding to broadcast the message to all connected client applications.
 
-1. In the terminal, ensure that you are in the *src/chat/python* folder. Use the Azure Functions Core Tools to install extensions required to run the app.
+1. In the terminal with the virtual environment activated, ensure that you are in the *src/chat/python* folder. Install the necessary Python packages using PIP.
 
     ```bash
-    func extensions install
+    python -m pip install -r requirements.txt
     ```
 
 1. Run the function app.

articles/azure-signalr/signalr-quickstart-azure-functions-javascript.md

@@ -15,7 +15,7 @@ This article explains how to restore data from a backup vault. To restore data,
 Use the Instant Restore feature to mount a writeable recovery point snapshot as a recovery volume. You can then explore the recovery volume and copy files to a local computer, thereby selectively restoring files.
 
 > [!NOTE]
-> The [January 2017 Azure Backup update](https://support.microsoft.com/help/3216528?preview) is required if you want to use Instant Restore to restore data. Also, the backup data must be protected in vaults in locales listed in the support article. Consult the [January 2017 Azure Backup update](https://support.microsoft.com/help/3216528?preview) for the latest list of locales that support Instant Restore.
+> The [January 2017 Azure Backup update](https://support.microsoft.com/help/3216528/azure-backup-update-for-microsoft-azure-recovery-services-agent-januar) is required if you want to use Instant Restore to restore data. Also, the backup data must be protected in vaults in locales listed in the support article. Consult the [January 2017 Azure Backup update](https://support.microsoft.com/help/3216528/azure-backup-update-for-microsoft-azure-recovery-services-agent-januar) for the latest list of locales that support Instant Restore.
 >
 
 Use Instant Restore with Recovery Services vaults in the Azure portal. If you stored data in Backup vaults, they have been converted to Recovery Services vaults. If you want to use Instant Restore, download the MARS update, and follow the procedures that mention Instant Restore.