Pulling refs/heads/main into main

admin/user-management/teams/enhanced-team-security.rst

@@ -115,7 +115,7 @@ To learn more about enabling enhanced team security, see :ref:`admin-team-contro
     - No
 
   * - :strong:`Edit notification policy`
-    - Yes
+    - Yes, if on a team
     - Yes
     - Yes
     - No

gdi/get-data-in/application/otel-dotnet/instrumentation/azure-webapps.rst

@@ -58,7 +58,7 @@ Isolated worker process function
    - :new-page:`OpenTelemetry.Instrumentation.Http <https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Http>`
    - :new-page:`OpenTelemetry.Instrumentation.Process <https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Process>`
    - :new-page:`OpenTelemetry.Instrumentation.Runtime <https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Runtime>`
-   - :new-page:`OpenTelemetry.ResourceDetectors.Azure <https://www.nuget.org/packages/OpenTelemetry.ResourceDetectors.Azure>`
+   - :new-page:`OpenTelemetry.Resources.Azure <https://www.nuget.org/packages/OpenTelemetry.Resources.Azure>`
 
 .. _azure-webapps-step-3:
 
@@ -71,7 +71,6 @@ After adding the dependencies, create an OpenTelemetry helper for your applicati
 
     using OpenTelemetry.Exporter;
     using OpenTelemetry.Metrics;
-    using OpenTelemetry.ResourceDetectors.Azure;
     using OpenTelemetry.Resources;
     using OpenTelemetry.Trace;
     using System.Diagnostics;
@@ -99,11 +98,12 @@ After adding the dependencies, create an OpenTelemetry helper for your applicati
             var serviceName = Environment.GetEnvironmentVariable("WEBSITE_SITE_NAME") ?? "Unknown";
             var enableTraceResponseHeaderValue = Environment.GetEnvironmentVariable("SPLUNK_TRACE_RESPONSE_HEADER_ENABLED")?.Trim();
 
-            // See https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.ResourceDetectors.Azure
-            // for other types of Azure detectors
-            var resourceDetector = new AppServiceResourceDetector();
-
             builder.Services.AddOpenTelemetry()
+                .ConfigureResource(cfg => cfg
+                    .AddService(serviceName: serviceName, serviceVersion: "1.0.0")
+                    // See https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Resources.Azure
+                    // for other types of Azure detectors
+                    .AddAzureAppServiceDetector())
                 .WithTracing(t => t
                     // Use Add[instrumentation-name]Instrumentation to instrument missing services
                     // Use Nuget to find different instrumentation libraries
@@ -131,9 +131,6 @@ After adding the dependencies, create an OpenTelemetry helper for your applicati
                     // Use AddSource to add your custom DiagnosticSource source names
                     //.AddSource("My.Source.Name")
                     .SetSampler(new AlwaysOnSampler())
-                    .ConfigureResource(cfg => cfg
-                        .AddService(serviceName: serviceName, serviceVersion: "1.0.0")
-                        .AddDetector(resourceDetector))
                     .AddOtlpExporter(opts =>
                     {
                         opts.Endpoint = new Uri($"https://ingest.{Realm}.signalfx.com/v2/trace/otlp");
@@ -147,9 +144,6 @@ After adding the dependencies, create an OpenTelemetry helper for your applicati
                     .AddHttpClientInstrumentation()
                     .AddRuntimeInstrumentation()
                     .AddProcessInstrumentation()
-                    .ConfigureResource(cfg => cfg
-                        .AddService(serviceName: serviceName, serviceVersion: "1.0.0")
-                        .AddDetector(resourceDetector))
                     .AddOtlpExporter(opts =>
                     {
                         opts.Endpoint = new Uri($"https://ingest.{Realm}.signalfx.com/v2/datapoint/otlp");

gdi/get-data-in/application/otel-dotnet/instrumentation/azure-webjobs.rst

@@ -55,7 +55,7 @@ Isolated worker process function
    - :new-page:`OpenTelemetry.Instrumentation.Http <https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Http>`
    - :new-page:`OpenTelemetry.Instrumentation.Process <https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Process>`
    - :new-page:`OpenTelemetry.Instrumentation.Runtime <https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Runtime>`
-   - :new-page:`OpenTelemetry.ResourceDetectors.Azure <https://www.nuget.org/packages/OpenTelemetry.ResourceDetectors.Azure>`
+   - :new-page:`OpenTelemetry.Resources.Azure <https://www.nuget.org/packages/OpenTelemetry.Resources.Azure>`
 
 .. _azure-webjob-step-3:
 
@@ -72,7 +72,6 @@ After adding the dependencies, create an OpenTelemetry helper for your applicati
     using OpenTelemetry.Exporter;
     using OpenTelemetry.Logs;
     using OpenTelemetry.Metrics;
-    using OpenTelemetry.ResourceDetectors.Azure;
     using OpenTelemetry.Resources;
     using OpenTelemetry.Trace;
     using System.Diagnostics;
@@ -100,11 +99,12 @@ After adding the dependencies, create an OpenTelemetry helper for your applicati
             var serviceName = Environment.GetEnvironmentVariable("WEBSITE_SITE_NAME") ?? "Unknown";
             var enableTraceResponseHeaderValue = Environment.GetEnvironmentVariable("SPLUNK_TRACE_RESPONSE_HEADER_ENABLED")?.Trim();
 
-            // See https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.ResourceDetectors.Azure
-            // for other types of Azure detectors
-            var resourceDetector = new AppServiceResourceDetector();
-
             builder.Services.AddOpenTelemetry()
+                .ConfigureResource(cfg => cfg
+                    .AddService(serviceName: serviceName, serviceVersion: "1.0.0")
+                    // See https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Resources.Azure
+                    // for other types of Azure detectors
+                    .AddAzureAppServiceDetector())
                 .WithTracing(t => t
                     // Use Add[instrumentation-name]Instrumentation to instrument missing services
                     // Use Nuget to find different instrumentation libraries
@@ -119,9 +119,6 @@ After adding the dependencies, create an OpenTelemetry helper for your applicati
                     // Automatically creates the root span with function start
                     .AddSource(SplunkFunctionAttribute.ActivitySourceName)
                     .SetSampler(new AlwaysOnSampler())
-                    .ConfigureResource(cfg => cfg
-                        .AddService(serviceName: serviceName, serviceVersion: "1.0.0")
-                        .AddDetector(resourceDetector))
                     .AddConsoleExporter()
                     .AddOtlpExporter(opts =>
                     {
@@ -135,9 +132,6 @@ After adding the dependencies, create an OpenTelemetry helper for your applicati
                     .AddHttpClientInstrumentation()
                     .AddRuntimeInstrumentation()
                     .AddProcessInstrumentation()
-                    .ConfigureResource(cfg => cfg
-                        .AddService(serviceName: serviceName, serviceVersion: "1.0.0")
-                        .AddDetector(resourceDetector))
                     .AddOtlpExporter(opts =>
                     {
                         opts.Endpoint = new Uri($"https://ingest.{Realm}.signalfx.com/v2/datapoint/otlp");

gdi/opentelemetry/automatic-discovery/k8s/k8s-backend.rst

@@ -79,8 +79,6 @@ Populate values.yaml with the following fields and values:
     accessToken: <splunk_access_token>
 
   # Activates the OpenTelemetry Kubernetes Operator
-  operatorcrds:
-    install: true
   operator:
     enabled: true
 
@@ -120,8 +118,6 @@ The following example YAML includes ``certmanager.enabled=true`` and ``operatorc
 
   certmanager:
     enabled: true
-  operatorcrds:
-    install: true
   operator:
     enabled: true
   operatorcrds:

gdi/opentelemetry/components/kubernetes-cluster-receiver.rst

@@ -102,9 +102,9 @@ The following table shows the configuration options for the receiver:
 Metrics
 =====================
 
-The following metrics, resource attributes, and attributes are available.
+.. caution:: The SignalFx exporter excludes some available metrics by default. Learn more about default metric filters in :ref:`list-excluded-metrics`. See :ref:`ootb-metrics-k8s` to see how the Collector processes Kubernetes metrics.
 
-.. note:: The SignalFx exporter excludes some available metrics by default. Learn more about default metric filters in :ref:`list-excluded-metrics`. See :ref:`ootb-metrics-k8s` to see how the Collector processes Kubernetes metrics.
+The following metrics, resource attributes, and attributes are available. For more information, including which resource attributes are included by default, refer to :new-page:`Kubernetes Cluster receiver metadata <https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/03e370a1bfbe8fbd24b0cc35c0756c8ba688e46c/receiver/k8sclusterreceiver/metadata.yaml>` in GitHub.
 
 .. raw:: html