Merge remote-tracking branch 'upstream/main'

.env

@@ -6,17 +6,17 @@ IMAGE_NAME=ghcr.io/open-telemetry/demo
 DEMO_VERSION=latest
 
 # Dependent images
-COLLECTOR_CONTRIB_IMAGE=otel/opentelemetry-collector-contrib:0.104.0
-FLAGD_IMAGE=ghcr.io/open-feature/flagd:v0.10.2
-GRAFANA_IMAGE=grafana/grafana:10.4.3
-JAEGERTRACING_IMAGE=jaegertracing/all-in-one:1.57
+COLLECTOR_CONTRIB_IMAGE=otel/opentelemetry-collector-contrib:0.105.0
+FLAGD_IMAGE=ghcr.io/open-feature/flagd:v0.11.1
+GRAFANA_IMAGE=grafana/grafana:11.1.1
+JAEGERTRACING_IMAGE=jaegertracing/all-in-one:1.59
 # must also update version field in ./src/grafana/provisioning/datasources/opensearch.yaml
-OPENSEARCH_IMAGE=opensearchproject/opensearch:2.14.0
+OPENSEARCH_IMAGE=opensearchproject/opensearch:2.15.0
 POSTGRES_IMAGE=postgres:16.3
-PROMETHEUS_IMAGE=quay.io/prometheus/prometheus:v2.52.0
+PROMETHEUS_IMAGE=quay.io/prometheus/prometheus:v2.53.1
 VALKEY_IMAGE=valkey/valkey:7.2-alpine
 # must also update the version arg in ./test/tracetesting/Dockerfile
-TRACETEST_IMAGE=kubeshop/tracetest:v1.3.0
+TRACETEST_IMAGE=kubeshop/tracetest:v1.4.2
 
 # Demo Platform
 ENV_PLATFORM=local

src/grafana/provisioning/datasources/opensearch.yaml

@@ -17,4 +17,4 @@ datasources:
       logMessageField: body
       pplEnabled: true
       timeField: observedTimestamp
-      version: 2.14.0
+      version: 2.15.0

test/tracetesting/Dockerfile

@@ -7,7 +7,7 @@ FROM alpine
 WORKDIR /app
 
 # The build-images workflow action does not set a build-arg so we need to specify a default value here
-ARG TRACETEST_IMAGE_VERSION=v1.3.0
+ARG TRACETEST_IMAGE_VERSION=v1.4.2
 
 RUN apk --update add bash jq curl
 RUN curl -L https://raw.githubusercontent.com/kubeshop/tracetest/main/install-cli.sh | bash -s -- $TRACETEST_IMAGE_VERSION