remove operator id and use cluster name/peer

Author: DiogoSantoss

.env.sample.holesky

@@ -176,10 +176,10 @@ CHARON_EXECUTION_CLIENT_RPC_ENDPOINT=http://${EL}:8545
 # Loki log aggregation server addresses. Disable loki log aggregation by setting an empty address.
 #CHARON_LOKI_ADDRESSES=
 
-# Charon Cluster Name. Mandatory to send logs with Promtail.
+# Charon Cluster Name. Mandatory to send logs with Promtail and metrics with Prometheus.
 #CLUSTER_NAME=
 
-# Charon Cluster Peer. Mandatory to send logs with Promtail.
+# Charon Cluster Peer. Mandatory to send logs with Promtail and metrics with Prometheus.
 #CLUSTER_PEER=
 
 # Nickname to identify this charon node on monitoring (max 32 characters).
@@ -256,9 +256,6 @@ LIDODVEXIT_EXIT_EPOCH=256
 # Prometheus service owner used to uniquely identify user from which metrics are pushed.
 #SERVICE_OWNER=charon_user
 
-# Unique label to identify this operator in Prometheus metrics.
-#OPERATOR_PROMETHEUS_LABEL=
-
 # 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. 

.env.sample.hoodi

@@ -176,10 +176,10 @@ CHARON_EXECUTION_CLIENT_RPC_ENDPOINT=http://${EL}:8545
 # Loki log aggregation server addresses. Disable loki log aggregation by setting an empty address.
 #CHARON_LOKI_ADDRESSES=
 
-# Charon Cluster Name. Mandatory to send logs with Promtail.
+# Charon Cluster Name. Mandatory to send logs with Promtail and metrics with Prometheus.
 #CLUSTER_NAME=
 
-# Charon Cluster Peer. Mandatory to send logs with Promtail.
+# Charon Cluster Peer. Mandatory to send logs with Promtail and metrics with Prometheus.
 #CLUSTER_PEER=
 
 # Nickname to identify this charon node on monitoring (max 32 characters).
@@ -262,9 +262,6 @@ LIDODVEXIT_EXIT_EPOCH=256
 # Prometheus service owner used to uniquely identify user from which metrics are pushed.
 #SERVICE_OWNER=charon_user
 
-# Unique label to identify this operator in Prometheus metrics.
-#OPERATOR_PROMETHEUS_LABEL=
-
 # 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. 

.env.sample.mainnet

@@ -176,10 +176,10 @@ CHARON_EXECUTION_CLIENT_RPC_ENDPOINT=http://${EL}:8545
 # Loki log aggregation server addresses. Disable loki log aggregation by setting an empty address.
 #CHARON_LOKI_ADDRESSES=
 
-# Charon Cluster Name. Mandatory to send logs with Promtail.
+# Charon Cluster Name. Mandatory to send logs with Promtail and metrics with Prometheus.
 #CLUSTER_NAME=
 
-# Charon Cluster Peer. Mandatory to send logs with Promtail.
+# Charon Cluster Peer. Mandatory to send logs with Promtail and metrics with Prometheus.
 #CLUSTER_PEER=
 
 # Nickname to identify this charon node on monitoring (max 32 characters).
@@ -262,9 +262,6 @@ LIDODVEXIT_EXIT_EPOCH=194048
 # Prometheus service owner used to uniquely identify user from which metrics are pushed.
 #SERVICE_OWNER=charon_user
 
-# Unique label to identify this operator in Prometheus metrics.
-#OPERATOR_PROMETHEUS_LABEL=
-
 # 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. 

compose-monitoring.yml

@@ -12,10 +12,11 @@ services:
       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
-      - ./.charon/cluster-lock.json:/opt/charon/.charon/cluster-lock.json:ro
     entrypoint: /etc/prometheus/run.sh
     restart: unless-stopped
 

docker-compose.yml

@@ -183,10 +183,11 @@ services:
       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
-      - ./.charon/cluster-lock.json:/opt/charon/.charon/cluster-lock.json:ro
     entrypoint: /etc/prometheus/run.sh
     restart: unless-stopped
 

prometheus/prometheus.yml.example

@@ -30,8 +30,10 @@ scrape_configs:
     static_configs:
       - targets: ["mev-mevboost:18551","mev-boost:18551"]
     relabel_configs:
-      - target_label: operator_id
-        replacement: "$OPERATOR_PROMETHEUS_LABEL"
+      - target_label: cluster_name
+        replacement: "$CLUSTER_NAME"
+      - target_label: cluster_peer
+        replacement: "$CLUSTER_PEER"
   - job_name: "lodestar"
     static_configs:
       - targets: [ "lodestar:5064" ]

prometheus/run.sh

@@ -2,8 +2,8 @@
 
 if [ -z "$SERVICE_OWNER" ]
 then
-  if [ -f /opt/charon/.charon/cluster-lock.json ]; then
-    export SERVICE_OWNER=$(cat /opt/charon/.charon/cluster-lock.json | jq -r '.lock_hash[2:9]')
+  if [ -n "$CLUSTER_NAME" ] && [ -n "$CLUSTER_PEER" ]; then
+    export SERVICE_OWNER="${CLUSTER_NAME}-${CLUSTER_PEER}"
   else
     export SERVICE_OWNER="unknown"
   fi
@@ -18,7 +18,6 @@ fi
 sed -e "s|\$PROM_REMOTE_WRITE_TOKEN|${PROM_REMOTE_WRITE_TOKEN}|g" \
     -e "s|\$SERVICE_OWNER|${SERVICE_OWNER}|g" \
     -e "s|\$ALERT_DISCORD_IDS|${ALERT_DISCORD_IDS}|g" \
-    -e "s|\$OPERATOR_PROMETHEUS_LABEL|${OPERATOR_PROMETHEUS_LABEL}|g" \
     /etc/prometheus/prometheus.yml.example > /etc/prometheus/prometheus.yml
 
 /bin/prometheus \