Apply suggestions from code review

Hope this isn't too forward. Keen to get everything to rc while i'm on a roll.

Signed-off-by: Oisín Kyne <[email protected]>

Author: OisinKyne

.env.sample.holesky

@@ -259,7 +259,7 @@ LIDODVEXIT_EXIT_EPOCH=256
 # To get Alerted with Obol Agent monitoring on Discord, specify your Discord ID(s) below.
 # Enable developer mode on discord with User Settings > Advanced. 
 # Then right click on a user's profile picture or name and select Copy ID to get a unique 18-digit number that represents their account. 
-# Specify multiple discord IDs using comma separation. (e.g. `DISCORD_IDS=123456789098765432,098765432123456789`)
+# Specify multiple discord IDs using comma separation. (e.g. `ALERT_DISCORD_IDS=123456789098765432,098765432123456789`)
 #ALERT_DISCORD_IDS=""
 
 # Uncomment these if you have log exporting with Promtail

.env.sample.hoodi

@@ -265,7 +265,7 @@ LIDODVEXIT_EXIT_EPOCH=256
 # To get Alerted with Obol Agent monitoring on Discord, specify your Discord ID(s) below.
 # Enable developer mode on discord with User Settings > Advanced. 
 # Then right click on a user's profile picture or name and select Copy ID to get a unique 18-digit number that represents their account. 
-# Specify multiple discord IDs using comma separation. (e.g. `DISCORD_IDS=123456789098765432,098765432123456789`)
+# Specify multiple discord IDs using comma separation. (e.g. `ALERT_DISCORD_IDS=123456789098765432,098765432123456789`)
 #ALERT_DISCORD_IDS=""
 
 # Uncomment these if you have log exporting with Promtail

.env.sample.mainnet

@@ -265,7 +265,7 @@ LIDODVEXIT_EXIT_EPOCH=194048
 # To get Alerted with Obol Agent monitoring on Discord, specify your Discord ID(s) below.
 # Enable developer mode on discord with User Settings > Advanced. 
 # Then right click on a user's profile picture or name and select Copy ID to get a unique 18-digit number that represents their account. 
-# Specify multiple discord IDs using comma separation. (e.g. `DISCORD_IDS=123456789098765432,098765432123456789`)
+# Specify multiple discord IDs using comma separation. (e.g. `ALERT_DISCORD_IDS=123456789098765432,098765432123456789`)
 #ALERT_DISCORD_IDS=""
 
 # Uncomment these if you have log exporting with Promtail

compose-monitoring.yml

@@ -9,11 +9,11 @@ services:
     user: ":"
     networks: [dvnode]
     environment:
-      PROM_REMOTE_WRITE_TOKEN: ${PROM_REMOTE_WRITE_TOKEN}
-      SERVICE_OWNER: ${SERVICE_OWNER}
-      ALERT_DISCORD_IDS: "${ALERT_DISCORD_IDS}"
-      CLUSTER_NAME: ${CLUSTER_NAME}
-      CLUSTER_PEER: ${CLUSTER_PEER}
+      PROM_REMOTE_WRITE_TOKEN: ${PROM_REMOTE_WRITE_TOKEN:-}
+      SERVICE_OWNER: ${SERVICE_OWNER:-}
+      ALERT_DISCORD_IDS: "${ALERT_DISCORD_IDS:-}"
+      CLUSTER_NAME: ${CLUSTER_NAME:-}
+      CLUSTER_PEER: ${CLUSTER_PEER:-}
     volumes:
       - ./prometheus:/etc/prometheus
       - ./data/prometheus:/prometheus

docker-compose.yml

@@ -180,11 +180,11 @@ services:
     user: ":"
     networks: [dvnode]
     environment:
-      PROM_REMOTE_WRITE_TOKEN: ${PROM_REMOTE_WRITE_TOKEN}
-      SERVICE_OWNER: ${SERVICE_OWNER}
-      ALERT_DISCORD_IDS: "${ALERT_DISCORD_IDS}"
-      CLUSTER_NAME: ${CLUSTER_NAME}
-      CLUSTER_PEER: ${CLUSTER_PEER}
+      PROM_REMOTE_WRITE_TOKEN: ${PROM_REMOTE_WRITE_TOKEN:-}
+      SERVICE_OWNER: ${SERVICE_OWNER:-}
+      ALERT_DISCORD_IDS: "${ALERT_DISCORD_IDS:-}"
+      CLUSTER_NAME: ${CLUSTER_NAME:-}
+      CLUSTER_PEER: ${CLUSTER_PEER:-}
     volumes:
       - ./prometheus:/etc/prometheus
       - ./data/prometheus:/prometheus

prometheus/prometheus.yml.example

@@ -10,7 +10,7 @@ remote_write:
       credentials: $PROM_REMOTE_WRITE_TOKEN
     write_relabel_configs:
       - source_labels: [job]
-        regex: "charon|nethermind|lighthouse|lodestar|mev-boost"
+        regex: "charon|mev-boost"
         action: keep # Keeps charon metrics and drop metrics from other containers.
 
 scrape_configs: