Skip to content

Commit 5d9b8d5

Browse files
authored
Merge pull request #236499 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 750670b + 03d786b commit 5d9b8d5

29 files changed

+92
-67
lines changed

articles/active-directory/develop/msal-migration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ MSAL Supports a wide range of application types and scenarios. Please refer to [
8282
ADAL to MSAL Migration Guide for different platforms are available in the following link.
8383
- [Migrate to MSAL iOS and MacOS](migrate-objc-adal-msal.md)
8484
- [Migrate to MSAL Java](migrate-adal-msal-java.md)
85-
- [Migrate to MSAL .Net](msal-net-migration.md)
85+
- [Migrate to MSAL .NET](msal-net-migration.md)
8686
- [Migrate to MSAL Node](msal-node-migration.md)
8787
- [Migrate to MSAL Python](migrate-python-adal-msal.md)
8888

articles/active-directory/develop/scenario-desktop-acquire-token-interactive.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ WithParentActivityOrWindow(IWin32Window window)
6060
// Mac
6161
WithParentActivityOrWindow(NSWindow window)
6262

63-
// .NET Standard (this will be on all platforms at runtime, but only on NetStandard at build time)
63+
// .NET Standard (this will be on all platforms at runtime, but only on .NET Standard platforms at build time)
6464
WithParentActivityOrWindow(object parent).
6565
```
6666

articles/active-directory/hybrid/how-to-connect-install-prerequisites.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ To read more about securing your Active Directory environment, see [Best practic
5858
#### Installation prerequisites
5959

6060
- Azure AD Connect must be installed on a domain-joined Windows Server 2016 or later. You can deploy Azure AD Connect on Windows Server 2016 but since Windows Server 2016 is in extended support, you may require [a paid support program](/lifecycle/policies/fixed#extended-support) if you require support for this configuration. We recommend the usage of domain joined Windows Server 2022.
61-
- The minimum .NET Framework version required is 4.6.2, and newer versions of .Net are also supported.
61+
- The minimum .NET Framework version required is 4.6.2, and newer versions of .NET are also supported.
6262
- Azure AD Connect can't be installed on Small Business Server or Windows Server Essentials before 2019 (Windows Server Essentials 2019 is supported). The server must be using Windows Server standard or better.
6363
- The Azure AD Connect server must have a full GUI installed. Installing Azure AD Connect on Windows Server Core isn't supported.
6464
- The Azure AD Connect server must not have PowerShell Transcription Group Policy enabled if you use the Azure AD Connect wizard to manage Active Directory Federation Services (AD FS) configuration. You can enable PowerShell transcription if you use the Azure AD Connect wizard to manage sync configuration.

articles/app-service/webjobs-create.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---
1+
---
22
title: Run background tasks with WebJobs
33
description: Learn how to use WebJobs to run background tasks in Azure App Service. Choose from a variety of script formats and run them with CRON expressions.
44
author: ggailey777

articles/automation/troubleshoot/update-agent-issues.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,11 +228,11 @@ For more information, see [Configure reboot settings](../update-management/con
228228

229229
### WSUS server configuration
230230

231-
If the environment is set to get updates from WSUS, ensure that it is approved in WSUS before the update deployment. For more information, see [WSUS configuration settings](../update-management/configure-wuagent.md#make-wsus-configuration-settings). If your environment is not using WSUS, ensure that you remove the WSUS server settings and [reset Windows update component](https://learn.microsoft.com/windows/deployment/update/windows-update-resources#how-do-i-reset-windows-update-components).
231+
If the environment is set to get updates from WSUS, ensure that it is approved in WSUS before the update deployment. For more information, see [WSUS configuration settings](../update-management/configure-wuagent.md#make-wsus-configuration-settings). If your environment is not using WSUS, ensure that you remove the WSUS server settings and [reset Windows update component](/windows/deployment/update/windows-update-resources#how-do-i-reset-windows-update-components).
232232

233233
### Automatically download and install
234234

235-
To fix the issue, disable the **AutoUpdate** feature. Set it to Disabled in the local group policy Configure Automatic Updates. For more information, see [Configure automatic updates](https://learn.microsoft.com/windows-server/administration/windows-server-update-services/deploy/4-configure-group-policy-settings-for-automatic-updates#configure-automatic-updates).
235+
To fix the issue, disable the **AutoUpdate** feature. Set it to Disabled in the local group policy Configure Automatic Updates. For more information, see [Configure automatic updates](/windows-server/administration/windows-server-update-services/deploy/4-configure-group-policy-settings-for-automatic-updates#configure-automatic-updates).
236236

237237

238238
## <a name="troubleshoot-offline"></a>Troubleshoot offline
@@ -256,7 +256,7 @@ CheckResultMessageArguments : {}
256256
257257
RuleId : DotNetFrameworkInstalledCheck
258258
RuleGroupId : prerequisites
259-
RuleName : .Net Framework 4.6.2+
259+
RuleName : .NET Framework 4.6.2+
260260
RuleGroupName : Prerequisite Checks
261261
RuleDescription : .NET Framework version 4.6.2 or higher is required
262262
CheckResult : Passed

articles/azure-maps/tutorial-prioritized-routes.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,6 @@ The next tutorial demonstrates the process of creating a simple store locator us
338338
[setCamera]: /javascript/api/azure-maps-control/atlas.map#setCamera_CameraOptions___CameraBoundsOptions___AnimationOptions_
339339
[MapControlCredential]: /javascript/api/azure-maps-rest/atlas.service.mapcontrolcredential
340340
[Azure Maps Route Directions API]: /javascript/api/azure-maps-rest/atlas.service.routeurl#calculateroutedirections-aborter--geojson-position----calculateroutedirectionsoptions-
341-
[Truck Route]: https://samples.azuremaps.com/?sample=car-vs-truck-route
341+
[Truck Route]: https://github.com/Azure-Samples/AzureMapsCodeSamples/tree/main/Samples/Tutorials/Truck%20Route
342342
[Multiple routes by mode of travel]: https://samples.azuremaps.com/?sample=multiple-routes-by-mode-of-travel
343-
[Data-driven style expressions]: data-driven-style-expressions-web-sdk.md
344343
[URI Parameters for Post Route Directions]: /rest/api/maps/route/postroutedirections#uri-parameters

articles/azure-monitor/app/application-insights-asp-net-agent.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ PS C:\> Enable-ApplicationInsightsMonitoring -InstrumentationKeyMap
419419
```
420420

421421
> [!NOTE]
422-
> The naming of AppFilter in this context can be confusing, `AppFilter` sets the application name regex filter (HostingEnvironment.SiteName in the case of .Net on IIS). `VirtualPathFilter` sets the virtual path regex filter (HostingEnvironment.ApplicationVirtualPath in the case of .Net on IIS). To instrument a single app you would use the VirtualPathFilter as follows: `Enable-ApplicationInsightsMonitoring -InstrumentationKeyMap @(@{VirtualPathFilter="^/MyAppName$"; InstrumentationSettings=@{InstrumentationKey='<your ikey>'}})`
422+
> The naming of AppFilter in this context can be confusing, `AppFilter` sets the application name regex filter (HostingEnvironment.SiteName in the case of .NET on IIS). `VirtualPathFilter` sets the virtual path regex filter (HostingEnvironment.ApplicationVirtualPath in the case of .NET on IIS). To instrument a single app you would use the VirtualPathFilter as follows: `Enable-ApplicationInsightsMonitoring -InstrumentationKeyMap @(@{VirtualPathFilter="^/MyAppName$"; InstrumentationSettings=@{InstrumentationKey='<your ikey>'}})`
423423
424424
#### Parameters
425425

articles/azure-monitor/app/asp-net-core.md

Lines changed: 38 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,15 @@ The [Application Insights SDK for ASP.NET Core](https://nuget.org/packages/Micro
3939
* **Deployment method**: Framework dependent or self-contained
4040
* **Web server**: Internet Information Server (IIS) or Kestrel
4141
* **Hosting platform**: The Web Apps feature of Azure App Service, Azure Virtual Machines, Docker, and Azure Kubernetes Service (AKS)
42-
* **.NET Core version**: All officially [supported .NET Core versions](https://dotnet.microsoft.com/download/dotnet-core) that aren't in preview
42+
* **.NET version**: All officially [supported .NET versions](https://dotnet.microsoft.com/download/dotnet) that aren't in preview
4343
* **IDE**: Visual Studio, Visual Studio Code, or command line
4444

45-
> [!NOTE]
46-
> ASP.NET Core 6.0 requires [Application Insights 2.19.0](https://www.nuget.org/packages/Microsoft.ApplicationInsights.AspNetCore/2.19.0) or later.
47-
4845
## Prerequisites
4946

5047
You need:
5148

5249
- A functioning ASP.NET Core application. If you need to create an ASP.NET Core application, follow this [ASP.NET Core tutorial](/aspnet/core/getting-started/).
50+
- A reference to a supported version of the [Application Insights](https://www.nuget.org/packages/Microsoft.ApplicationInsights.AspNetCore) NuGet package.
5351
- A valid Application Insights connection string. This string is required to send any telemetry to Application Insights. If you need to create a new Application Insights resource to get a connection string, see [Create an Application Insights resource](./create-new-resource.md).
5452

5553
## Enable Application Insights server-side telemetry (Visual Studio)
@@ -87,7 +85,7 @@ For Visual Studio for Mac, use the [manual guidance](#enable-application-insight
8785
1. Add `AddApplicationInsightsTelemetry()` to your `startup.cs` or `program.cs` class. The choice depends on your .NET Core version.
8886

8987
### [ASP.NET Core 6 and later](#tab/netcorenew)
90-
88+
9189
Add `builder.Services.AddApplicationInsightsTelemetry();` after the `WebApplication.CreateBuilder()` method in your `Program` class, as in this example:
9290

9391
```csharp
@@ -102,11 +100,11 @@ For Visual Studio for Mac, use the [manual guidance](#enable-application-insight
102100

103101
var app = builder.Build();
104102
```
105-
103+
106104
### [ASP.NET Core 5 and earlier](#tab/netcoreold)
107-
105+
108106
Add `services.AddApplicationInsightsTelemetry();` to the `ConfigureServices()` method in your `Startup` class, as in this example:
109-
107+
110108
```csharp
111109
// This method gets called by the runtime. Use this method to add services to the container.
112110
public void ConfigureServices(IServiceCollection services)
@@ -118,9 +116,12 @@ For Visual Studio for Mac, use the [manual guidance](#enable-application-insight
118116
services.AddMvc();
119117
}
120118
```
121-
122-
---
123119

120+
> [!NOTE]
121+
> This .NET version is no longer supported.
122+
123+
---
124+
124125
1. Set up the connection string.
125126

126127
Although you can provide a connection string as part of the `ApplicationInsightsServiceOptions` argument to `AddApplicationInsightsTelemetry`, we recommend that you specify the connection string in configuration. The following code sample shows how to specify a connection string in `appsettings.json`. Make sure `appsettings.json` is copied to the application root folder during publishing.
@@ -180,7 +181,7 @@ Dependency collection is enabled by default. [Dependency tracking in Application
180181
Support for [performance counters](./performance-counters.md) in ASP.NET Core is limited:
181182

182183
* SDK versions 2.4.1 and later collect performance counters if the application is running in Web Apps (Windows).
183-
* SDK versions 2.7.1 and later collect performance counters if the application is running in Windows and targets `NETSTANDARD2.0` or later.
184+
* SDK versions 2.7.1 and later collect performance counters if the application is running in Windows and targets `netstandard2.0` or later.
184185
* For applications that target the .NET Framework, all versions of the SDK support performance counters.
185186
* SDK versions 2.8.0 and later support the CPU/memory counter in Linux. No other counter is supported in Linux. To get system counters in Linux and other non-Windows environments, use [EventCounters](#eventcounter).
186187

@@ -270,6 +271,9 @@ public void ConfigureServices(IServiceCollection services)
270271
}
271272
```
272273

274+
> [!NOTE]
275+
> This .NET version is no longer supported.
276+
273277
---
274278

275279
This table has the full list of `ApplicationInsightsServiceOptions` settings:
@@ -286,7 +290,7 @@ This table has the full list of `ApplicationInsightsServiceOptions` settings:
286290
|EnableAdaptiveSampling | Enable/Disable Adaptive Sampling. | True
287291
|EnableHeartbeat | Enable/Disable the heartbeats feature. It periodically (15-min default) sends a custom metric named `HeartbeatState` with information about the runtime like .NET version and Azure environment information, if applicable. | True
288292
|AddAutoCollectedMetricExtractor | Enable/Disable the `AutoCollectedMetrics extractor`. This telemetry processor sends preaggregated metrics about requests/dependencies before sampling takes place. | True
289-
|RequestCollectionOptions.TrackExceptions | Enable/Disable reporting of unhandled exception tracking by the request collection module. | False in NETSTANDARD2.0 (because exceptions are tracked with `ApplicationInsightsLoggerProvider`). True otherwise.
293+
|RequestCollectionOptions.TrackExceptions | Enable/Disable reporting of unhandled exception tracking by the request collection module. | False in `netstandard2.0` (because exceptions are tracked with `ApplicationInsightsLoggerProvider`). True otherwise.
290294
|EnableDiagnosticsTelemetryModule | Enable/Disable `DiagnosticsTelemetryModule`. Disabling causes the following settings to be ignored: `EnableHeartbeat`, `EnableAzureInstanceMetadataTelemetryModule`, and `EnableAppServicesHeartbeatTelemetryModule`. | True
291295

292296
For the most current list, see the [configurable settings in `ApplicationInsightsServiceOptions`](https://github.com/microsoft/ApplicationInsights-dotnet/blob/develop/NETCORE/src/Shared/Extensions/ApplicationInsightsServiceOptions.cs).
@@ -343,6 +347,7 @@ public void ConfigureServices(IServiceCollection services)
343347

344348
> [!NOTE]
345349
> `services.AddSingleton<ITelemetryInitializer, MyCustomTelemetryInitializer>();` works for simple initializers. For others, `services.AddSingleton(new MyCustomTelemetryInitializer() { fieldName = "myfieldName" });` is required.
350+
> This .NET version is no longer supported.
346351
347352
---
348353

@@ -393,6 +398,9 @@ public void ConfigureServices(IServiceCollection services)
393398
}
394399
```
395400

401+
> [!NOTE]
402+
> This .NET version is no longer supported.
403+
396404
---
397405

398406
### Add telemetry processors
@@ -428,6 +436,9 @@ public void ConfigureServices(IServiceCollection services)
428436
}
429437
```
430438

439+
> [!NOTE]
440+
> This .NET version is no longer supported.
441+
431442
---
432443

433444
### Configure or remove default TelemetryModules
@@ -515,6 +526,9 @@ public void ConfigureServices(IServiceCollection services)
515526
}
516527
```
517528

529+
> [!NOTE]
530+
> This .NET version is no longer supported.
531+
518532
---
519533

520534
In versions 2.12.2 and later, [`ApplicationInsightsServiceOptions`](#use-applicationinsightsserviceoptions) includes an easy option to disable any of the default modules.
@@ -554,6 +568,9 @@ public void ConfigureServices(IServiceCollection services)
554568
}
555569
```
556570

571+
> [!NOTE]
572+
> This .NET version is no longer supported.
573+
557574
---
558575

559576
> [!NOTE]
@@ -591,6 +608,9 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, Telemetr
591608
}
592609
```
593610

611+
> [!NOTE]
612+
> This .NET version is no longer supported.
613+
594614
---
595615

596616
The preceding code sample prevents the sending of telemetry to Application Insights. It doesn't prevent any automatic collection modules from collecting telemetry. If you want to remove a particular autocollection module, see [Remove the telemetry module](#configure-or-remove-default-telemetrymodules).
@@ -599,11 +619,11 @@ The preceding code sample prevents the sending of telemetry to Application Insig
599619

600620
This section provides answers to common questions.
601621

602-
### Does Application Insights support ASP.NET Core 3.X?
622+
### Does Application Insights support ASP.NET Core 3.1?
603623

604-
Yes. Update to [Application Insights SDK for ASP.NET Core](https://nuget.org/packages/Microsoft.ApplicationInsights.AspNetCore) version 2.8.0 or later. Earlier versions of the SDK don't support ASP.NET Core 3.X.
624+
ASP.NET Core 3.1 is no longer supported by Microsoft.
605625

606-
Also, if you're [enabling server-side telemetry based on Visual Studio](#enable-application-insights-server-side-telemetry-visual-studio), update to the latest version of Visual Studio 2019 (16.3.0) to onboard. Earlier versions of Visual Studio don't support automatic onboarding for ASP.NET Core 3.X apps.
626+
[Application Insights SDK for ASP.NET Core](https://nuget.org/packages/Microsoft.ApplicationInsights.AspNetCore) version 2.8.0 and Visual Studio 2019 or later can be used with ASP.NET Core 3.1 applications.
607627

608628
### How can I track telemetry that's not automatically collected?
609629

@@ -738,6 +758,9 @@ public void ConfigureServices(IServiceCollection services)
738758
}
739759
```
740760

761+
> [!NOTE]
762+
> This .NET version is no longer supported.
763+
741764
---
742765

743766
This limitation isn't applicable from version [2.15.0](https://www.nuget.org/packages/Microsoft.ApplicationInsights.AspNetCore/2.15.0) and later.

articles/azure-monitor/app/eventcounters.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.reviewer: cithomas
1111

1212
[`EventCounter`](/dotnet/core/diagnostics/event-counters) is .NET/.NET Core mechanism to publish and consume counters or statistics. EventCounters are supported in all OS platforms - Windows, Linux, and macOS. It can be thought of as a cross-platform equivalent for the [PerformanceCounters](/dotnet/api/system.diagnostics.performancecounter) that is only supported in Windows systems.
1313

14-
While users can publish any custom `EventCounters` to meet their needs, .NET Core [LTS](https://dotnet.microsoft.com/platform/support/policy/dotnet-core) and higher runtime publishes a set of these counters by default. This document will walk through the steps required to collect and view `EventCounters` (system defined or user defined) in Azure Application Insights.
14+
While users can publish any custom `EventCounters` to meet their needs, [.NET](/dotnet/fundamentals/) publishes a set of these counters by default. This document will walk through the steps required to collect and view `EventCounters` (system defined or user defined) in Azure Application Insights.
1515

1616
## Using Application Insights to collect EventCounters
1717

articles/azure-monitor/app/get-metric.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ In summary, we recommend `GetMetric()` because it does pre-aggregation, it accum
3535
3636
## Get started with GetMetric
3737

38-
For our examples, we're going to use a basic .NET Core 3.1 worker service application. If you want to replicate the test environment used with these examples, follow steps 1-6 in the [Monitoring worker service article](worker-service.md#net-core-lts-worker-service-application). These steps add Application Insights to a basic worker service project template. The concepts apply to any general application where the SDK can be used, including web apps and console apps.
38+
For our examples, we're going to use a basic .NET Core 3.1 worker service application. If you want to replicate the test environment used with these examples, follow steps 1-6 in the [Monitoring worker service article](worker-service.md#net-core-worker-service-application). These steps add Application Insights to a basic worker service project template. The concepts apply to any general application where the SDK can be used, including web apps and console apps.
3939

4040
### Send metrics
4141

@@ -306,7 +306,7 @@ SeverityLevel.Error);
306306

307307
## Next steps
308308

309-
* [Metrics - Get - REST API](https://learn.microsoft.com/rest/api/application-insights/metrics/get)
309+
* [Metrics - Get - REST API](/rest/api/application-insights/metrics/get)
310310
* [Application Insights API for custom events and metrics](api-custom-events-metrics.md)
311311
* [Learn more](./worker-service.md) about monitoring worker service applications.
312312
* Use [log-based and pre-aggregated metrics](./pre-aggregated-metrics-log-metrics.md).

0 commit comments

Comments
 (0)