Correct OTel Collector config.

Also move up all versions of relevant components to latest.

Signed-off-by: Heds Simons <hedley.simons@grafana.com>

Author: hedss

docker-compose-cloud.yml

@@ -7,7 +7,7 @@ services:
   # auto-logs from those traces.
   # Includes Metrics, Logs, Traces and Profiles.
   alloy:
-    image: grafana/alloy:v1.8.1
+    image: grafana/alloy:v1.9.1
     ports:
       - "12347:12345"
       - "12348:12348"

docker-compose-otel.yml

@@ -19,7 +19,7 @@ services:
 
   # The Grafana dashboarding server.
   grafana:
-    image: grafana/grafana:11.6.0
+    image: grafana/grafana:12.0.2
     volumes:
       - "./grafana/definitions:/var/lib/grafana/dashboards"
       - "./grafana/provisioning:/etc/grafana/provisioning"
@@ -135,7 +135,7 @@ services:
   # The Tempo service stores traces send to it by Grafana opentelemetry-collector, and takes
   # queries from Grafana to visualise those traces.
   tempo:
-    image: grafana/tempo:2.7.2
+    image: grafana/tempo:2.8.1
     ports:
       - "3200:3200"
       - "55680:55680"
@@ -148,7 +148,7 @@ services:
   # The Loki service stores logs sent to it, and takes queries from Grafana
   # to visualise those logs.
   loki:
-    image: grafana/loki:3.4.3
+    image: grafana/loki:3.5.1
     command: ["--pattern-ingester.enabled=true", "-config.file=/etc/loki/loki.yaml"]
     ports:
       - "3100:3100"
@@ -164,7 +164,7 @@ services:
       - "./mimir/mimir.yaml:/etc/mimir.yaml"
 
   pyroscope:
-    image: grafana/pyroscope:1.13.1
+    image: grafana/pyroscope:1.13.5
     ports:
       - "4040:4040"
     command: ["server"]

docker-compose.yml

@@ -7,7 +7,7 @@ services:
   # auto-logs from those traces.
   # Includes Metrics, Logs, Traces and Profiles.
   alloy:
-    image: grafana/alloy:v1.8.1
+    image: grafana/alloy:v1.9.1
     ports:
       - "12347:12345"
       - "12348:12348"
@@ -27,7 +27,7 @@ services:
 
   # The Grafana dashboarding server.
   grafana:
-    image: grafana/grafana:11.6.0
+    image: grafana/grafana:12.0.2
     volumes:
       - "./grafana/definitions:/var/lib/grafana/dashboards"
       - "./grafana/provisioning:/etc/grafana/provisioning"
@@ -146,7 +146,7 @@ services:
   # The Tempo service stores traces send to it by Grafana Alloy, and takes
   # queries from Grafana to visualise those traces.
   tempo:
-    image: grafana/tempo:2.7.2
+    image: grafana/tempo:2.8.1
     ports:
       - "3200:3200"
       - "9411:9411"
@@ -160,7 +160,7 @@ services:
   # The Loki service stores logs sent to it, and takes queries from Grafana
   # to visualise those logs.
   loki:
-    image: grafana/loki:3.4.3
+    image: grafana/loki:3.5.1
     command: ["--pattern-ingester.enabled=true", "-config.file=/etc/loki/loki.yaml"]
     ports:
       - "3100:3100"
@@ -188,7 +188,7 @@ services:
     command: ["run", "-o", "experimental-prometheus-rw", "/scripts/mythical-loadtest.js"]
 
   pyroscope:
-    image: grafana/pyroscope:1.13.1
+    image: grafana/pyroscope:1.13.5
     ports:
       - "4040:4040"
     command: ["server"]

otel/otel.yml

@@ -201,19 +201,20 @@ service:
       # Comment out other `processor` definitions and uncomment the line below to use tail sampling.
       #processors: [tail_sampling, batch]
       # Export to the `otlp/grafana` exporter.
-      #exporters: [otlp/grafana]
+      exporters: [otlp/grafana]
       # Comment out other `exporters` definitions and uncomment the line below to generate span metrics
       # from within the OpenTelemetry Collector as well as exporting traces to Tempo.
-      exporters: [otlp/grafana, spanmetrics, servicegraph]
+      #exporters: [otlp/grafana, spanmetrics, servicegraph]
 
     # Define the metrics pipeline.
     metrics:
       # Receive metrics from the `prometheus` receiver.
-      #receivers: [otlp, prometheus]
+      receivers: [otlp, prometheus]
       # Comment out other `receivers` definitions and uncomment the line below to import spanmetrics as well
       # as prometheus metrics.
-      receivers: [otlp, prometheus, spanmetrics, servicegraph]
-      # Use the `batch` processor to process received metrics.
+      #receivers: [otlp, prometheus, spanmetrics, servicegraph]
+      # Use the `batch` processor to process received metrics, use the transform metric to ensure that spanmetric
+      # metrics are in the correct format for Grafana Cloud (doesn't take effect unless receivers above are used.)
       processors: [transform, batch]
       # Export to the `prometheusremtotewrite` exporter.
       exporters: [prometheusremotewrite]