Skip to content

Commit daacf0c

Browse files
committed
Replaced jaeger with tempo and OTLP
1 parent d761e31 commit daacf0c

File tree

6 files changed

+56
-31
lines changed

6 files changed

+56
-31
lines changed

.env.sample.holesky

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,10 @@ LIGHTHOUSE_CHECKPOINT_SYNC_URL=https://checkpoint-sync.holesky.ethpandaops.io/
127127
# See available tags https://hub.docker.com/r/bitnami/node-exporter/tags.
128128
#NODE_EXPORTER_VERSION=
129129

130-
# Jaeger docker container image version, e.g. `latest` or `1.46.0`.
131-
# See available tags https://hub.docker.com/r/jaegertracing/all-in-one/tags.
132-
#JAEGER_VERSION=
133-
134-
# Jaeger host exposed port for HTTP query.
135-
#MONITORING_PORT_JAEGER=
130+
# Grafana Tempo docker container image version, e.g. `latest` or `2.7.1`.
131+
# Use Grafana Explore to access Tempo data.
132+
# See available tags https://hub.docker.com/r/grafana/tempo/tags.
133+
#TEMPO_VERSION=
136134

137135
# Grafana Loki docker container image version, e.g. `latest` or `2.8.2`.
138136
# See available tags https://hub.docker.com/r/grafana/loki/tags.

.env.sample.hoodi

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,10 @@ LIGHTHOUSE_CHECKPOINT_SYNC_URL=https://checkpoint-sync.hoodi.ethpandaops.io/
127127
# See available tags https://hub.docker.com/r/bitnami/node-exporter/tags.
128128
#NODE_EXPORTER_VERSION=
129129

130-
# Jaeger docker container image version, e.g. `latest` or `1.46.0`.
131-
# See available tags https://hub.docker.com/r/jaegertracing/all-in-one/tags.
132-
#JAEGER_VERSION=
133-
134-
# Jaeger host exposed port for HTTP query.
135-
#MONITORING_PORT_JAEGER=
130+
# Grafana Tempo docker container image version, e.g. `latest` or `2.7.1`.
131+
# Use Grafana Explore to access Tempo data.
132+
# See available tags https://hub.docker.com/r/grafana/tempo/tags.
133+
#TEMPO_VERSION=
136134

137135
# Grafana Loki docker container image version, e.g. `latest` or `2.8.2`.
138136
# See available tags https://hub.docker.com/r/grafana/loki/tags.

.env.sample.mainnet

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,10 @@ MEVBOOST_RELAYS=https://0xa15b52576bcbf1072f4a011c0f99f9fb6c66f3e1ff321f11f461d1
127127
# See available tags https://hub.docker.com/r/bitnami/node-exporter/tags.
128128
#NODE_EXPORTER_VERSION=
129129

130-
# Jaeger docker container image version, e.g. `latest` or `1.46.0`.
131-
# See available tags https://hub.docker.com/r/jaegertracing/all-in-one/tags.
132-
#JAEGER_VERSION=
133-
134-
# Jaeger host exposed port for HTTP query.
135-
#MONITORING_PORT_JAEGER=
130+
# Grafana Tempo docker container image version, e.g. `latest` or `2.7.1`.
131+
# Use Grafana Explore to access Tempo data.
132+
# See available tags https://hub.docker.com/r/grafana/tempo/tags.
133+
#TEMPO_VERSION=
136134

137135
# Grafana Loki docker container image version, e.g. `latest` or `2.8.2`.
138136
# See available tags https://hub.docker.com/r/grafana/loki/tags.

compose-debug.yml

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,14 @@ services:
2323
node-exporter:
2424
image: bitnami/node-exporter:${NODE_EXPORTER_VERSION:-1.6.0}
2525

26-
jaeger:
27-
image: jaegertracing/all-in-one:${JAEGER_VERSION:-1.46.0}
28-
ports:
29-
- ${MONITORING_PORT_JAEGER:-16686}:16686
30-
environment:
31-
- SPAN_STORAGE_TYPE=badger
32-
- BADGER_EPHEMERAL=false
33-
- BADGER_DIRECTORY_VALUE=/badger/data
34-
- BADGER_DIRECTORY_KEY=/badger/key
35-
- BADGER_SPAN_STORE_TTL=72h
26+
tempo:
27+
image: grafana/tempo:${TEMPO_VERSION:-2.7.1}
28+
user: ":"
29+
command: -config.file=/etc/tempo/tempo.yaml
3630
volumes:
37-
- ./data/jaeger:/badger
31+
- ./tempo:/etc/tempo
32+
- ./data/tempo:/opt/tempo
33+
restart: unless-stopped
3834

3935
loki:
4036
image: grafana/loki:${LOKI_VERSION:-2.8.2}
@@ -47,8 +43,8 @@ services:
4743

4844
charon:
4945
environment:
50-
- CHARON_JAEGER_ADDRESS=jaeger:6831 # jaeger UDP agent
51-
- CHARON_JAEGER_SERVICE=charon
46+
- CHARON_OTLP_ADDRESS=tempo:4317
47+
- CHARON_OTLP_SERVICE_NAME=charon
5248
- CHARON_LOKI_ADDRESSES=${CHARON_LOKI_ADDRESSES:-http://loki:3100/loki/api/v1/push}
5349
- CHARON_LOKI_SERVICE=charon
5450

grafana/datasource.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,14 @@ datasources:
3030
basicAuth: false
3131
isDefault: false
3232
version: 1
33+
editable: true
34+
35+
- name: Tempo
36+
type: tempo
37+
uid: tempo
38+
orgId: 1
39+
url: http://tempo:3200
40+
basicAuth: false
41+
isDefault: false
42+
version: 1
3343
editable: true

tempo/tempo.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
server:
2+
http_listen_port: 3200
3+
grpc_listen_port: 9095
4+
5+
distributor:
6+
receivers:
7+
otlp:
8+
protocols:
9+
grpc:
10+
endpoint: 0.0.0.0:4317
11+
12+
ingester:
13+
trace_idle_period: 10s
14+
max_block_bytes: 1_048_576
15+
max_block_duration: 5m
16+
17+
compactor:
18+
compaction:
19+
block_retention: 24h
20+
21+
storage:
22+
trace:
23+
backend: local
24+
local:
25+
path: /opt/tempo/traces

0 commit comments

Comments
 (0)