update other fips configs

Author: asreehari-splunk

cmd/otelcol/config/collector/full_config_linux.yaml

@@ -637,11 +637,7 @@ exporters:
   # WARN: https://ingest.${SPLUNK_REALM}.signalfx.com does NOT support gRPC at this time; use otlphttp exporter instead
   otlp:
     endpoint: otelcol2:4317
-  sapm:
-    access_token: "${SPLUNK_ACCESS_TOKEN}"
-    endpoint: "https://ingest.${SPLUNK_REALM}.signalfx.com/v2/trace"
-    sending_queue:
-      num_consumers: 32
+
   # Enables the otlp http exporter
   # Full configuration here: https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/otlphttpexporter
   # NOTE: These settings should be updated to the proper destination

cmd/otelcol/config/collector/gateway_config.yaml

@@ -91,6 +91,11 @@ processors:
 
 exporters:
   # Traces
+  sapm:
+    access_token: "${SPLUNK_ACCESS_TOKEN}"
+    endpoint: "https://ingest.${SPLUNK_REALM}.signalfx.com/v2/trace"
+    sending_queue:
+      num_consumers: 32
   otlphttp:
     traces_endpoint: "${SPLUNK_INGEST_URL}/v2/trace/otlp"
     headers:

cmd/otelcol/fips/config/ecs_ec2_config.yaml

@@ -111,9 +111,10 @@ processors:
 
 exporters:
   # Traces
-  sapm:
-    access_token: "${SPLUNK_ACCESS_TOKEN}"
-    endpoint: "https://ingest.${SPLUNK_REALM}.signalfx.com/v2/trace"
+  otlphttp:
+    traces_endpoint: "${SPLUNK_INGEST_URL}/v2/trace/otlp"
+    headers:
+      "X-SF-Token": "${SPLUNK_ACCESS_TOKEN}"
   # Metrics + Events
   signalfx:
     access_token: "${SPLUNK_ACCESS_TOKEN}"
@@ -142,7 +143,7 @@ service:
         - batch
         - resourcedetection
         #- resource/add_environment
-      exporters: [sapm, signalfx]
+      exporters: [otlphttp, signalfx]
     metrics:
       receivers: [hostmetrics, otlp, signalfx]
       processors: [memory_limiter, batch, filter, resourcedetection]

cmd/otelcol/fips/config/fargate_config.yaml

@@ -89,9 +89,10 @@ processors:
 
 exporters:
   # Traces
-  sapm:
-    access_token: "${SPLUNK_ACCESS_TOKEN}"
-    endpoint: "https://ingest.${SPLUNK_REALM}.signalfx.com/v2/trace"
+  otlphttp:
+    traces_endpoint: "${SPLUNK_INGEST_URL}/v2/trace/otlp"
+    headers:
+      "X-SF-Token": "${SPLUNK_ACCESS_TOKEN}"
   # Metrics + Events
   signalfx:
     access_token: "${SPLUNK_ACCESS_TOKEN}"
@@ -120,7 +121,7 @@ service:
         - batch
         - resourcedetection
         #- resource/add_environment
-      exporters: [sapm, signalfx]
+      exporters: [otlphttp, signalfx]
     metrics:
       receivers: [otlp, signalfx, prometheus/internal]
       processors: [memory_limiter, batch, resourcedetection]

cmd/otelcol/fips/config/gateway_config.yaml

@@ -53,6 +53,10 @@ receivers:
     # Whether to preserve incoming access token and use instead of exporter token
     # default = false
     #access_token_passthrough: true
+  otlphttp:
+    traces_endpoint: "${SPLUNK_INGEST_URL}/v2/trace/otlp"
+    headers:
+      "X-SF-Token": "${SPLUNK_ACCESS_TOKEN}"
   signalfx:
     endpoint: "${SPLUNK_LISTEN_INTERFACE}:9943"
     # Whether to preserve incoming access token and use instead of exporter token
@@ -94,6 +98,10 @@ exporters:
     endpoint: "https://ingest.${SPLUNK_REALM}.signalfx.com/v2/trace"
     sending_queue:
       num_consumers: 32
+  otlphttp:
+    traces_endpoint: "${SPLUNK_INGEST_URL}/v2/trace/otlp"
+    headers:
+      "X-SF-Token": "${SPLUNK_ACCESS_TOKEN}"
   # Metrics + Events
   signalfx:
     access_token: "${SPLUNK_ACCESS_TOKEN}"
@@ -136,7 +144,7 @@ service:
       - memory_limiter
       - batch
       #- resource/add_environment
-      exporters: [sapm]
+      exporters: [otlphttp]
     metrics:
       receivers: [otlp, signalfx]
       processors: [memory_limiter, batch]

deployments/nomad/otel-agent.nomad

@@ -201,9 +201,6 @@ processors:
     override: true
     timeout: 10s
 exporters:
-  sapm:
-    access_token: ${SPLUNK_ACCESS_TOKEN}
-    endpoint: https://ingest.${SPLUNK_REALM}.signalfx.com/v2/trace
   signalfx:
     access_token: ${SPLUNK_ACCESS_TOKEN}
     api_url: https://api.${SPLUNK_REALM}.signalfx.com
@@ -245,7 +242,7 @@ service:
     traces:
       exporters:
       - debug
-      - sapm
+      - otlphttp
       - signalfx
       processors:
       - memory_limiter

deployments/nomad/otel-gateway.nomad

@@ -225,7 +225,7 @@ service:
       - signalfx
     traces:
       exporters:
-      - sapm
+      - otlphttp
       - debug
       processors:
       - memory_limiter