Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)

Author: Banani-Rath

articles/api-management/api-management-howto-developer-portal-customize.md

@@ -168,7 +168,8 @@ Although you don't need to adjust any styles, you may consider adjusting particu
 You can control which portal content appears to different users, based on their identity. For example, you might want to display certain pages only to users who have access to a specific product or API. Or, make a section of a page appear only for certain [groups of users](api-management-howto-create-groups.md). The developer portal has built-in controls for these needs.
 
 > [!NOTE]
-> Visibility and access controls are supported only in the managed developer portal. They are not supported in the [self-hosted portal](developer-portal-self-host.md).
+> * These controls are being released during December 2022. It may take several weeks for your API Management service to receive the update.
+> * Visibility and access controls are supported only in the managed developer portal. They are not supported in the [self-hosted portal](developer-portal-self-host.md).
 
 * When you add or edit a page, select the **Access** tab to control the users or groups that can access the page
 

articles/azure-functions/functions-dotnet-class-library.md

@@ -100,7 +100,7 @@ The order of parameters in the function signature doesn't matter. For example, y
 
 ### Output bindings
 
-A function can have zero or one output bindings defined by using output parameters. 
+A function can have zero or multiple output bindings defined by using output parameters. 
 
 The following example modifies the preceding one by adding an output queue binding named `myQueueItemCopy`. The function writes the contents of the message that triggers the function to a new message in a different queue.
 

articles/azure-monitor/agents/azure-monitor-agent-manage.md

@@ -59,7 +59,7 @@ The following prerequisites must be met prior to installing Azure Monitor Agent.
 
   -	global.handler.control.monitor.azure.com
   -	`<virtual-machine-region-name>`.handler.control.monitor.azure.com (example: westus.handler.control.azure.com)
-  -	`<log-analytics-workspace-id>`.ods.opinsights.azure.com (example: 12345a01-b1cd-1234-e1f2-1234567g8h99.ods.opsinsights.azure.com)  
+  -	`<log-analytics-workspace-id>`.ods.opinsights.azure.com (example: 12345a01-b1cd-1234-e1f2-1234567g8h99.ods.opinsights.azure.com)  
     (If you use private links on the agent, you must also add the [dce endpoints](../essentials/data-collection-endpoint-overview.md#components-of-a-data-collection-endpoint)).
 
 > [!NOTE]

articles/azure-monitor/agents/azure-monitor-agent-windows-client.md

@@ -50,7 +50,7 @@ Here is a comparison between client installer and VM extension for Azure Monitor
 5. The device must have access to the following HTTPS endpoints:
 	-	global.handler.control.monitor.azure.com
 	-	`<virtual-machine-region-name>`.handler.control.monitor.azure.com (example: westus.handler.control.azure.com)
-	-	`<log-analytics-workspace-id>`.ods.opinsights.azure.com (example: 12345a01-b1cd-1234-e1f2-1234567g8h99.ods.opsinsights.azure.com)
+	-	`<log-analytics-workspace-id>`.ods.opinsights.azure.com (example: 12345a01-b1cd-1234-e1f2-1234567g8h99.ods.opinsights.azure.com)
     (If using private links on the agent, you must also add the [data collection endpoints](../essentials/data-collection-endpoint-overview.md#components-of-a-data-collection-endpoint))
 6. Existing data collection rule(s) you wish to associate with the devices. If it doesn't exist already, [follow the guidance here to create data collection rule(s)](./data-collection-rule-azure-monitor-agent.md#create-data-collection-rule-and-association). **Do not associate the rule to any resources yet**.
 

articles/azure-monitor/alerts/itsmc-definition.md

@@ -74,6 +74,8 @@ After you create your ITSM connection, use the ITSM action in action groups to c
 
 Certain work item types can use templates that you define in ServiceNow. When you use templates, you can define fields that will be automatically populated by using constant values defined in ServiceNow (not values from the payload). The templates are synced with Azure. You can define which template you want to use as a part of the definition of an action group. For information about how to create templates, see the [ServiceNow documentation](https://docs.servicenow.com/en-US/bundle/tokyo-platform-administration/page/administer/form-administration/task/t_CreateATemplateUsingTheTmplForm.html).
 
+### Create ITSM work items
+
 To create an action group:
 
 1. In the Azure portal, select **Monitor** > **Alerts**.

articles/azure-monitor/app/performance-counters.md

@@ -112,25 +112,50 @@ Or you can do the same thing with custom metrics that you created:
 
 ### Collect performance counters in code for ASP.NET Core web applications
 
-Modify the `ConfigureServices` method in your `Startup.cs` class:
+### [ASP.NET Core 6 and later](#tab/net-core-new)
+
+Configure `PerformanceCollectorModule` after the `WebApplication.CreateBuilder()` method in `Program.cs`:
 
 ```csharp
 using Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector;
 
-    public void ConfigureServices(IServiceCollection services)
+var builder = WebApplication.CreateBuilder(args);
+
+builder.Services.AddApplicationInsightsTelemetry();
+
+// The following configures PerformanceCollectorModule.
+
+builder.Services.ConfigureTelemetryModule<PerformanceCollectorModule>((module, o) =>
     {
-        services.AddApplicationInsightsTelemetry();
-
-        // The following configures PerformanceCollectorModule.
-  services.ConfigureTelemetryModule<PerformanceCollectorModule>((module, o) =>
-            {
-                // the application process name could be "dotnet" for ASP.NET Core self-hosted applications.
-                module.Counters.Add(new PerformanceCounterCollectionRequest(
-    @"\Process([replace-with-application-process-name])\Page Faults/sec", "DotnetPageFaultsPerfSec"));
-            });
-    }
+        // The application process name could be "dotnet" for ASP.NET Core self-hosted applications.
+        module.Counters.Add(new PerformanceCounterCollectionRequest(@"\Process([replace-with-application-process-name])\Page Faults/sec", "DotnetPageFaultsPerfSec"));
+    });
+
+var app = builder.Build();
+```
+
+### [ASP.NET Core 5 and earlier](#tab/net-core-old)
+
+Configure `PerformanceCollectorModule` in the `ConfigureServices()` method in `Startup.cs`:
+
+```csharp
+using Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector;
+
+public void ConfigureServices(IServiceCollection services)
+{
+    services.AddApplicationInsightsTelemetry();
+
+    // The following configures PerformanceCollectorModule:
+    services.ConfigureTelemetryModule<PerformanceCollectorModule>((module, o) =>
+        {
+            // The application process name could be "dotnet" for ASP.NET Core self-hosted applications.
+            module.Counters.Add(new PerformanceCounterCollectionRequest(@"\Process([replace-with-application-process-name])\PageFaults/sec", "DotnetPageFaultsPerfSec"));
+        });
+}
 ```
 
+---
+
 ## Performance counters in Log Analytics
 You can search and display performance counter reports in [Log Analytics](../logs/log-query-overview.md).
 

articles/azure-monitor/app/sampling.md

@@ -9,7 +9,7 @@ ms.reviewer: mmcc
 
 # Sampling in Application Insights
 
-Sampling is a feature in [Azure Application Insights](./app-insights-overview.md). It's the recommended way to reduce telemetry traffic, data costs, and storage costs, while preserving a statistically correct analysis of application data. Sampling also helps you avoid Application Insights throttling your telemetry. The sampling filter selects items that are related, so that you can navigate between items when you're doing diagnostic investigations.
+Sampling is a feature in [Application Insights](./app-insights-overview.md). It's the recommended way to reduce telemetry traffic, data costs, and storage costs, while preserving a statistically correct analysis of application data. Sampling also helps you avoid Application Insights throttling your telemetry. The sampling filter selects items that are related, so that you can navigate between items when you're doing diagnostic investigations.
 
 When metric counts are presented in the portal, they're renormalized to take into account sampling. Doing so minimizes any effect on the statistics.
 
@@ -139,7 +139,7 @@ In [`ApplicationInsights.config`](./configuration-with-applicationinsights-confi
 Instead of setting the sampling parameter in the `.config` file, you can programmatically set these values.
 
 1. Remove all the `AdaptiveSamplingTelemetryProcessor` node(s) from the `.config` file.
-2. Use the following snippet to configure adaptive sampling:
+1. Use the following snippet to configure adaptive sampling:
 
     ```csharp
     using Microsoft.ApplicationInsights;
@@ -179,21 +179,37 @@ Adaptive sampling is enabled by default for all ASP.NET Core applications. You c
 
 #### Turning off adaptive sampling
 
-The default sampling feature can be disabled while adding Application Insights service, in the method `ConfigureServices`, using `ApplicationInsightsServiceOptions` within the `Startup.cs` file:
+The default sampling feature can be disabled while adding the Application Insights service.
+
+### [ASP.NET Core 6 and later](#tab/net-core-new)
+
+Add `ApplicationInsightsServiceOptions` after the `WebApplication.CreateBuilder()` method in the `Program.cs` file:
+
+```csharp
+var builder = WebApplication.CreateBuilder(args);
+
+var aiOptions = new Microsoft.ApplicationInsights.AspNetCore.Extensions.ApplicationInsightsServiceOptions();
+aiOptions.EnableAdaptiveSampling = false;
+builder.Services.AddApplicationInsightsTelemetry(aiOptions);
+
+var app = builder.Build();
+```
+
+### [ASP.NET Core 5 and earlier](#tab/net-core-old)
+
+Add `ApplicationInsightsServiceOptions` to the `ConfigureServices()` method in the `Startup.cs` file:
 
 ```csharp
 public void ConfigureServices(IServiceCollection services)
 {
-    // ...
-
     var aiOptions = new Microsoft.ApplicationInsights.AspNetCore.Extensions.ApplicationInsightsServiceOptions();
     aiOptions.EnableAdaptiveSampling = false;
     services.AddApplicationInsightsTelemetry(aiOptions);
-
-    //...
 }
 ```
 
+---
+
 The above code will disable adaptive sampling. Follow the steps below to add sampling with more customization options.
 
 #### Configure sampling settings
@@ -203,6 +219,39 @@ Use extension methods of `TelemetryProcessorChainBuilder` as shown below to cust
 > [!IMPORTANT]
 > If you use this method to configure sampling, please make sure to set the `aiOptions.EnableAdaptiveSampling` property to `false` when calling `AddApplicationInsightsTelemetry()`. After making this change, you then need to follow the instructions in the code block below **exactly** in order to re-enable adaptive sampling with your customizations in place. Failure to do so can result in excess data ingestion. Always test post changing sampling settings, and set an appropriate [daily data cap](../logs/daily-cap.md) to help control your costs.
 
+### [ASP.NET Core 6 and later](#tab/net-core-new)
+
+```csharp
+using Microsoft.ApplicationInsights.AspNetCore.Extensions;
+using Microsoft.ApplicationInsights.Extensibility;
+
+var builder = WebApplication.CreateBuilder(args);
+
+builder.Services.Configure<TelemetryConfiguration>(telemetryConfiguration =>
+{
+    var builder = telemetryConfiguration.DefaultTelemetrySink.TelemetryProcessorChainBuilder;
+
+    // Using adaptive sampling
+    builder.UseAdaptiveSampling(maxTelemetryItemsPerSecond: 5);
+
+    // Alternately, the following configures adaptive sampling with 5 items per second, and also excludes DependencyTelemetry from being subject to sampling:
+    // configuration.DefaultTelemetrySink.TelemetryProcessorChainBuilder.UseAdaptiveSampling(maxTelemetryItemsPerSecond:5, excludedTypes: "Dependency");
+
+    // If you have other telemetry processors:
+    builder.Use(next => new AnotherProcessor(next));
+
+});
+
+builder.Services.AddApplicationInsightsTelemetry(new ApplicationInsightsServiceOptions
+{
+    EnableAdaptiveSampling = false,
+});
+
+var app = builder.Build();
+```
+
+### [ASP.NET Core 5 and earlier](#tab/net-core-old)
+
 ```csharp
 using Microsoft.ApplicationInsights.Extensibility
 
@@ -222,11 +271,11 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, Telemetr
     builder.Use((next) => new AnotherProcessor(next));
 
     builder.Build();
-
-    // ...
 }
 ```
 
+---
+
 ### Configuring adaptive sampling for Azure Functions
 
 Follow instructions from [this page](../../azure-functions/configure-monitoring.md#configure-sampling) to configure adaptive sampling for apps running in Azure Functions.
@@ -252,7 +301,7 @@ In Metrics Explorer, rates such as request and exception counts are multiplied b
         -->
     ```
 
-2. **Enable the fixed-rate sampling module.** Add this snippet to [`ApplicationInsights.config`](./configuration-with-applicationinsights-config.md):
+1. **Enable the fixed-rate sampling module.** Add this snippet to [`ApplicationInsights.config`](./configuration-with-applicationinsights-config.md):
 
     ```xml
     <TelemetryProcessors>
@@ -264,8 +313,8 @@ In Metrics Explorer, rates such as request and exception counts are multiplied b
     </TelemetryProcessors>
     ```
 
-      Alternatively, instead of setting the sampling parameter in the `ApplicationInsights.config` file, you can programmatically set these values:
-
+    Alternatively, instead of setting the sampling parameter in the `ApplicationInsights.config` file, you can programmatically set these values:
+    
     ```csharp
     using Microsoft.ApplicationInsights.Extensibility;
     using Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel;
@@ -288,22 +337,66 @@ In Metrics Explorer, rates such as request and exception counts are multiplied b
 
 ### Configuring fixed-rate sampling for ASP.NET Core applications
 
-1. **Disable adaptive sampling**:  Changes can be made in the `ConfigureServices` method, using `ApplicationInsightsServiceOptions`:
+1. **Disable adaptive sampling**
+
+    ### [ASP.NET Core 6 and later](#tab/net-core-new)
+    
+    Changes can be made after the `WebApplication.CreateBuilder()` method, using `ApplicationInsightsServiceOptions`:
+    
+    ```csharp
+    var builder = WebApplication.CreateBuilder(args);
+
+    var aiOptions = new Microsoft.ApplicationInsights.AspNetCore.Extensions.ApplicationInsightsServiceOptions();
+    aiOptions.EnableAdaptiveSampling = false;
+    builder.Services.AddApplicationInsightsTelemetry(aiOptions);
+    
+    var app = builder.Build();
+    ```
+
+    ### [ASP.NET Core 5 and earlier](#tab/net-core-old)
+    
+    Changes can be made in the `ConfigureServices()` method, using `ApplicationInsightsServiceOptions`:
 
     ```csharp
     public void ConfigureServices(IServiceCollection services)
     {
-        // ...
-
         var aiOptions = new Microsoft.ApplicationInsights.AspNetCore.Extensions.ApplicationInsightsServiceOptions();
         aiOptions.EnableAdaptiveSampling = false;
         services.AddApplicationInsightsTelemetry(aiOptions);
-
-        //...
     }
     ```
+    
+    ---
+
+1. **Enable the fixed-rate sampling module**
+
+    ### [ASP.NET Core 6 and later](#tab/net-core-new)
+    
+    Changes can be made after the `WebApplication.CreateBuilder()` method:
+    
+    ```csharp
+    var builder = WebApplication.CreateBuilder(args);
+
+    builder.Services.Configure<TelemetryConfiguration>(telemetryConfiguration =>
+    {
+        var builder = telemetryConfiguration.DefaultTelemetrySink.TelemetryProcessorChainBuilder;
+    
+        // Using fixed rate sampling
+        double fixedSamplingPercentage = 10;
+        builder.UseSampling(fixedSamplingPercentage);
+    });
+    
+    builder.Services.AddApplicationInsightsTelemetry(new ApplicationInsightsServiceOptions
+    {
+        EnableAdaptiveSampling = false,
+    });
+
+    var app = builder.Build(); 
+    ```
 
-2. **Enable the fixed-rate sampling module.** Changes can be made in the `Configure` method as shown in the below snippet:
+    ### [ASP.NET Core 5 and earlier](#tab/net-core-old)
+    
+    Changes can be made in the `Configure()` method:
 
     ```csharp
     public void Configure(IApplicationBuilder app, IHostingEnvironment env)
@@ -319,11 +412,11 @@ In Metrics Explorer, rates such as request and exception counts are multiplied b
         builder.UseSampling(fixedSamplingPercentage);
 
         builder.Build();
-
-        // ...
     }
     ```
 
+    ---
+
 ### Configuring sampling overrides and fixed-rate sampling for Java applications
 
 By default no sampling is enabled in the Java auto-instrumentation and SDK. Currently the Java auto-instrumentation, [sampling overrides](./java-standalone-sampling-overrides.md) and fixed rate sampling are supported. Adaptive sampling isn't supported in Java.

articles/azure-monitor/logs/manage-access.md

@@ -282,7 +282,7 @@ To create a [custom role](../../role-based-access-control/custom-roles.md) that
 
 1. Create a custom role that grants users permission to execute queries in the Log Analytics workspace, based on the built-in Azure Monitor Logs **Reader** role:
 
-    1. Navigate to your workspace and select **Access control (AIM)** > **Roles**.
+    1. Navigate to your workspace and select **Access control (IAM)** > **Roles**.
 
     1. Right-click the **Reader** role and select **Clone**.
 

articles/azure-monitor/profiler/profiler-containers.md

@@ -47,7 +47,7 @@ In this article, you'll learn the various ways you can:
 
    We've added delay in the `Controllers/WeatherForecastController.cs` project to simulate the bottleneck.
 
-   ```CSharp
+   ```csharp
    [HttpGet(Name = "GetWeatherForecast")]
    public IEnumerable<WeatherForecast> Get()
    {
@@ -68,16 +68,36 @@ In this article, you'll learn the various ways you can:
    dotnet add package Microsoft.ApplicationInsights.Profiler.AspNetCore
    ```
 
-1. Enable Application Insights and Profiler in `Startup.cs`:
+1. Enable Application Insights and Profiler:
+   
+   ### [ASP.NET Core 6 and later](#tab/net-core-new)
+   
+   Add `builder.Services.AddApplicationInsightsTelemetry()` and `builder.Services.AddServiceProfiler()` after the `WebApplication.CreateBuilder()` method in `Program.cs`:
+   
+   ```csharp
+   var builder = WebApplication.CreateBuilder(args);
 
-    ```csharp
-    public void ConfigureServices(IServiceCollection services)
-    {
-        services.AddApplicationInsightsTelemetry(); // Add this line of code to enable Application Insights.
-        services.AddServiceProfiler(); // Add this line of code to Enable Profiler
-        services.AddControllersWithViews();
-    }
-    ```
+   builder.Services.AddApplicationInsightsTelemetry(); // Add this line of code to enable Application Insights.
+   builder.Services.AddServiceProfiler(); // Add this line of code to enable Profiler
+   builder.Services.AddControllersWithViews();
+
+   var app = builder.Build();
+   ```   
+   
+   ### [ASP.NET Core 5 and earlier](#tab/net-core-old)
+   
+   Add `services.AddApplicationInsightsTelemetry()` and `services.AddServiceProfiler()` to the `ConfigureServices()` method in `Startup.cs`:
+
+   ```csharp
+   public void ConfigureServices(IServiceCollection services)
+   {
+     services.AddApplicationInsightsTelemetry(); // Add this line of code to enable Application Insights.
+     services.AddServiceProfiler(); // Add this line of code to enable Profiler
+     services.AddControllersWithViews();
+   }
+   ```
+   
+   ---
 
 ## Pull the latest ASP.NET Core build/runtime images