Skip to content

Commit e451a88

Browse files
authored
Replace Promtail with Alloy (#234)
* Replace Promtail with Alloy * Replace Promtail vars
1 parent 77d3f0a commit e451a88

12 files changed

+84
-127
lines changed

.env.sample.holesky

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -176,10 +176,10 @@ CHARON_EXECUTION_CLIENT_RPC_ENDPOINT=http://${EL}:8545
176176
# Loki log aggregation server addresses. Disable loki log aggregation by setting an empty address.
177177
#CHARON_LOKI_ADDRESSES=
178178

179-
# Charon Cluster Name. Mandatory to send logs with Promtail and metrics with Prometheus.
179+
# Charon Cluster Name. Mandatory to send logs with Alloy and metrics with Prometheus.
180180
#CLUSTER_NAME=""
181181

182-
# Charon Cluster Peer. Mandatory to send logs with Promtail and metrics with Prometheus.
182+
# Charon Cluster Peer. Mandatory to send logs with Alloy and metrics with Prometheus.
183183
#CLUSTER_PEER=""
184184

185185
# Nickname to identify this charon node on monitoring (max 32 characters).
@@ -262,23 +262,23 @@ LIDODVEXIT_EXIT_EPOCH=256
262262
# Specify multiple discord IDs using comma separation. (e.g. `ALERT_DISCORD_IDS=123456789098765432,098765432123456789`)
263263
#ALERT_DISCORD_IDS=""
264264

265-
# Uncomment these if you have log exporting with Promtail
265+
# Uncomment these if you have log exporting with Alloy
266266
# and want to disable log export on a particular container.
267-
#EL_NETHERMIND_PROMTAIL_MONITORED=false
268-
#EL_RETH_PROMTAIL_MONITORED=false
269-
#CL_LIGHTHOUSE_PROMTAIL_MONITORED=false
270-
#CL_GRANDINE_PROMTAIL_MONITORED=false
271-
#CL_TEKU_PROMTAIL_MONITORED=false
272-
#CL_LODESTAR_PROMTAIL_MONITORED=false
273-
#CHARON_PROMTAIL_MONITORED=false
274-
#VC_LODESTAR_PROMTAIL_MONITORED=false
275-
#VC_NIMBUS_PROMTAIL_MONITORED=false
276-
#VC_PRYSM_PROMTAIL_MONITORED=false
277-
#VC_TEKU_PROMTAIL_MONITORED=false
278-
#MEV_MEV_BOOST_PROMTAIL_MONITORED=false
279-
#MEV_COMMIT_BOOST_PROMTAIL_MONITORED=false
280-
#EJECTOR_PROMTAIL_MONITORED=false
281-
#DV_EXIT_PROMTAIL_MONITORED=false
267+
#EL_NETHERMIND_ALLOY_MONITORED=false
268+
#EL_RETH_ALLOY_MONITORED=false
269+
#CL_LIGHTHOUSE_ALLOY_MONITORED=false
270+
#CL_GRANDINE_ALLOY_MONITORED=false
271+
#CL_TEKU_ALLOY_MONITORED=false
272+
#CL_LODESTAR_ALLOY_MONITORED=false
273+
#CHARON_ALLOY_MONITORED=false
274+
#VC_LODESTAR_ALLOY_MONITORED=false
275+
#VC_NIMBUS_ALLOY_MONITORED=false
276+
#VC_PRYSM_ALLOY_MONITORED=false
277+
#VC_TEKU_ALLOY_MONITORED=false
278+
#MEV_MEV_BOOST_ALLOY_MONITORED=false
279+
#MEV_COMMIT_BOOST_ALLOY_MONITORED=false
280+
#EJECTOR_ALLOY_MONITORED=false
281+
#DV_EXIT_ALLOY_MONITORED=false
282282

283283
######### Debug Config #########
284284

.env.sample.hoodi

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -176,11 +176,11 @@ CHARON_EXECUTION_CLIENT_RPC_ENDPOINT=http://${EL}:8545
176176
# Loki log aggregation server addresses. Disable loki log aggregation by setting an empty address.
177177
#CHARON_LOKI_ADDRESSES=
178178

179-
# Charon Cluster Name. Mandatory to send logs with Promtail and metrics with Prometheus.
180-
#CLUSTER_NAME=""
179+
# Charon Cluster Name. Mandatory to send logs with Alloy and metrics with Prometheus.
180+
#CLUSTER_NAME=
181181

182-
# Charon Cluster Peer. Mandatory to send logs with Promtail and metrics with Prometheus.
183-
#CLUSTER_PEER=""
182+
# Charon Cluster Peer. Mandatory to send logs with Alloy and metrics with Prometheus.
183+
#CLUSTER_PEER=
184184

185185
# Nickname to identify this charon node on monitoring (max 32 characters).
186186
#CHARON_NICKNAME=""
@@ -268,23 +268,23 @@ LIDODVEXIT_EXIT_EPOCH=256
268268
# Specify multiple discord IDs using comma separation. (e.g. `ALERT_DISCORD_IDS=123456789098765432,098765432123456789`)
269269
#ALERT_DISCORD_IDS=""
270270

271-
# Uncomment these if you have log exporting with Promtail
271+
# Uncomment these if you have log exporting with Alloy
272272
# and want to disable log export on a particular container.
273-
#EL_NETHERMIND_PROMTAIL_MONITORED=false
274-
#EL_RETH_PROMTAIL_MONITORED=false
275-
#CL_LIGHTHOUSE_PROMTAIL_MONITORED=false
276-
#CL_GRANDINE_PROMTAIL_MONITORED=false
277-
#CL_TEKU_PROMTAIL_MONITORED=false
278-
#CL_LODESTAR_PROMTAIL_MONITORED=false
279-
#CHARON_PROMTAIL_MONITORED=false
280-
#VC_LODESTAR_PROMTAIL_MONITORED=false
281-
#VC_NIMBUS_PROMTAIL_MONITORED=false
282-
#VC_PRYSM_PROMTAIL_MONITORED=false
283-
#VC_TEKU_PROMTAIL_MONITORED=false
284-
#MEV_MEV_BOOST_PROMTAIL_MONITORED=false
285-
#MEV_COMMIT_BOOST_PROMTAIL_MONITORED=false
286-
#EJECTOR_PROMTAIL_MONITORED=false
287-
#DV_EXIT_PROMTAIL_MONITORED=false
273+
#EL_NETHERMIND_ALLOY_MONITORED=false
274+
#EL_RETH_ALLOY_MONITORED=false
275+
#CL_LIGHTHOUSE_ALLOY_MONITORED=false
276+
#CL_GRANDINE_ALLOY_MONITORED=false
277+
#CL_TEKU_ALLOY_MONITORED=false
278+
#CL_LODESTAR_ALLOY_MONITORED=false
279+
#CHARON_ALLOY_MONITORED=false
280+
#VC_LODESTAR_ALLOY_MONITORED=false
281+
#VC_NIMBUS_ALLOY_MONITORED=false
282+
#VC_PRYSM_ALLOY_MONITORED=false
283+
#VC_TEKU_ALLOY_MONITORED=false
284+
#MEV_MEV_BOOST_ALLOY_MONITORED=false
285+
#MEV_COMMIT_BOOST_ALLOY_MONITORED=false
286+
#EJECTOR_ALLOY_MONITORED=false
287+
#DV_EXIT_ALLOY_MONITORED=false
288288

289289
######### Debug Config #########
290290

.env.sample.mainnet

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -176,10 +176,10 @@ CHARON_EXECUTION_CLIENT_RPC_ENDPOINT=http://${EL}:8545
176176
# Loki log aggregation server addresses. Disable loki log aggregation by setting an empty address.
177177
#CHARON_LOKI_ADDRESSES=
178178

179-
# Charon Cluster Name. Mandatory to send logs with Promtail and metrics with Prometheus.
179+
# Charon Cluster Name. Mandatory to send logs with Alloy and metrics with Prometheus.
180180
#CLUSTER_NAME=""
181181

182-
# Charon Cluster Peer. Mandatory to send logs with Promtail and metrics with Prometheus.
182+
# Charon Cluster Peer. Mandatory to send logs with Alloy and metrics with Prometheus.
183183
#CLUSTER_PEER=""
184184

185185
# Nickname to identify this charon node on monitoring (max 32 characters).
@@ -268,23 +268,23 @@ LIDODVEXIT_EXIT_EPOCH=194048
268268
# Specify multiple discord IDs using comma separation. (e.g. `ALERT_DISCORD_IDS=123456789098765432,098765432123456789`)
269269
#ALERT_DISCORD_IDS=""
270270

271-
# Uncomment these if you have log exporting with Promtail
271+
# Uncomment these if you have log exporting with Alloy
272272
# and want to disable log export on a particular container.
273-
#EL_NETHERMIND_PROMTAIL_MONITORED=false
274-
#EL_RETH_PROMTAIL_MONITORED=false
275-
#CL_LIGHTHOUSE_PROMTAIL_MONITORED=false
276-
#CL_GRANDINE_PROMTAIL_MONITORED=false
277-
#CL_TEKU_PROMTAIL_MONITORED=false
278-
#CL_LODESTAR_PROMTAIL_MONITORED=false
279-
#CHARON_PROMTAIL_MONITORED=false
280-
#VC_LODESTAR_PROMTAIL_MONITORED=false
281-
#VC_NIMBUS_PROMTAIL_MONITORED=false
282-
#VC_PRYSM_PROMTAIL_MONITORED=false
283-
#VC_TEKU_PROMTAIL_MONITORED=false
284-
#MEV_MEV_BOOST_PROMTAIL_MONITORED=false
285-
#MEV_COMMIT_BOOST_PROMTAIL_MONITORED=false
286-
#EJECTOR_PROMTAIL_MONITORED=false
287-
#DV_EXIT_PROMTAIL_MONITORED=false
273+
#EL_NETHERMIND_ALLOY_MONITORED=false
274+
#EL_RETH_ALLOY_MONITORED=false
275+
#CL_LIGHTHOUSE_ALLOY_MONITORED=false
276+
#CL_GRANDINE_ALLOY_MONITORED=false
277+
#CL_TEKU_ALLOY_MONITORED=false
278+
#CL_LODESTAR_ALLOY_MONITORED=false
279+
#CHARON_ALLOY_MONITORED=false
280+
#VC_LODESTAR_ALLOY_MONITORED=false
281+
#VC_NIMBUS_ALLOY_MONITORED=false
282+
#VC_PRYSM_ALLOY_MONITORED=false
283+
#VC_TEKU_ALLOY_MONITORED=false
284+
#MEV_MEV_BOOST_ALLOY_MONITORED=false
285+
#MEV_COMMIT_BOOST_ALLOY_MONITORED=false
286+
#EJECTOR_ALLOY_MONITORED=false
287+
#DV_EXIT_ALLOY_MONITORED=false
288288

289289
######### Debug Config #########
290290

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ To configure this repo for a particular network, follow these instructions. If y
5353
2. Grab your operator ID from the lido [mainnet dashboard](https://operators.lido.fi/) or [testnet dashboard](https://operators-holesky.testnet.fi/).
5454
3. Find `VE_OPERATOR_ID` in `.env` and set it to your operator ID.
5555
4. Find `VE_EASY_TRACK_MOTION_CREATOR_ADDRESSES_ALLOWLIST=["0xYourNodeOperatorRewardAddress"]`, uncomment it, and change `0xYourNodeOperatorRewardAddress` to your Lido Operator SAFE manager address for your cluster.
56-
5. To enable log collection with promtail which will stream logs to the Obol Core team to help identify cluster issues find `MONITORING=${MONITORING:-monitoring},monitoring-log-collector` and uncomment it.
56+
5. To enable log collection with alloy which will stream logs to the Obol Core team to help identify cluster issues find `MONITORING=${MONITORING:-monitoring},monitoring-log-collector` and uncomment it.
5757
6. Consult with the others in your cluster, and choose a set of execution layer (EL), consensus layer (CL), validator client (VC) and mev clients (MEV) for your setup that maximises the client diversity of your cluster; by commenting and uncommenting one of each in the opening lines of your `.env` file.
5858
7. Save and close the `.env` file.
5959

alloy/config.alloy.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ discovery.relabel "docker" {
1212
targets = discovery.docker.docker.targets
1313

1414
rule {
15-
source_labels = ["__meta_docker_container_label_promtail_monitored"]
15+
source_labels = ["__meta_docker_container_label_alloy_monitored"]
1616
regex = "true"
1717
action = "keep"
1818
}

compose-cl.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ services:
1515
image: sifrai/grandine:${GRANDINE_VERSION:-2.0.1}
1616
restart: unless-stopped
1717
labels:
18-
- "promtail-monitored=${CL_GRANDINE_PROMTAIL_MONITORED:-true}"
18+
- "alloy-monitored=${CL_GRANDINE_ALLOY_MONITORED:-true}"
1919
command:
2020
- --data-dir=/root/.grandine
2121
- --eth1-rpc-urls=http://${EL}:8551
@@ -48,7 +48,7 @@ services:
4848
image: sigp/lighthouse:${LIGHTHOUSE_VERSION:-v8.0.1}
4949
restart: unless-stopped
5050
labels:
51-
- "promtail-monitored=${CL_LIGHTHOUSE_PROMTAIL_MONITORED:-true}"
51+
- "alloy-monitored=${CL_LIGHTHOUSE_ALLOY_MONITORED:-true}"
5252
command: |
5353
lighthouse bn
5454
--network=${NETWORK}
@@ -85,7 +85,7 @@ services:
8585
image: consensys/teku:${VC_VERSION:-25.12.0}
8686
restart: unless-stopped
8787
labels:
88-
- "promtail-monitored=${CL_TEKU_PROMTAIL_MONITORED:-true}"
88+
- "alloy-monitored=${CL_TEKU_ALLOY_MONITORED:-true}"
8989
command: |
9090
--network=${NETWORK}
9191
--checkpoint-sync-url=${LIGHTHOUSE_CHECKPOINT_SYNC_URL}
@@ -118,7 +118,7 @@ services:
118118
image: chainsafe/lodestar:${VC_VERSION:-v1.38.0}
119119
restart: unless-stopped
120120
labels:
121-
- "promtail-monitored=${CL_LODESTAR_PROMTAIL_MONITORED:-true}"
121+
- "alloy-monitored=${CL_LODESTAR_ALLOY_MONITORED:-true}"
122122
command: |
123123
beacon
124124
--network=${NETWORK}

compose-el.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ services:
1919
- ${EL_IP_HTTP:-127.0.0.1}:${EL_PORT_HTTP:-8545}:8545 # JSON-RPC
2020
- ${EL_IP_ENGINE:-127.0.0.1}:${EL_PORT_ENGINE:-8551}:8551 # ENGINE-API
2121
labels:
22-
- "promtail-monitored=${EL_NETHERMIND_PROMTAIL_MONITORED:-true}"
22+
- "alloy-monitored=${EL_NETHERMIND_ALLOY_MONITORED:-true}"
2323
command: |
2424
--config=${NETWORK}
2525
--data-dir=/nethermind/data
@@ -56,7 +56,7 @@ services:
5656
- ${EL_IP_HTTP:-127.0.0.1}:${EL_PORT_HTTP:-8545}:8545 # JSON-RPC
5757
- ${EL_IP_ENGINE:-127.0.0.1}:${EL_PORT_ENGINE:-8551}:8551 # ENGINE-API
5858
labels:
59-
- "promtail-monitored=${EL_RETH_PROMTAIL_MONITORED:-true}"
59+
- "alloy-monitored=${EL_RETH_ALLOY_MONITORED:-true}"
6060
command: |
6161
node
6262
--full

compose-mev.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ services:
1717
volumes:
1818
- ./commit-boost/config.toml:/etc/commit-boost/config.toml:ro
1919
labels:
20-
- "promtail-monitored=${MEV_COMMIT_BOOST_PROMTAIL_MONITORED:-true}"
20+
- "alloy-monitored=${MEV_COMMIT_BOOST_ALLOY_MONITORED:-true}"
2121
networks: [dvnode]
2222
restart: unless-stopped
2323

@@ -42,6 +42,6 @@ services:
4242
-metrics
4343
-metrics-addr=0.0.0.0:18551
4444
labels:
45-
- "promtail-monitored=${MEV_MEV_BOOST_PROMTAIL_MONITORED:-true}"
45+
- "alloy-monitored=${MEV_MEV_BOOST_ALLOY_MONITORED:-true}"
4646
networks: [dvnode]
4747
restart: unless-stopped

compose-monitoring.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,13 @@ services:
5858
- /var/run/docker.sock:/var/run/docker.sock
5959
networks: [dvnode]
6060
entrypoint: /etc/alloy/run.sh
61-
command: ["/bin/alloy", "run", "/etc/alloy/config.alloy", "--storage.path=/var/lib/alloy/data"]
61+
command:
62+
[
63+
"/bin/alloy",
64+
"run",
65+
"/etc/alloy/config.alloy",
66+
"--storage.path=/var/lib/alloy/data",
67+
]
6268
restart: unless-stopped
6369

6470
networks:

compose-vc.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ services:
2121
BUILDER_API_ENABLED: ${BUILDER_API_ENABLED:-true}
2222
BUILDER_SELECTION: ${VC_LODESTAR_BUILDER_SELECTION:-builderalways}
2323
labels:
24-
- "promtail-monitored=${VC_LODESTAR_PROMTAIL_MONITORED:-true}"
24+
- "alloy-monitored=${VC_LODESTAR_ALLOY_MONITORED:-true}"
2525
volumes:
2626
- ./lodestar/run.sh:/opt/lodestar/run.sh
2727
- .charon/validator_keys:/home/charon/validator_keys
@@ -46,7 +46,7 @@ services:
4646
environment:
4747
BEACON_NODE_ADDRESS: http://charon:3600
4848
labels:
49-
- "promtail-monitored=${VC_NIMBUS_PROMTAIL_MONITORED:-true}"
49+
- "alloy-monitored=${VC_NIMBUS_ALLOY_MONITORED:-true}"
5050
volumes:
5151
- ./nimbus/run.sh:/home/user/data/run.sh
5252
- .charon/validator_keys:/home/validator_keys
@@ -70,7 +70,7 @@ services:
7070
BEACON_NODE_ADDRESS: http://charon:3600
7171
NETWORK: ${NETWORK}
7272
labels:
73-
- "promtail-monitored=${VC_PRYSM_PROMTAIL_MONITORED:-true}"
73+
- "alloy-monitored=${VC_PRYSM_ALLOY_MONITORED:-true}"
7474
volumes:
7575
- ./prysm/run.sh:/home/prysm/run.sh
7676
- ./data/vc-prysm:/data/vc
@@ -100,7 +100,7 @@ services:
100100
depends_on: [charon]
101101
networks: [dvnode]
102102
labels:
103-
- "promtail-monitored=${VC_TEKU_PROMTAIL_MONITORED:-true}"
103+
- "alloy-monitored=${VC_TEKU_ALLOY_MONITORED:-true}"
104104
volumes:
105105
- .charon/validator_keys:/opt/charon/validator_keys
106106
- ./data/vc-teku:/home/data

0 commit comments

Comments
 (0)