added redis agent to docker config and removed jaeger

splunk/docker-compose.yml

@@ -573,8 +573,6 @@ services:
       - "9464"
       - "8888"
       - "13133"
-      - "14250"
-      - "14268"
       - "6060"
       - "9080"
       - "9411"

splunk/otelcol-config-filelog.yml

@@ -80,16 +80,6 @@ receivers:
       processes:
       # System processes metrics, disabled by default
       # process:
-  jaeger:
-    protocols:
-      grpc:
-        endpoint: 0.0.0.0:14250
-      thrift_binary:
-        endpoint: 0.0.0.0:6832
-      thrift_compact:
-        endpoint: 0.0.0.0:6831
-      thrift_http:
-        endpoint: 0.0.0.0:14268
   otlp:
     protocols:
       grpc:
@@ -122,6 +112,10 @@ receivers:
   # https://github.com/signalfx/signalfx-istio-adapter
   zipkin:
     endpoint: 0.0.0.0:9411
+  smartagent/redis:
+    type: collectd/redis
+    endpoint: "redis-cart:6379"
+
 processors:
   batch:
   # Optional: If you have a different environment tag name
@@ -176,7 +170,7 @@ service:
 
   pipelines:
     traces:
-      receivers: [jaeger, otlp, sapm, zipkin]
+      receivers: [otlp, sapm, zipkin]
       processors: [batch, resourcedetection]
       exporters: [ sapm, signalfx ]
     metrics:
@@ -187,3 +181,11 @@ service:
       receivers: [otlp, signalfx, filelog]
       processors: [batch, resourcedetection]
       exporters: [splunk_hec]
+    metrics/additional-receivers:
+      exporters:
+        - signalfx
+      processors:
+        - batch
+        - resourcedetection
+      receivers:
+        - smartagent/redis

splunk/otelcol-config-fluentd.yml

@@ -33,16 +33,6 @@ receivers:
       processes:
       # System processes metrics, disabled by default
       # process:
-  jaeger:
-    protocols:
-      grpc:
-        endpoint: 0.0.0.0:14250
-      thrift_binary:
-        endpoint: 0.0.0.0:6832
-      thrift_compact:
-        endpoint: 0.0.0.0:6831
-      thrift_http:
-        endpoint: 0.0.0.0:14268
   otlp:
     protocols:
       grpc:
@@ -75,6 +65,10 @@ receivers:
   # https://github.com/signalfx/signalfx-istio-adapter
   zipkin:
     endpoint: 0.0.0.0:9411
+  smartagent/redis:
+    type: collectd/redis
+    endpoint: "redis-cart:6379"
+
 processors:
   batch:
   # Optional: If you have a different environment tag name
@@ -129,7 +123,7 @@ service:
 
   pipelines:
     traces:
-      receivers: [jaeger, otlp, sapm, zipkin]
+      receivers: [otlp, sapm, zipkin]
       processors: [batch, resourcedetection]
       exporters: [ sapm, signalfx ]
     metrics:
@@ -140,3 +134,11 @@ service:
       receivers: [otlp, signalfx, fluentforward]
       processors: [batch, resourcedetection]
       exporters: [splunk_hec]
+    metrics/additional-receivers:
+      exporters:
+        - signalfx
+      processors:
+        - batch
+        - resourcedetection
+      receivers:
+        - smartagent/redis

splunk/otelcol-config.yml

@@ -33,16 +33,6 @@ receivers:
       processes:
       # System processes metrics, disabled by default
       # process:
-  jaeger:
-    protocols:
-      grpc:
-        endpoint: 0.0.0.0:14250
-      thrift_binary:
-        endpoint: 0.0.0.0:6832
-      thrift_compact:
-        endpoint: 0.0.0.0:6831
-      thrift_http:
-        endpoint: 0.0.0.0:14268
   otlp:
     protocols:
       grpc:
@@ -75,6 +65,10 @@ receivers:
   # https://github.com/signalfx/signalfx-istio-adapter
   zipkin:
     endpoint: 0.0.0.0:9411
+  smartagent/redis:
+    type: collectd/redis
+    endpoint: "redis-cart:6379"
+
 processors:
   batch:
   # Optional: If you have a different environment tag name
@@ -129,7 +123,7 @@ service:
 
   pipelines:
     traces:
-      receivers: [jaeger, otlp, sapm, zipkin]
+      receivers: [otlp, sapm, zipkin]
       processors: [batch, resourcedetection]
       exporters: [ sapm, signalfx ]
     metrics:
@@ -140,3 +134,11 @@ service:
       receivers: [otlp, signalfx, fluentforward]
       processors: [batch, resourcedetection]
       exporters: [splunk_hec]
+    metrics/additional-receivers:
+      exporters:
+        - signalfx
+      processors:
+        - batch
+        - resourcedetection
+      receivers:
+        - smartagent/redis

splunk/update-demos.sh

@@ -23,9 +23,11 @@ function update_root_readme {
 
     # add a section to the root README file with a pointer to Splunk customizations
     SEARCH_VAL="## Quick start"
-    REPLACE_VAL='## Splunk customizations \
+    REPLACE_VAL='## Splunk customizations\
 \
-A number of customizations have been made to use the demo application with Splunk Observability Cloud, which can be found in the \[\/splunk\](\.\/splunk) folder.  See \[this document\](\.\/splunk\/README.md) for details. \
+A number of customizations have been made to use the demo application with\
+Splunk Observability Cloud, which can be found in the \[\/splunk\](\.\/splunk)\
+folder.  See \[this document\](\.\/splunk\/README.md) for details.\
 \
 ## Quick start'
 
@@ -80,8 +82,6 @@ function update_otel_demo_docker {
     yq eval -i '.services.otelcol.ports += [ "9464" ]' "$SPLUNK_DOCKER_COMPOSE_PATH"
     yq eval -i '.services.otelcol.ports += [ "8888" ]' "$SPLUNK_DOCKER_COMPOSE_PATH"
     yq eval -i '.services.otelcol.ports += [ "13133" ]' "$SPLUNK_DOCKER_COMPOSE_PATH"
-    yq eval -i '.services.otelcol.ports += [ "14250" ]' "$SPLUNK_DOCKER_COMPOSE_PATH"
-    yq eval -i '.services.otelcol.ports += [ "14268" ]' "$SPLUNK_DOCKER_COMPOSE_PATH"
     yq eval -i '.services.otelcol.ports += [ "6060" ]' "$SPLUNK_DOCKER_COMPOSE_PATH"
     yq eval -i '.services.otelcol.ports += [ "9080" ]' "$SPLUNK_DOCKER_COMPOSE_PATH"
     yq eval -i '.services.otelcol.ports += [ "9411" ]' "$SPLUNK_DOCKER_COMPOSE_PATH"