Skip to content

Commit c8a0fbf

Browse files
authored
Merge pull request #113917 from MicrosoftDocs/master
5/05 AM Publish
2 parents e0330ef + 351c88c commit c8a0fbf

File tree

60 files changed

+290
-126
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+290
-126
lines changed

articles/active-directory/develop/sample-v2-code.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,11 @@ These samples show how to write a single-page application secured with Microsoft
3838
| Platform | Description | Link |
3939
| -------- | --------------------- | -------- |
4040
| ![This image shows the JavaScript logo](media/sample-v2-code/logo_js.png) [JavaScript (msal.js)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-core) | Calls Microsoft Graph |[javascript-graphapi-v2](https://github.com/Azure-Samples/active-directory-javascript-graphapi-v2) |
41+
| ![This image shows the JavaScript logo](media/sample-v2-code/logo_js.png) [JavaScript (msal.js)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-core) | Calls Microsoft Graph using Auth Code Flow w/ PKCE |[javascript-v2](https://github.com/Azure-Samples/ms-identity-javascript-v2) |
4142
| ![This image shows the JavaScript logo](media/sample-v2-code/logo_js.png) [JavaScript (msal.js)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-core) | Calls B2C |[b2c-javascript-msal-singlepageapp](https://github.com/Azure-Samples/active-directory-b2c-javascript-msal-singlepageapp) |
42-
| ![This image shows the JavaScript logo](media/sample-v2-code/logo_js.png) [JavaScript (msal.js)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-core) | Calls own web API |[javascript-singlepageapp-dotnet-webapi-v2](https://github.com/Azure-Samples/active-directory-javascript-singlepageapp-dotnet-webapi-v2) |
43+
| ![This image shows the Angular logo](media/sample-v2-code/logo_angular.png) [JavaScript (MSAL Angular)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-angular)| Calls own Web API | [ms-identity-javascript-angular-spa-aspnetcore-webapi](https://github.com/Azure-Samples/ms-identity-javascript-angular-spa-aspnetcore-webapi) |
4344
| ![This image shows the Angular logo](media/sample-v2-code/logo_angular.png) [JavaScript (MSAL Angular)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-angular)| Calls Microsoft Graph | [active-directory-javascript-singlepageapp-angular](https://github.com/Azure-Samples/active-directory-javascript-singlepageapp-angular) |
45+
| ![This image shows the React logo](media/sample-v2-code/logo_react.png) [JavaScript (msal.js)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-core)| Calls own Web API which in turn calls Microsoft Graph | [ms-identity-javascript-react-spa-dotnetcore-webapi-obo](https://github.com/Azure-Samples/ms-identity-javascript-react-spa-dotnetcore-webapi-obo) |
4446
| ![This image shows the Angular logo](media/sample-v2-code/logo_angular.png) [JavaScript (MSAL Angular)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-angular) | Calls B2C |[active-directory-b2c-javascript-angular-spa](https://github.com/Azure-Samples/active-directory-b2c-javascript-angular-spa) |
4547

4648
## Web applications

articles/app-service/containers/quickstart-nodejs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ In this section, you learn how to view (or "tail") the logs from the running App
150150

151151
Find the app in the **AZURE APP SERVICE** explorer, right-click the app, and choose **View Streaming Logs**.
152152

153-
When prompted, choose to enable logging and restart the application. Once the app is restarted, the VS Code output window opens with a connection to the log stream.
153+
The VS Code output window opens with a connection to the log stream.
154154

155155
![View Streaming Logs](./media/quickstart-nodejs/view-logs.png)
156156

articles/application-gateway/application-gateway-troubleshooting-502.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.author: amsriva
1010
---
1111

1212
# Troubleshooting bad gateway errors in Application Gateway
13-
13+
<p class="alert is-flex is-primary"><span class="has-padding-left-medium has-padding-top-extra-small"><a class="button is-primary" href="https://azurevirtualsupportagent.services.microsoft.com?content=66c070b6-1c47-4c7f-b928-317a8c8b452f" target='_blank'>Start</a></span><span class="has-padding-small">Solve your issue fast by using our virtual agent to run <b>automated diagnostics.</b></span><span class="has-padding-small"><a href="https://privacy.microsoft.com/privacystatement" target='_blank'><div align="right"><sub>Privacy Statement</sub></div></a></span></p>
1414
Learn how to troubleshoot bad gateway (502) errors received when using Azure Application Gateway.
1515

1616
[!INCLUDE [updated-for-az](../../includes/updated-for-az.md)]

articles/azure-functions/durable/durable-functions-http-features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ const df = require("durable-functions");
136136

137137
module.exports = df.orchestrator(function*(context){
138138
const url = context.df.getInput();
139-
const response = context.df.callHttp("GET", url)
139+
const response = yield context.df.callHttp("GET", url)
140140

141141
if (response.statusCode >= 400) {
142142
// handling of error codes goes here

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

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: 'Quickstart: Monitor websites with Azure Monitor Application Insights'
3-
description: Provides quickstart instructions setup client/browser-side website monitoring with Azure Monitor Application Insights
3+
description: In this quickstart, learn how to set up client/browser-side website monitoring with Azure Monitor Application Insights.
44
ms.topic: quickstart
55
ms.date: 07/15/2019
66

@@ -20,28 +20,26 @@ With Azure Monitor Application Insights, you can easily monitor your website for
2020

2121
## Enable Application Insights
2222

23-
Application Insights can gather telemetry data from any internet-connected application, running on-premises or in the cloud. Use the following steps to start viewing this data.
23+
Application Insights can gather telemetry data from any internet-connected application that's running on-premises or in the cloud. Use the following steps to view this data:
2424

2525
1. Sign in to the [Azure portal](https://portal.azure.com/).
26-
2. Select **Create a resource** > **Management tools** > **Application Insights**.
26+
1. Select **Create a resource** > **Management tools** > **Application Insights**.
2727

2828
> [!NOTE]
29-
>If this is your first time creating an Application Insights resource you can learn more by visiting the [Create an Application Insights Resource](https://docs.microsoft.com/azure/azure-monitor/app/create-new-resource) article.
30-
31-
A configuration box appears; use the following table to fill out the input fields.
29+
>If this is your first time creating an Application Insights resource, see [Create an Application Insights resource](https://docs.microsoft.com/azure/azure-monitor/app/create-new-resource).
30+
1. When the configuration box appears, use the following table to complete the input fields:
3231

3332
| Settings | Value | Description |
3433
| ------------- |:-------------|:-----|
35-
| **Name** | Globally Unique Value | Name that identifies the app you're monitoring |
36-
| **Resource Group** | myResourceGroup | Name for the new resource group to host Application Insights data. You can create a new resource group or use an existing one. |
37-
| **Location** | East US | Choose a location near you, or near where your app is hosted |
38-
39-
3. Click **Create**.
34+
| **Name** | Globally Unique Value | The name that identifies the app you're monitoring. |
35+
| **Resource Group** | myResourceGroup | The name for the new resource group to host Application Insights data. You can create a new resource group or use an existing one. |
36+
| **Location** | East US | Choose a location near you, or near where your app is hosted. |
37+
1. Select **Create**.
4038

4139
## Create an HTML file
4240

43-
1. On your local computer, create a file called ``hello_world.html``. For this example the file will be placed on the root of the C: drive at ``C:\hello_world.html``.
44-
2. Copy the script below into ``hello_world.html``:
41+
1. On your local computer, create a file called ``hello_world.html``. For this example, create the file on the root of drive C so that it looks like ``C:\hello_world.html``.
42+
1. Copy and paste the following script into ``hello_world.html``:
4543

4644
```html
4745
<!DOCTYPE html>
@@ -51,18 +49,18 @@ Application Insights can gather telemetry data from any internet-connected appli
5149
</head>
5250
<body>
5351
<h1>Azure Monitor Application Insights Hello World!</h1>
54-
<p>You can use the Application Insights JavaScript SDK to perform client/browser-side monitoring of your website. To learn about more advanced JavaScript SDK configurations visit the <a href="https://github.com/Microsoft/ApplicationInsights-JS/blob/master/API-reference.md" title="API Reference">API reference</a>.</p>
52+
<p>You can use the Application Insights JavaScript SDK to perform client/browser-side monitoring of your website. To learn about more advanced JavaScript SDK configurations, visit the <a href="https://github.com/Microsoft/ApplicationInsights-JS/blob/master/API-reference.md" title="API Reference">API reference</a>.</p>
5553
</body>
5654
</html>
5755
```
5856

5957
## Configure Application Insights SDK
6058

61-
1. Select **Overview** > **Essentials** > Copy your application's **Instrumentation Key**.
59+
1. Select **Overview** > **Essentials**, and then copy your application's **Instrumentation Key**.
6260

6361
![New Application Insights resource form](media/website-monitoring/instrumentation-key-001.png)
6462

65-
2. Add the following script to your ``hello_world.html`` before the closing ``</head>`` tag:
63+
1. Add the following script to your ``hello_world.html`` file before the closing ``</head>`` tag:
6664

6765
```javascript
6866
<script type="text/javascript">
@@ -74,15 +72,17 @@ Application Insights can gather telemetry data from any internet-connected appli
7472
</script>
7573
```
7674

77-
3. Edit ``hello_world.html`` and add your instrumentation key.
75+
1. Edit ``hello_world.html`` and add your instrumentation key.
76+
77+
1. Open ``hello_world.html`` in a local browser session. This action creates a single page view. You can refresh your browser to generate multiple test-page views.
7878

79-
4. Open ``hello_world.html`` in a local browser session. This action creates a single pageview. You can refresh your browser to generate multiple test page views.
79+
## Monitor your website in the Azure portal
8080

81-
## Start monitoring in the Azure portal
81+
1. Reopen the Application Insights **Overview** page in the Azure portal to view details of your currently running application. The **Overview** page is where you retrieved your instrumentation key.
8282

83-
1. You can now reopen the Application Insights **Overview** page in the Azure portal to view details about your currently running application. The **Overview** page is where you retrieved your instrumentation key. The four default charts on the overview page are scoped to server-side application data. Since we're instrumenting the client/browser-side interactions with the JavaScript SDK, this particular view doesn't apply unless we also have a server-side SDK installed.
83+
The four default charts on the overview page are scoped to server-side application data. Because we're instrumenting the client/browser-side interactions with the JavaScript SDK, this particular view doesn't apply unless we also have a server-side SDK installed.
8484

85-
2. Click on ![Application Map icon](media/website-monitoring/006.png) **Analytics**. This action opens **Analytics**, which provides a rich query language for analyzing all data collected by Application Insights. To view data related to the client-side browser requests run the following query:
85+
1. Select **Analytics** ![Application Map icon](media/website-monitoring/006.png). This action opens **Analytics**, which provides a rich query language for analyzing all data collected by Application Insights. To view data related to the client-side browser requests, run the following query:
8686

8787
```kusto
8888
// average pageView duration by name
@@ -101,29 +101,29 @@ Application Insights can gather telemetry data from any internet-connected appli
101101
102102
![Analytics graph of user requests over a period of time](./media/website-monitoring/analytics-query.png)
103103
104-
3. Go back to the **Overview** page. Click on **Browser** from under the **Investigate** header, then select **Performance** Here you find metrics related to the performance of your website. There's also a corresponding view for analyzing failures and exceptions in your website. You can click **Samples** to drill into individual transaction details. From here, you can access the [end-to-end transaction details](../../azure-monitor/app/transaction-diagnostics.md) experience.
104+
1. Go back to the **Overview** page. Under the **Investigate** header, select **Browser**, and then select **Performance**. Metrics related to the performance of your website appear. There's a corresponding view for analyzing failures and exceptions in your website. You can select **Samples** to access the [end-to-end transaction details](../../azure-monitor/app/transaction-diagnostics.md).
105105
106106
![Server metrics graph](./media/website-monitoring/browser-performance.png)
107107
108-
4. To begin exploring the [user behavior analytics tools](../../azure-monitor/app/usage-overview.md), from the main Application Insights menu select [**Users**](../../azure-monitor/app/usage-segmentation.md) under the **Usage** header. Since we're testing from a single machine, we'll only see data for one user. For a live website, the distribution of users might look as follows:
108+
1. On the main Application Insights menu, under the **Usage** header, select [**Users**](../../azure-monitor/app/usage-segmentation.md) to begin exploring the [user behavior analytics tools](../../azure-monitor/app/usage-overview.md). Because we're testing from a single machine, we'll only see data for one user. For a live website, the distribution of users might look like this:
109109
110110
![User graph](./media/website-monitoring/usage-users.png)
111111
112-
5. If we had instrumented a more complex website with multiple pages, another useful tool is [**User Flows**](../../azure-monitor/app/usage-flows.md). With **User Flows** you can track the pathway visitors takes through the various parts of your website.
112+
1. For a more complex website with multiple pages, you can use the [**User Flows**](../../azure-monitor/app/usage-flows.md) tool to track the pathway that visitors take through the various parts of your website.
113113
114114
![User Flows visualization](./media/website-monitoring/user-flows.png)
115115
116-
To learn more advanced configurations for monitoring websites, check out the [JavaScript SDK API reference](https://github.com/Microsoft/ApplicationInsights-JS/blob/master/API-reference.md).
116+
To learn more advanced configurations for monitoring websites, see the [JavaScript SDK API reference](https://github.com/Microsoft/ApplicationInsights-JS/blob/master/API-reference.md).
117117
118118
## Clean up resources
119119
120-
If you plan to continue on to work with additional quickstarts or with the tutorials, don't clean up the resources created in this quickstart. Otherwise, if you don't plan to continue, use the following steps to delete all resources created by this quickstart in the Azure portal.
120+
If you plan to continue working with additional quickstarts or tutorials, don't clean up the resources created in this quickstart. Otherwise, use the following steps to delete all resources created by this quickstart in the Azure portal.
121121
122122
> [!NOTE]
123-
> 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.
123+
> If you used an existing resource group, the following instructions won't work. Instead, you can just delete the individual Application Insights resource. Keep in mind that when you delete a resource group, all underyling resources that are members of that group are deleted too.
124124
125-
1. In the left menu in the Azure portal, click **Resource groups**, and then click **myResourceGroup** or the name of your temporary resource group.
126-
2. On your resource group page, click **Delete**, type **myResourceGroup** in the text box, and then click **Delete**.
125+
1. On the left menu on the Azure portal, select **Resource groups**, and then select **myResourceGroup** or the name of your temporary resource group.
126+
1. On your resource group page, select **Delete**, enter **myResourceGroup** in the text box, and then select **Delete**.
127127
128128
## Next steps
129129

articles/azure-monitor/platform/action-groups.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,16 +194,21 @@ See the [rate limiting information](./../../azure-monitor/platform/alerts-rate-l
194194

195195
You may have a limited number of SMS actions in an Action Group.
196196

197-
If the Azure portal action group user interface does not let you select your country code, then SMS is not supported for your country. Pricing for supported countries is listed in the [Azure Monitor pricing page](https://azure.microsoft.com/pricing/details/monitor/). If your country code is not available, you can vote to have your country added at [user voice](https://feedback.azure.com/forums/913690-azure-monitor/suggestions/36663181-add-more-country-codes-for-sms-alerting-and-voice).
197+
> [!NOTE]
198+
> If the Azure portal action group user interface does not let you select your country code, then SMS is not supported for your country. If your country code is not available, you can vote to have your country added at [user voice](https://feedback.azure.com/forums/913690-azure-monitor/suggestions/36663181-add-more-country-codes-for-sms-alerting-and-voice). In the meantime, a work around is to have your action group call a webhook to a third-party SMS provider with support in your country.
198199
200+
Pricing for supported countries is listed in the [Azure Monitor pricing page](https://azure.microsoft.com/pricing/details/monitor/).
199201

200202

201203
### Voice
202-
See the [rate limiting information](./../../azure-monitor/platform/alerts-rate-limiting.md) article.
204+
See the [rate limiting information](./../../azure-monitor/platform/alerts-rate-limiting.md) article for additional important behavior.
203205

204206
You may have a limited number of Voice actions in an Action Group.
205207

206-
If the Azure portal action group user interface does not let you select your country code, then voice calls are not supported for your country. Pricing for supported countries is listed in the [Azure Monitor pricing page](https://azure.microsoft.com/pricing/details/monitor/). If your country code is not available, you can vote to have your country added at [user voice](https://feedback.azure.com/forums/913690-azure-monitor/suggestions/36663181-add-more-country-codes-for-sms-alerting-and-voice).
208+
> [!NOTE]
209+
> If the Azure portal action group user interface does not let you select your country code, then voice calls are not supported for your country. If your country code is not available, you can vote to have your country added at [user voice](https://feedback.azure.com/forums/913690-azure-monitor/suggestions/36663181-add-more-country-codes-for-sms-alerting-and-voice). In the meantime, a work around is to have your action group call a webhook to a third-party voice call provider with support in your country.
210+
211+
Pricing for supported countries is listed in the [Azure Monitor pricing page](https://azure.microsoft.com/pricing/details/monitor/).
207212

208213
### Webhook
209214
Webhooks are retried using the following rules. The webhook call is retried a maximum of 2 times when the following HTTP status codes are returned: 408, 429, 503, 504 or the HTTP endpoint does not respond. The first retry happens after 10 seconds. The second retry happens after 100 seconds. After two failures, no action group will call the endpoint for 30 minutes.

articles/azure-monitor/platform/autoscale-get-started.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ This article describes how to set up your Autoscale settings for your resource i
1111
Azure Monitor autoscale applies only to [Virtual Machine Scale Sets](https://azure.microsoft.com/services/virtual-machine-scale-sets/), [Cloud Services](https://azure.microsoft.com/services/cloud-services/), [App Service - Web Apps](https://azure.microsoft.com/services/app-service/web/), and [API Management services](https://docs.microsoft.com/azure/api-management/api-management-key-concepts).
1212

1313
## Discover the Autoscale settings in your subscription
14+
15+
> [!VIDEO https://www.microsoft.com/en-us/videoplayer/embed/RE4u7ts]
16+
1417
You can discover all the resources for which Autoscale is applicable in Azure Monitor. Use the following steps for a step-by-step walkthrough:
1518

1619
1. Open the [Azure portal.][1]

0 commit comments

Comments
 (0)