metrics-exporter fix (eth-educators#1814)

yorickdowne · Apr 30, 2024 · 2e92622 · 2e92622
1 parent 8f91f19
commit 2e92622
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 43 deletions.
diff --git 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
diff --git a/eth-metrics/docker-entrypoint.sh b/eth-metrics/docker-entrypoint.sh
diff --git 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
@@ -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
@@ -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