docker-compose: update containers

This updates the `local-dev` stack. Most of these updates were needed to
test the OpenTelemetry support.

Signed-off-by: Hank Donnay <[email protected]>

docker-compose.yaml

@@ -3,18 +3,18 @@ version: "3.7"
 # This is just to hold a bunch of yaml anchors and try to consolidate parts of
 # the config.
 x-anchors:
- go: &go-image quay.io/projectquay/golang:1.20
- grafana: &grafana-image docker.io/grafana/grafana:8.0.3
- jaeger: &jaeger-image docker.io/jaegertracing/all-in-one:1.26
+ go: &go-image quay.io/projectquay/golang:1.21
+ grafana: &grafana-image docker.io/grafana/grafana:10.3.1
+ jaeger: &jaeger-image docker.io/jaegertracing/all-in-one:1
  pgadmin: &pgadmin-image docker.io/dpage/pgadmin4:5.7
- postgres: &postgres-image docker.io/library/postgres:12
- prom: &prom-image docker.io/prom/prometheus:v2.30.2
- pyroscope: &pyroscope-image docker.io/pyroscope/pyroscope:0.37.2
+ postgres: &postgres-image docker.io/library/postgres:15
+ prom: &prom-image docker.io/prom/prometheus:latest
+ pyroscope: &pyroscope-image docker.io/grafana/pyroscope:latest
  quay: &quay-image quay.io/projectquay/quay:latest
- rabbitmq: &rabbitmq-image docker.io/library/rabbitmq:3.11
- redis: &redis-image docker.io/library/redis:6.2
+ rabbitmq: &rabbitmq-image docker.io/library/rabbitmq:3
+ redis: &redis-image docker.io/library/redis:6
  skopeo: &skopeo-image quay.io/skopeo/stable:latest
- traefik: &traefik-image docker.io/library/traefik:v2.2
+ traefik: &traefik-image docker.io/library/traefik:v3.0
  clair-service: &clair-service
  image: *go-image
  depends_on:
@@ -98,6 +98,7 @@ services:
  image: *jaeger-image
  environment:
  QUERY_BASE_PATH: '/jaeger'
+ COLLECTOR_OTLP_ENABLED: 'true'
  prometheus:
  container_name: clair-prometheus
  profiles:

local-dev/clair/config.yaml

@@ -48,8 +48,12 @@ notifier:
  # callback: "http://clair-notifier/notifier/api/v1/notification"
 # tracing and metrics config
 trace:
- name: "jaeger"
+ name: "otlp"
 # probability: 1
+ otlp:
+ http:
+ endpoint: "clair-jaeger:6831"
+ insecure: true
  jaeger:
  agent:
  endpoint: "clair-jaeger:6831"

local-dev/grafana/provisioning/datasources/datasource.yml

@@ -32,3 +32,9 @@ datasources:
  jsonData:
  path: http://clair-pyroscope:4040/
  editable: false
+- name: Jaeger
+ type: jaeger
+ access: proxy
+ orgId: 1
+ url: http://clair-jaeger:16686/jaeger/
+ editable: false

local-dev/traefik/config/clair.yaml

@@ -1,8 +1,5 @@
 ---
 http:
- entrypoint:
- clair:
- address: ':6060'
  routers:
  indexer:
  entryPoints: [clair]

local-dev/traefik/traefik.yaml

@@ -19,4 +19,8 @@ providers:
 metrics:
  prometheus:
  addServicesLabels: true
+tracing:
+ openTelemetry:
+ address: clair-jaeger:4318
+ insecure: true
 accessLog: {}