diff --git a/blox-ssv-config-sample.yaml b/blox-ssv-config-sample.yaml deleted file mode 100644 index 2270b842..00000000 --- a/blox-ssv-config-sample.yaml +++ /dev/null @@ -1,18 +0,0 @@ -db: - Path: /tmp/ssv-db - Type: badger-db -p2p: - DiscoveryType: discv5 - TcpPort: 13001 - UdpPort: 12001 -eth2: - BeaconNodeAddr: http://consensus:5052 - Network: prater -eth1: - ETH1Addr: ws://execution:8546 -OperatorPrivateKey: YOURPRIVATEKEYHERE -MetricsAPIPort: 15000 -global: - LogFormat: json - LogLevelFormat: lowercase - LogLevel: info diff --git a/blox-ssv2.yml b/blox-ssv2.yml deleted file mode 100644 index 7c865811..00000000 --- a/blox-ssv2.yml +++ /dev/null @@ -1,33 +0,0 @@ -version: "3.9" -x-logging: &logging - logging: - driver: json-file - options: - max-size: 100m - max-file: "3" - tag: '{{.ImageName}}|{{.Name}}|{{.ImageFullID}}|{{.FullID}}' - -services: - ssv2-node: - restart: "unless-stopped" - image: bloxstaking/ssv-node:${SSV2_NODE_TAG:-latest} - user: 12000:12000 - volumes: - - ./blox-ssv-config.yaml:/config.yaml - - ssv2-data:/tmp - - /etc/localtime:/etc/localtime:ro - ports: - - ${SSV_P2P_PORT}:${SSV_P2P_PORT}/tcp - - ${SSV_P2P_PORT_UDP}:${SSV_P2P_PORT_UDP}/udp - <<: *logging - environment: - - CONFIG_PATH=/config.yaml - - HOME=/tmp - command: make BUILD_PATH=/go/bin/ssvnode start-node - ssv-generate-keys: - profiles: ["tools"] - restart: "no" - image: bloxstaking/ssv-node:${SSV2_NODE_TAG:-latest} - command: /go/bin/ssvnode generate-operator-keys -volumes: - ssv2-data: diff --git a/ethd b/ethd index 83119593..0fac64b3 100755 --- a/ethd +++ b/ethd @@ -151,10 +151,6 @@ prep_conffiles() { if [ ! -f "./ssv-config.yaml" ]; then ${__as_owner} cp ./ssv-config-sample.yaml ./ssv-config.yaml fi -# Create blox-ssv-config.yml if it doesn't exist - if [ ! -f "./blox-ssv-config.yaml" ]; then - ${__as_owner} cp ./blox-ssv-config-sample.yaml ./blox-ssv-config.yaml - fi } handle_root() { @@ -814,7 +810,7 @@ migrate_compose_file() { # When this gets called $var is COMPOSE_FILE and $value is what is set in .env for it # Some files have been renamed and others removed altogether FROM_YML=( ec-shared.yml ec-traefik.yml cc-shared.yml grafana-insecure.yml prysm-web-insecure.yml lh-base-notz.yml lh-validator-notz.yml lh-slasher.yml teku-base-notz.yml teku-validator-notz.yml lh-consensus.yml lh-validator.yml lodestar-consensus.yml lodestar-validator.yml nimbus-consensus.yml prysm-consensus.yml prysm-consensus-rest.yml prysm-validator.yml teku-consensus.yml teku-validator.yml lh-base.yml lh-vc-only.yml lh-cl-only.yml nm.yml lighthouse-base.yml teku-base.yml nimbus-base.yml prysm-base.yml lodestar-base.yml traefik-cf-v6.yml blox-ssv2.yml prysm-web.yml blank-grafana.yml lh-grafana.yml lhcc-grafana.yml nimbus-grafana.yml prysm-grafana.yml teku-grafana.yml geth-grafana.yml erigon-grafana.yml oe.yml teku-stats.yml lh-stats.yml lh-stats-consensus.yml lh-stats-validator.yml traefik-shared.yml lighthouse-slasher.yml prysm-slasher.yml ) - TO_YML=( el-shared.yml el-traefik.yml cl-shared.yml grafana-shared.yml prysm-web-shared.yml lighthouse-base.yml lighthouse-vc-only.yml lighthouse-slasher.yml teku-base.yml teku-vc-only.yml lighthouse-cl-only.yml lighthouse-vc-only.yml lodestar-cl-only.yml lodestar-vc-only.yml nimbus-cl-only.yml prysm-cl-only.yml prysm-cl-only.yml prysm-vc-only.yml teku-cl-only.yml teku-vc-only.yml lighthouse-base.yml lighthouse-vc-only.yml lighthouse-cl-only.yml nethermind.yml lighthouse.yml teku.yml nimbus.yml prysm.yml lodestar.yml traefik-cf.yml blox-ssv2.yml "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" ) + TO_YML=( el-shared.yml el-traefik.yml cl-shared.yml grafana-shared.yml prysm-web-shared.yml lighthouse-base.yml lighthouse-vc-only.yml lighthouse-slasher.yml teku-base.yml teku-vc-only.yml lighthouse-cl-only.yml lighthouse-vc-only.yml lodestar-cl-only.yml lodestar-vc-only.yml nimbus-cl-only.yml prysm-cl-only.yml prysm-cl-only.yml prysm-vc-only.yml teku-cl-only.yml teku-vc-only.yml lighthouse-base.yml lighthouse-vc-only.yml lighthouse-cl-only.yml nethermind.yml lighthouse.yml teku.yml nimbus.yml prysm.yml lodestar.yml traefik-cf.yml ssv.yml "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" ) __old_grafana=0 __new_grafana=0 @@ -858,8 +854,6 @@ migrate_compose_file() { } ssv_switch() { - echo "Detected legacy SSV Node. Not migrating, yet." - return echo "Detected legacy SSV Node. Migrating config to new testnet." echo echo "Stopping SSV Node container" @@ -2332,10 +2326,6 @@ version() { docompose exec ssv-node /go/bin/ssvnode --version echo ;;& - *blox-ssv2.yml* ) - docompose exec ssv2-node /go/bin/ssvnode --version - echo - ;;& *lighthouse.yml* | *lighthouse-cl-only* ) docompose exec consensus lighthouse --version echo diff --git a/grafana/provision-dashboards.sh b/grafana/provision-dashboards.sh index c08761e8..7327477c 100755 --- a/grafana/provision-dashboards.sh +++ b/grafana/provision-dashboards.sh @@ -94,15 +94,6 @@ case "$CLIENT" in __file='/etc/grafana/provisioning/dashboards/ssv_node_dashboard.json' wget -t 3 -T 10 -qcO - "${__url}" | jq '.templating.list[0].current |= {selected: false, text: "ssv-node", value: "ssv-node"} | .templating.list[0].options = [ { "selected": true, "text": "ssv-node", "value": "ssv-node" } ] | .templating.list[0].query = "ssv-node"' >"${__file}" ;;& - *blox-ssv2.yml* ) - # SSV Operator Dashboard - __url='https://raw.githubusercontent.com/bloxapp/ssv/main/monitoring/grafana/dashboard_ssv_operator_performance.json' - __file='/etc/grafana/provisioning/dashboards/ssv_operator_dashboard.json' - wget -t 3 -T 10 -qcO - "${__url}" | jq '.templating.list[0].current |= {selected: false, text: "ssv2-node", value: "ssv2-node"} | .templating.list[0].options = [ { "selected": true, "text": "ssv2-node", "value": "ssv2-node" } ] | .templating.list[0].query = "ssv2-node"' >"${__file}" - __url='https://raw.githubusercontent.com/bloxapp/ssv/main/monitoring/grafana/dashboard_ssv_node.json' - __file='/etc/grafana/provisioning/dashboards/ssv_node_dashboard.json' - wget -t 3 -T 10 -qcO - "${__url}" | jq '.templating.list[0].current |= {selected: false, text: "ssv2-node", value: "ssv2-node"} | .templating.list[0].options = [ { "selected": true, "text": "ssv2-node", "value": "ssv2-node" } ] | .templating.list[0].query = "ssv2-node"' >"${__file}" - ;;& * ) # Home staking dashboard __revision=$(wget -t 3 -T 10 -qO - https://grafana.com/api/dashboards/17846 | jq .revision) diff --git a/prometheus/blox-ssv2-prom.yml b/prometheus/blox-ssv2-prom.yml deleted file mode 100644 index 9790a049..00000000 --- a/prometheus/blox-ssv2-prom.yml +++ /dev/null @@ -1,10 +0,0 @@ - - job_name: ssv - metrics_path: /metrics - static_configs: - - targets: - - ssv2-node:15000 - - job_name: ssv_health - metrics_path: /health - static_configs: - - targets: - - ssv2-node:15000 diff --git a/prometheus/choose-config.sh b/prometheus/choose-config.sh index f11714ec..033bd1bc 100755 --- a/prometheus/choose-config.sh +++ b/prometheus/choose-config.sh @@ -30,7 +30,6 @@ esac case "$CLIENT" in *ssv.yml* ) cat /etc/prometheus/ssv-prom.yml >> /etc/prometheus/prometheus.yml ;; - *blox-ssv2.yml* ) cat /etc/prometheus/blox-ssv2-prom.yml >> /etc/prometheus/prometheus.yml ;; esac case "$CLIENT" in