Skip to content

Commit 8de2909

Browse files
committed
Merge branch 'main' of github.com:MicrosoftDocs/azure-docs-pr into sdg-main-toc2
2 parents 685484c + ba7fdc3 commit 8de2909

File tree

40 files changed

+281
-243
lines changed

40 files changed

+281
-243
lines changed

articles/azure-monitor/app/configuration-with-applicationinsights-config.md

Lines changed: 102 additions & 91 deletions
Large diffs are not rendered by default.

articles/azure-monitor/app/console.md

Lines changed: 70 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Azure Application Insights for Console Applications | Microsoft Docs
3-
description: Monitor web applications for availability, performance and usage.
2+
title: Application Insights for console applications | Microsoft Docs
3+
description: Monitor web applications for availability, performance, and usage.
44
ms.topic: conceptual
55
ms.date: 05/21/2020
66
ms.devlang: csharp
@@ -12,58 +12,59 @@ ms.reviewer: casocha
1212

1313
[Application Insights](./app-insights-overview.md) lets you monitor your web application for availability, performance, and usage.
1414

15-
You need a subscription with [Microsoft Azure](https://azure.com). Sign in with a Microsoft account, which you might have for Windows, Xbox Live, or other Microsoft cloud services. Your team might have an organizational subscription to Azure: ask the owner to add you to it using your Microsoft account.
15+
You need an [Azure](https://azure.com) subscription. Sign in with a Microsoft account, which you might have for Windows, Xbox Live, or other Microsoft cloud services. Your team might have an organizational subscription to Azure. Ask the owner to add you to it by using your Microsoft account.
1616

1717
> [!NOTE]
18-
> It is *highly recommended* to use the newer [Microsoft.ApplicationInsights.WorkerService](https://www.nuget.org/packages/Microsoft.ApplicationInsights.WorkerService) package and associated instructions from [here](./worker-service.md) for any Console Applications. This package is compatible with [Long Term Support (LTS) versions](https://dotnet.microsoft.com/platform/support/policy/dotnet-core) of .NET Core and .NET Framework or higher.
18+
> We recommend using the newer [Microsoft.ApplicationInsights.WorkerService](https://www.nuget.org/packages/Microsoft.ApplicationInsights.WorkerService) package and associated instructions from [Application Insights for Worker Service applications (non-HTTP applications)](./worker-service.md) for any console applications. This package is compatible with [Long Term Support (LTS) versions](https://dotnet.microsoft.com/platform/support/policy/dotnet-core) of .NET Core and .NET Framework or higher.
1919
2020
[!INCLUDE [azure-monitor-log-analytics-rebrand](../../../includes/azure-monitor-instrumentation-key-deprecation.md)]
2121

22-
## Getting started
22+
## Get started
2323

2424
* In the [Azure portal](https://portal.azure.com), [create an Application Insights resource](./create-new-resource.md).
25-
* Take a copy of the connection string. Find the connection string in the **Essentials** drop-down of the new resource you created.
26-
* Install latest [Microsoft.ApplicationInsights](https://www.nuget.org/packages/Microsoft.ApplicationInsights) package.
27-
* Set the connection string in your code before tracking any telemetry (or set the APPLICATIONINSIGHTS_CONNECTION_STRING environment variable). After that, you should be able to manually track telemetry and see it on the Azure portal
28-
29-
```csharp
30-
// you may use different options to create configuration as shown later in this article
31-
TelemetryConfiguration configuration = TelemetryConfiguration.CreateDefault();
32-
configuration.ConnectionString = <Copy connection string from Application Insights Resource Overview>;
33-
var telemetryClient = new TelemetryClient(configuration);
34-
telemetryClient.TrackTrace("Hello World!");
35-
```
36-
37-
> [!NOTE]
38-
> - Telemetry isn't sent instantly; items are batched and sent by the ApplicationInsights SDK. Console apps exit after calling `Track()` methods.
39-
> - Telemetry may not be sent unless `Flush()` and `Sleep`/`Delay` is done before the app exits as shown in [full example](#full-example) later in this article. `Sleep` is not required if you're using `InMemoryChannel`.
40-
41-
* Install latest version of [Microsoft.ApplicationInsights.DependencyCollector](https://www.nuget.org/packages/Microsoft.ApplicationInsights.DependencyCollector) package - it automatically tracks HTTP, SQL, or some other external dependency calls.
42-
43-
You may initialize and configure Application Insights from the code or using `ApplicationInsights.config` file. Make sure initialization happens as early as possible.
25+
* Take a copy of the connection string. Find the connection string in the **Essentials** dropdown of the new resource you created.
26+
* Install the latest [Microsoft.ApplicationInsights](https://www.nuget.org/packages/Microsoft.ApplicationInsights) package.
27+
* Set the connection string in your code before you track any telemetry (or set the `APPLICATIONINSIGHTS_CONNECTION_STRING` environment variable). After that, you should be able to manually track telemetry and see it in the Azure portal.
28+
29+
```csharp
30+
// You may use different options to create configuration as shown later in this article
31+
TelemetryConfiguration configuration = TelemetryConfiguration.CreateDefault();
32+
configuration.ConnectionString = <Copy connection string from Application Insights Resource Overview>;
33+
var telemetryClient = new TelemetryClient(configuration);
34+
telemetryClient.TrackTrace("Hello World!");
35+
```
36+
37+
> [!NOTE]
38+
> Telemetry isn't sent instantly. Items are batched and sent by the ApplicationInsights SDK. Console apps exit after calling `Track()` methods.
39+
>
40+
> Telemetry might not be sent unless `Flush()` and `Sleep`/`Delay` are done before the app exits, as shown in the [full example](#full-example) later in this article. `Sleep` isn't required if you're using `InMemoryChannel`.
41+
42+
* Install the latest version of the [Microsoft.ApplicationInsights.DependencyCollector](https://www.nuget.org/packages/Microsoft.ApplicationInsights.DependencyCollector) package. It automatically tracks HTTP, SQL, or some other external dependency calls.
43+
44+
You can initialize and configure Application Insights from the code or by using `ApplicationInsights.config` file. Make sure initialization happens as early as possible.
4445

4546
> [!NOTE]
46-
> - **ApplicationInsights.config** is not supported by .NET Core applications.
47+
> *ApplicationInsights.config* isn't supported by .NET Core applications.
4748

48-
### Using config file
49+
### Use the config file
4950

50-
For .NET Framework based application, by default, Application Insights SDK looks for `ApplicationInsights.config` file in the working directory when `TelemetryConfiguration` is being created. Reading config file is not supported on .NET Core.
51+
For .NET Framework-based applications, by default, the Application Insights SDK looks for the `ApplicationInsights.config` file in the working directory when `TelemetryConfiguration` is being created. Reading the config file isn't supported on .NET Core.
5152

5253
```csharp
5354
TelemetryConfiguration config = TelemetryConfiguration.Active; // Reads ApplicationInsights.config file if present
5455
```
5556

56-
You may also specify path to the config file.
57+
You can also specify a path to the config file:
5758

5859
```csharp
5960
using System.IO;
6061
TelemetryConfiguration configuration = TelemetryConfiguration.CreateFromConfiguration(File.ReadAllText("C:\\ApplicationInsights.config"));
6162
var telemetryClient = new TelemetryClient(configuration);
6263
```
6364

64-
For more information, see [configuration file reference](configuration-with-applicationinsights-config.md).
65+
For more information, see [Configuration file reference](configuration-with-applicationinsights-config.md).
6566

66-
You may get a full example of the config file by installing latest version of [Microsoft.ApplicationInsights.WindowsServer](https://www.nuget.org/packages/Microsoft.ApplicationInsights.WindowsServer) package. Here's the **minimal** configuration for dependency collection that is equivalent to the code example.
67+
You can get a full example of the config file by installing the latest version of the [Microsoft.ApplicationInsights.WindowsServer](https://www.nuget.org/packages/Microsoft.ApplicationInsights.WindowsServer) package. Here's the *minimal* configuration for dependency collection that's equivalent to the code example:
6768

6869
```xml
6970
<?xml version="1.0" encoding="utf-8"?>
@@ -93,44 +94,45 @@ You may get a full example of the config file by installing latest version of [M
9394

9495
```
9596

96-
### Configuring telemetry collection from code
97-
> [!NOTE]
98-
> Reading config file is not supported on .NET Core.
99-
100-
* During application start-up, create and configure `DependencyTrackingTelemetryModule` instance - it must be singleton and must be preserved for application lifetime.
101-
102-
```csharp
103-
var module = new DependencyTrackingTelemetryModule();
104-
105-
// prevent Correlation Id to be sent to certain endpoints. You may add other domains as needed.
106-
module.ExcludeComponentCorrelationHttpHeadersOnDomains.Add("core.windows.net");
107-
//...
108-
109-
// enable known dependency tracking, note that in future versions, we will extend this list.
110-
// please check default settings in https://github.com/Microsoft/ApplicationInsights-dotnet-server/blob/develop/Src/DependencyCollector/DependencyCollector/ApplicationInsights.config.install.xdt
97+
### Configure telemetry collection from code
11198

112-
module.IncludeDiagnosticSourceActivities.Add("Microsoft.Azure.ServiceBus");
113-
module.IncludeDiagnosticSourceActivities.Add("Microsoft.Azure.EventHubs");
114-
//....
115-
116-
// initialize the module
117-
module.Initialize(configuration);
118-
```
119-
120-
* Add common telemetry initializers
121-
122-
```csharp
123-
// ensures proper DependencyTelemetry.Type is set for Azure RESTful API calls
124-
configuration.TelemetryInitializers.Add(new HttpDependenciesParsingTelemetryInitializer());
125-
```
126-
127-
If you created configuration with plain `TelemetryConfiguration()` constructor, you need to enable correlation support additionally. **It is not needed** if you read configuration from file, used `TelemetryConfiguration.CreateDefault()` or `TelemetryConfiguration.Active`.
128-
129-
```csharp
130-
configuration.TelemetryInitializers.Add(new OperationCorrelationTelemetryInitializer());
131-
```
132-
133-
* You may also want to install and initialize Performance Counter collector module as described [here](https://apmtips.com/posts/2017-02-13-enable-application-insights-live-metrics-from-code/)
99+
> [!NOTE]
100+
> Reading the config file isn't supported on .NET Core.
101+
102+
* During application startup, create and configure a `DependencyTrackingTelemetryModule` instance. It must be singleton and must be preserved for the application lifetime.
103+
104+
```csharp
105+
var module = new DependencyTrackingTelemetryModule();
106+
107+
// prevent Correlation Id to be sent to certain endpoints. You may add other domains as needed.
108+
module.ExcludeComponentCorrelationHttpHeadersOnDomains.Add("core.windows.net");
109+
//...
110+
111+
// enable known dependency tracking, note that in future versions, we will extend this list.
112+
// please check default settings in https://github.com/Microsoft/ApplicationInsights-dotnet-server/blob/develop/Src/DependencyCollector/DependencyCollector/ApplicationInsights.config.install.xdt
113+
114+
module.IncludeDiagnosticSourceActivities.Add("Microsoft.Azure.ServiceBus");
115+
module.IncludeDiagnosticSourceActivities.Add("Microsoft.Azure.EventHubs");
116+
//....
117+
118+
// initialize the module
119+
module.Initialize(configuration);
120+
```
121+
122+
* Add common telemetry initializers:
123+
124+
```csharp
125+
// ensures proper DependencyTelemetry.Type is set for Azure RESTful API calls
126+
configuration.TelemetryInitializers.Add(new HttpDependenciesParsingTelemetryInitializer());
127+
```
128+
129+
If you created configuration with a plain `TelemetryConfiguration()` constructor, you need to enable correlation support additionally. *It isn't needed* if you read configuration from a file or used `TelemetryConfiguration.CreateDefault()` or `TelemetryConfiguration.Active`.
130+
131+
```csharp
132+
configuration.TelemetryInitializers.Add(new OperationCorrelationTelemetryInitializer());
133+
```
134+
135+
* You might also want to install and initialize the Performance Counter collector module as described at [this website](https://apmtips.com/posts/2017-02-13-enable-application-insights-live-metrics-from-code/).
134136
135137
#### Full example
136138

@@ -209,5 +211,6 @@ namespace ConsoleApp
209211
```
210212

211213
## Next steps
214+
212215
* [Monitor dependencies](./asp-net-dependencies.md) to see if REST, SQL, or other external resources are slowing you down.
213216
* [Use the API](./api-custom-events-metrics.md) to send your own events and metrics for a more detailed view of your app's performance and usage.

articles/azure-monitor/app/usage-segmentation.md

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,51 +6,51 @@ ms.date: 07/30/2021
66
ms.reviewer: mmcc
77
---
88

9-
# Users, sessions, and events analysis in Application Insights
9+
# User, session, and event analysis in Application Insights
1010

1111
Find out when people use your web app, what pages they're most interested in, where your users are located, and what browsers and operating systems they use. Analyze business and usage telemetry by using [Application Insights](./app-insights-overview.md).
1212

1313
:::image type="content" source="./media/usage-segmentation/users.png" alt-text="Screen capture shows the Users tab with an area chart. " lightbox="./media/usage-overview/users.png":::
1414

1515
## Get started
1616

17-
If you don't yet see data in the users, sessions, or events blades in the Application Insights portal, [learn how to get started with the usage tools](usage-overview.md).
17+
If you don't yet see data in the **Users**, **Sessions**, or **Events** panes in the Application Insights portal, [learn how to get started with the Usage tools](usage-overview.md).
1818

1919
## The Users, Sessions, and Events segmentation tool
2020

21-
Three of the usage blades use the same tool to slice and dice telemetry from your web app from three perspectives. By filtering and splitting the data, you can uncover insights about the relative usage of different pages and features.
21+
Three of the **Usage** panes use the same tool to slice and dice telemetry from your web app from three perspectives. By filtering and splitting the data, you can uncover insights about the relative use of different pages and features.
2222

23-
* **Users tool**: How many people used your app and its features. Users are counted by using anonymous IDs stored in browser cookies. A single person using different browsers or machines will be counted as more than one user.
24-
* **Sessions tool**: How many sessions of user activity have included certain pages and features of your app. A session is counted after half an hour of user inactivity, or after 24 hours of continuous use.
25-
* **Events tool**: How often certain pages and features of your app are used. A page view is counted when a browser loads a page from your app, provided you've [instrumented it](./javascript.md).
23+
* **Users tool**: How many people used your app and its features? Users are counted by using anonymous IDs stored in browser cookies. A single person using different browsers or machines will be counted as more than one user.
24+
* **Sessions tool**: How many sessions of user activity have included certain pages and features of your app? A session is counted after half an hour of user inactivity, or after 24 hours of continuous use.
25+
* **Events tool**: How often are certain pages and features of your app used? A page view is counted when a browser loads a page from your app, provided you've [instrumented it](./javascript.md).
26+
27+
A custom event represents one occurrence of something happening in your app. It's often a user interaction like a button selection or the completion of a task. You insert code in your app to [generate custom events](./api-custom-events-metrics.md#trackevent).
2628

27-
A custom event represents one occurrence of something happening in your app, often a user interaction like a button select or the completion of some task. You insert code in your app to [generate custom events](./api-custom-events-metrics.md#trackevent).
28-
2929
> [!NOTE]
30-
> For details on an alternative to using [anonymous IDs](./data-model-context.md#anonymous-user-id) and ensuring an accurate count, reference the documentation for [authenticated IDs](./data-model-context.md#authenticated-user-id).
30+
> For information on an alternatives to using [anonymous IDs](./data-model-context.md#anonymous-user-id) and ensuring an accurate count, see the documentation for [authenticated IDs](./data-model-context.md#authenticated-user-id).
3131
32-
## Querying for certain users
32+
## Query for certain users
3333

3434
Explore different groups of users by adjusting the query options at the top of the Users tool:
3535

36-
- During: Choose a time range.
37-
- Show: Choose a cohort of users to analyze.
38-
- Who used: Choose which custom events, requests, and page views.
39-
- Events: Choose multiple events, requests, and page views that will show users who did at least one, not necessarily all of the selected.
40-
- By value x-axis: Choose how to bucket the data, either by time range or by another property such as browser or city.
41-
- Split By: Choose a property by which to split or segment the data. 
42-
- Add Filters: Limit the query to certain users, sessions, or events based on their properties, such as browser or city. 
43-
 
36+
- **During**: Choose a time range.
37+
- **Show**: Choose a cohort of users to analyze.
38+
- **Who used**: Choose custom events, requests, and page views.
39+
- **Events**: Choose multiple events, requests, and page views that will show users who did at least one, not necessarily all, of the selected options.
40+
- **By value x-axis**: Choose how to categorize the data, either by time range or by another property, such as browser or city.
41+
- **Split By**: Choose a property to use to split or segment the data.
42+
- **Add Filters**: Limit the query to certain users, sessions, or events based on their properties, such as browser or city.
43+
4444
## Meet your users
4545

46-
The **Meet your users** section shows information about five sample users matched by the current query. Exploring the behaviors of individuals and in aggregate, can provide insights about how people actually use your app.
46+
The **Meet your users** section shows information about five sample users matched by the current query. Exploring the behaviors of individuals and in aggregate can provide insights about how people use your app.
4747

4848
## Next steps
4949

5050
- To enable usage experiences, start sending [custom events](./api-custom-events-metrics.md#trackevent) or [page views](./api-custom-events-metrics.md#page-views).
51-
- If you already send custom events or page views, explore the Usage tools to learn how users use your service.
51+
- If you already send custom events or page views, explore the **Usage** tools to learn how users use your service.
5252
- [Funnels](usage-funnels.md)
5353
- [Retention](usage-retention.md)
54-
- [User Flows](usage-flows.md)
54+
- [User flows](usage-flows.md)
5555
- [Workbooks](../visualize/workbooks-overview.md)
5656
- [Add user context](./usage-overview.md)

articles/communication-services/quickstarts/sms/send.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ To troubleshoot issues related to SMS delivery, you can [enable delivery reporti
5656

5757
If you want to clean up and remove a Communication Services subscription, you can delete the resource or resource group. Deleting the resource group also deletes any other resources associated with it. Learn more about [cleaning up resources](../create-communication-resource.md#clean-up-resources).
5858

59+
## Toll-free verification
60+
61+
If you have a new toll-free number and want to send [high volume of SMS messages](../../concepts/sms/sms-faq.md#what-happens-if-i-dont-verify-my-toll-free-numbers) or send SMS messages to Canadian phone numbers, please visit [here](../../concepts/sms/sms-faq.md#how-do-i-submit-a-toll-free-verification) to learn how to verify your toll-free number.
62+
5963
## Next steps
6064

6165
In this quickstart, you learned how to send SMS messages by using Communication Services.

articles/cost-management-billing/manage/programmatically-create-subscription-enterprise-agreement.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -470,3 +470,4 @@ resource subToMG 'Microsoft.Management/managementGroups/subscriptions@2020-05-01
470470
* Now that you've created a subscription, you can grant that ability to other users and service principals. For more information, see [Grant access to create Azure Enterprise subscriptions (preview)](grant-access-to-create-subscription.md).
471471
* For more information about managing large numbers of subscriptions using management groups, see [Organize your resources with Azure management groups](../../governance/management-groups/overview.md).
472472
* To change the management group for a subscription, see [Move subscriptions](../../governance/management-groups/manage.md#move-subscriptions).
473+
* For advanced subscription creation scenarios using REST API, see [Alias - Create](/rest/api/subscription/2021-10-01/alias/create).

0 commit comments

Comments
 (0)