From 30936ed03fac04949864dac428617af17e4a4cba Mon Sep 17 00:00:00 2001
From: Yorick Downe <yorickdowne@gmail.com>
Date: Wed, 21 Jul 2021 12:30:37 -0400
Subject: [PATCH] Support new beaconcha.in stats endpoint

---
 README.md       | 2 +-
 default.env     | 3 ++-
 ethd            | 2 +-
 lh-stats.yml    | 4 ++--
 prysm-stats.yml | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 5b0b7094..156f5ced 100644
--- a/README.md
+++ b/README.md
@@ -25,4 +25,4 @@ If we've helped you out, in-person or by creating this project, a tip will be ve
 
 # Version
 
-This is eth-docker v1.4.1.2
+This is eth-docker v1.4.2
diff --git a/default.env b/default.env
index 67c92896..79bf08ab 100644
--- a/default.env
+++ b/default.env
@@ -45,8 +45,9 @@ TEKU_RAPID_SYNC=
 CC_NODE=http://consensus:5052
 
 # Beaconcha.in API key for sending client stats from Prysm. Used with prysm-stats.yml
-# Specify as just the API key or as APIKEY/MACHINENAME
+# Specify as just the API key, and give the machine name separately
 BEACON_STATS_API=
+BEACON_STATS_MACHINE=
 
 # P2P ports you will forward to your staking node. Adjust here if you are
 # going to use something other than defaults.
diff --git a/ethd b/ethd
index baaac107..e13c1f33 100755
--- a/ethd
+++ b/ethd
@@ -179,7 +179,7 @@ envmigrate() {
              PRYSM_PEER_COUNT LH_PEER_COUNT TEKU_PEER_COUNT NIM_PEER_COUNT DOMAIN ACME_EMAIL \
              CF_EMAIL CF_API_TOKEN AWS_PROFILE AWS_HOSTED_ZONE_ID GRAFANA_HOST PRYSM_HOST \
              EC_HOST EC_WS_HOST DDNS_SUBDOMAIN DDNS_PROXY TEKU_RAPID_SYNC CC_NODE BEACON_STATS_API \
-             EC_P2P_PORT LH_PORT PRYSM_PORT PRYSM_UDP_PORT NIM_PORT TEKU_PORT GRAFANA_PORT \
+             BEACON_STATS_MACHINE EC_P2P_PORT LH_PORT PRYSM_PORT PRYSM_UDP_PORT NIM_PORT TEKU_PORT GRAFANA_PORT \
              PRYSM_WEB_PORT TRAEFIK_WEB_PORT TRAEFIK_WEB_HTTP_PORT EC_RPC_PORT EC_WS_PORT \
              RESTART LOG_LEVEL )
     OLD_VARS=( ETH1_NODE ETH1_FALLBACK_NODE1 ETH1_FALLBACK_NODE2 ETH1_NETWORK ETH1_HOST \
diff --git a/lh-stats.yml b/lh-stats.yml
index 1c7d840c..4db30b9b 100644
--- a/lh-stats.yml
+++ b/lh-stats.yml
@@ -4,8 +4,8 @@ services:
   consensus:
     command:
       - --monitoring-endpoint
-      - https://beaconcha.in/api/v1/stats/${BEACON_STATS_API}
+      - https://beaconcha.in/api/v1/client/metrics?apikey=${BEACON_STATS_API}&machine=${BEACON_STATS_MACHINE}
   validator:
     command:
       - --monitoring-endpoint
-      - https://beaconcha.in/api/v1/stats/${BEACON_STATS_API}
+      -  https://beaconcha.in/api/v1/client/metrics?apikey=${BEACON_STATS_API}&machine=${BEACON_STATS_MACHINE}
diff --git a/prysm-stats.yml b/prysm-stats.yml
index 1c8c5a51..e7d8ddc0 100644
--- a/prysm-stats.yml
+++ b/prysm-stats.yml
@@ -25,7 +25,7 @@ services:
       - --beacon-node-metrics-url
       - http://consensus:8080/metrics
       - --clientstats-api-url
-      - https://beaconcha.in/api/v1/stats/${BEACON_STATS_API}
+      - https://beaconcha.in/api/v1/client/metrics?apikey=${BEACON_STATS_API}&machine=${BEACON_STATS_MACHINE}
   eth:
     depends_on:
       - client-stats