Skip to content
This repository was archived by the owner on Sep 2, 2025. It is now read-only.

Commit b1cc952

Browse files
aurbiztondo-splunkaurbiztondo-splunk
authored
Merge pull request #1681 from splunk/repo-sync
Pulling refs/heads/main into main
2 parents 6b8e11a + ad9785d commit b1cc952

File tree

5 files changed

+15
-31
lines changed

5 files changed

+15
-31
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ To learn more about enabling enhanced team security, see :ref:`admin-team-contro
115115
- No
116116

117117
* - :strong:`Edit notification policy`
118-
- Yes
118+
- Yes, if on a team
119119
- Yes
120120
- Yes
121121
- No

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

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Isolated worker process function
5858
- :new-page:`OpenTelemetry.Instrumentation.Http <https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Http>`
5959
- :new-page:`OpenTelemetry.Instrumentation.Process <https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Process>`
6060
- :new-page:`OpenTelemetry.Instrumentation.Runtime <https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Runtime>`
61-
- :new-page:`OpenTelemetry.ResourceDetectors.Azure <https://www.nuget.org/packages/OpenTelemetry.ResourceDetectors.Azure>`
61+
- :new-page:`OpenTelemetry.Resources.Azure <https://www.nuget.org/packages/OpenTelemetry.Resources.Azure>`
6262

6363
.. _azure-webapps-step-3:
6464

@@ -71,7 +71,6 @@ After adding the dependencies, create an OpenTelemetry helper for your applicati
7171
7272
using OpenTelemetry.Exporter;
7373
using OpenTelemetry.Metrics;
74-
using OpenTelemetry.ResourceDetectors.Azure;
7574
using OpenTelemetry.Resources;
7675
using OpenTelemetry.Trace;
7776
using System.Diagnostics;
@@ -99,11 +98,12 @@ After adding the dependencies, create an OpenTelemetry helper for your applicati
9998
var serviceName = Environment.GetEnvironmentVariable("WEBSITE_SITE_NAME") ?? "Unknown";
10099
var enableTraceResponseHeaderValue = Environment.GetEnvironmentVariable("SPLUNK_TRACE_RESPONSE_HEADER_ENABLED")?.Trim();
101100
102-
// See https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.ResourceDetectors.Azure
103-
// for other types of Azure detectors
104-
var resourceDetector = new AppServiceResourceDetector();
105-
106101
builder.Services.AddOpenTelemetry()
102+
.ConfigureResource(cfg => cfg
103+
.AddService(serviceName: serviceName, serviceVersion: "1.0.0")
104+
// See https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Resources.Azure
105+
// for other types of Azure detectors
106+
.AddAzureAppServiceDetector())
107107
.WithTracing(t => t
108108
// Use Add[instrumentation-name]Instrumentation to instrument missing services
109109
// Use Nuget to find different instrumentation libraries
@@ -131,9 +131,6 @@ After adding the dependencies, create an OpenTelemetry helper for your applicati
131131
// Use AddSource to add your custom DiagnosticSource source names
132132
//.AddSource("My.Source.Name")
133133
.SetSampler(new AlwaysOnSampler())
134-
.ConfigureResource(cfg => cfg
135-
.AddService(serviceName: serviceName, serviceVersion: "1.0.0")
136-
.AddDetector(resourceDetector))
137134
.AddOtlpExporter(opts =>
138135
{
139136
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
147144
.AddHttpClientInstrumentation()
148145
.AddRuntimeInstrumentation()
149146
.AddProcessInstrumentation()
150-
.ConfigureResource(cfg => cfg
151-
.AddService(serviceName: serviceName, serviceVersion: "1.0.0")
152-
.AddDetector(resourceDetector))
153147
.AddOtlpExporter(opts =>
154148
{
155149
opts.Endpoint = new Uri($"https://ingest.{Realm}.signalfx.com/v2/datapoint/otlp");

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

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Isolated worker process function
5555
- :new-page:`OpenTelemetry.Instrumentation.Http <https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Http>`
5656
- :new-page:`OpenTelemetry.Instrumentation.Process <https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Process>`
5757
- :new-page:`OpenTelemetry.Instrumentation.Runtime <https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Runtime>`
58-
- :new-page:`OpenTelemetry.ResourceDetectors.Azure <https://www.nuget.org/packages/OpenTelemetry.ResourceDetectors.Azure>`
58+
- :new-page:`OpenTelemetry.Resources.Azure <https://www.nuget.org/packages/OpenTelemetry.Resources.Azure>`
5959

6060
.. _azure-webjob-step-3:
6161

@@ -72,7 +72,6 @@ After adding the dependencies, create an OpenTelemetry helper for your applicati
7272
using OpenTelemetry.Exporter;
7373
using OpenTelemetry.Logs;
7474
using OpenTelemetry.Metrics;
75-
using OpenTelemetry.ResourceDetectors.Azure;
7675
using OpenTelemetry.Resources;
7776
using OpenTelemetry.Trace;
7877
using System.Diagnostics;
@@ -100,11 +99,12 @@ After adding the dependencies, create an OpenTelemetry helper for your applicati
10099
var serviceName = Environment.GetEnvironmentVariable("WEBSITE_SITE_NAME") ?? "Unknown";
101100
var enableTraceResponseHeaderValue = Environment.GetEnvironmentVariable("SPLUNK_TRACE_RESPONSE_HEADER_ENABLED")?.Trim();
102101
103-
// See https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.ResourceDetectors.Azure
104-
// for other types of Azure detectors
105-
var resourceDetector = new AppServiceResourceDetector();
106-
107102
builder.Services.AddOpenTelemetry()
103+
.ConfigureResource(cfg => cfg
104+
.AddService(serviceName: serviceName, serviceVersion: "1.0.0")
105+
// See https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Resources.Azure
106+
// for other types of Azure detectors
107+
.AddAzureAppServiceDetector())
108108
.WithTracing(t => t
109109
// Use Add[instrumentation-name]Instrumentation to instrument missing services
110110
// Use Nuget to find different instrumentation libraries
@@ -119,9 +119,6 @@ After adding the dependencies, create an OpenTelemetry helper for your applicati
119119
// Automatically creates the root span with function start
120120
.AddSource(SplunkFunctionAttribute.ActivitySourceName)
121121
.SetSampler(new AlwaysOnSampler())
122-
.ConfigureResource(cfg => cfg
123-
.AddService(serviceName: serviceName, serviceVersion: "1.0.0")
124-
.AddDetector(resourceDetector))
125122
.AddConsoleExporter()
126123
.AddOtlpExporter(opts =>
127124
{
@@ -135,9 +132,6 @@ After adding the dependencies, create an OpenTelemetry helper for your applicati
135132
.AddHttpClientInstrumentation()
136133
.AddRuntimeInstrumentation()
137134
.AddProcessInstrumentation()
138-
.ConfigureResource(cfg => cfg
139-
.AddService(serviceName: serviceName, serviceVersion: "1.0.0")
140-
.AddDetector(resourceDetector))
141135
.AddOtlpExporter(opts =>
142136
{
143137
opts.Endpoint = new Uri($"https://ingest.{Realm}.signalfx.com/v2/datapoint/otlp");

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@ Populate values.yaml with the following fields and values:
7979
accessToken: <splunk_access_token>
8080
8181
# Activates the OpenTelemetry Kubernetes Operator
82-
operatorcrds:
83-
install: true
8482
operator:
8583
enabled: true
8684
@@ -120,8 +118,6 @@ The following example YAML includes ``certmanager.enabled=true`` and ``operatorc
120118
121119
certmanager:
122120
enabled: true
123-
operatorcrds:
124-
install: true
125121
operator:
126122
enabled: true
127123
operatorcrds:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@ The following table shows the configuration options for the receiver:
102102
Metrics
103103
=====================
104104

105-
The following metrics, resource attributes, and attributes are available.
105+
.. 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.
106106

107-
.. 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.
107+
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.
108108

109109
.. raw:: html
110110

0 commit comments

Comments
 (0)