From b79f1d89b994ec5d64c4a0b194cfd083357d23e7 Mon Sep 17 00:00:00 2001
From: Yorick <yorickdowne@gmail.com>
Date: Tue, 30 Apr 2024 09:21:50 +0000
Subject: [PATCH] metrics-exporter fix

---
 central-metrics.yml              | 12 ++++--------
 eth-metrics/Dockerfile           |  3 ---
 eth-metrics/docker-entrypoint.sh | 11 -----------
 grafana-cloud.yml                | 10 +++-------
 grafana-rootless.yml             | 10 +++-------
 grafana.yml                      | 10 +++-------
 6 files changed, 13 insertions(+), 43 deletions(-)
 delete mode 100644 eth-metrics/Dockerfile
 delete mode 100755 eth-metrics/docker-entrypoint.sh

diff --git a/central-metrics.yml b/central-metrics.yml
index 94023004..04156168 100644
--- a/central-metrics.yml
+++ b/central-metrics.yml
@@ -10,18 +10,14 @@ x-logging: &logging
 services:
   ethereum-metrics-exporter:
     restart: "unless-stopped"
-    build:
-      context: ./eth-metrics
-    image: ethereum-metrics-exporter:local
-    pull_policy: never
-    environment:
-      - CLIENT=${COMPOSE_FILE}
+    image: samcm/ethereum-metrics-exporter:0.23.0-debian
     entrypoint:
-      - docker-entrypoint.sh
       - /ethereum-metrics-exporter
+      - --consensus-url=${CL_NODE}
+      - --execution-url=${EL_NODE}
+    <<: *logging
     labels:
       - metrics.scrape=true
       - metrics.path=/metrics
       - metrics.port=9090
       - metrics.instance=ethereum-metrics-exporter
-    <<: *logging
diff --git a/eth-metrics/Dockerfile b/eth-metrics/Dockerfile
deleted file mode 100644
index cb178bbf..00000000
--- a/eth-metrics/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM samcm/ethereum-metrics-exporter:0.23.0-debian
-
-COPY ./docker-entrypoint.sh /usr/local/bin/
diff --git a/eth-metrics/docker-entrypoint.sh b/eth-metrics/docker-entrypoint.sh
deleted file mode 100755
index ff72785e..00000000
--- a/eth-metrics/docker-entrypoint.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-__consensus=""
-__execution=""
-
-case "$CLIENT" in
-    *lighthouse* | *prysm* | *nimbus* | *teku* | *lodestar* | *grandine* ) __consensus="--consensus-url=http://consensus:5052" ;;&
-    *geth* | *besu* | *nethermind* | *erigon* | *reth* ) __execution="--execution-url=http://execution:8545" ;;
-esac
-
-exec "$@" $__consensus $__execution
diff --git a/grafana-cloud.yml b/grafana-cloud.yml
index f4ad2722..99f08501 100644
--- a/grafana-cloud.yml
+++ b/grafana-cloud.yml
@@ -42,15 +42,11 @@ services:
 
   ethereum-metrics-exporter:
     restart: "unless-stopped"
-    build:
-      context: ./eth-metrics
-    image: ethereum-metrics-exporter:local
-    pull_policy: never
-    environment:
-      - CLIENT=${COMPOSE_FILE}
+    image: samcm/ethereum-metrics-exporter:0.23.0-debian
     entrypoint:
-      - docker-entrypoint.sh
       - /ethereum-metrics-exporter
+      - --consensus-url=${CL_NODE}
+      - --execution-url=${EL_NODE}
     <<: *logging
     labels:
       - metrics.scrape=true
diff --git a/grafana-rootless.yml b/grafana-rootless.yml
index 90e85d0c..cc2bcb08 100644
--- a/grafana-rootless.yml
+++ b/grafana-rootless.yml
@@ -34,15 +34,11 @@ services:
 
   ethereum-metrics-exporter:
     restart: "unless-stopped"
-    build:
-      context: ./eth-metrics
-    image: ethereum-metrics-exporter:local
-    pull_policy: never
-    environment:
-      - CLIENT=${COMPOSE_FILE}
+    image: samcm/ethereum-metrics-exporter:0.23.0-debian
     entrypoint:
-      - docker-entrypoint.sh
       - /ethereum-metrics-exporter
+      - --consensus-url=${CL_NODE}
+      - --execution-url=${EL_NODE}
     <<: *logging
 
   blackbox-exporter:
diff --git a/grafana.yml b/grafana.yml
index de394fef..a27f51a8 100644
--- a/grafana.yml
+++ b/grafana.yml
@@ -34,15 +34,11 @@ services:
 
   ethereum-metrics-exporter:
     restart: "unless-stopped"
-    build:
-      context: ./eth-metrics
-    image: ethereum-metrics-exporter:local
-    pull_policy: never
-    environment:
-      - CLIENT=${COMPOSE_FILE}
+    image: samcm/ethereum-metrics-exporter:0.23.0-debian
     entrypoint:
-      - docker-entrypoint.sh
       - /ethereum-metrics-exporter
+      - --consensus-url=${CL_NODE}
+      - --execution-url=${EL_NODE}
     <<: *logging
     labels:
       - metrics.scrape=true