From 29c914995a9d81ca529253b463aa2fc432089871 Mon Sep 17 00:00:00 2001 From: Tanya S <120410716+stubbsta@users.noreply.github.com> Date: Thu, 18 Apr 2024 16:07:55 +0200 Subject: [PATCH] removing all uses and references to gowaku (#35) --- README.md | 4 +- docker-compose.yml | 17 +---- monitoring/prometheus-config.yml | 105 +------------------------------ run_gowaku.sh | 28 --------- 4 files changed, 3 insertions(+), 151 deletions(-) delete mode 100755 run_gowaku.sh diff --git a/README.md b/README.md index 9b30b68..a66feb8 100644 --- a/README.md +++ b/README.md @@ -14,10 +14,8 @@ cd waku-simulator Configure the simulation parameters. You can place the env variable in an `.env` file. ``` -export GOWAKU_IMAGE=wakuorg/go-waku:latest export NWAKU_IMAGE=wakuorg/nwaku:v0.21.2-rc.0 export NUM_NWAKU_NODES=5 -export NUM_GOWAKU_NODES=0 export TRAFFIC_DELAY_SECONDS=15 export MSG_SIZE_KBYTES=10 docker-compose up -d @@ -27,7 +25,7 @@ docker-compose up -d This will: * spin up grafana/prometheus for monitoring, see `http://localhost:3000`. * spin up a bootstrap nwaku node. -* spin up a given amount of nwaku/gowaku nodes with specific versions. +* spin up a given amount of nwaku nodes with specific versions. * spin up a `rest-traffic` instance that will inject traffic into the network (see flags for rate and msg size) ## notes diff --git a/docker-compose.yml b/docker-compose.yml index 78ec2ff..346644d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -87,22 +87,7 @@ services: - contract-repo-deployer networks: - simulation - - gowaku: - image: ${GOWAKU_IMAGE:-wakuorg/go-waku:latest} - restart: on-failure - labels: - com.centurylinklabs.watchtower.enable: '${WATCHTOWER_ENABLED:-false}' - deploy: - replicas: ${NUM_GOWAKU_NODES:-0} - entrypoint: sh - command: - - '/opt/run_gowaku.sh' - volumes: - - ./run_gowaku.sh:/opt/run_gowaku.sh:Z - depends_on: - - bootstrap - + rest-traffic: build: context: . diff --git a/monitoring/prometheus-config.yml b/monitoring/prometheus-config.yml index 22c98c6..69102ab 100644 --- a/monitoring/prometheus-config.yml +++ b/monitoring/prometheus-config.yml @@ -213,107 +213,4 @@ scrape_configs: - waku-simulator_nwaku_197:8008 - waku-simulator_nwaku_198:8008 - waku-simulator_nwaku_199:8008 - - waku-simulator_nwaku_200:8008 - - job_name: "gowaku" - static_configs: - - targets: - - waku-simulator_gowaku_1:8008 - - waku-simulator_gowaku_2:8008 - - waku-simulator_gowaku_3:8008 - - waku-simulator_gowaku_4:8008 - - waku-simulator_gowaku_5:8008 - - waku-simulator_gowaku_6:8008 - - waku-simulator_gowaku_7:8008 - - waku-simulator_gowaku_8:8008 - - waku-simulator_gowaku_9:8008 - - waku-simulator_gowaku_10:8008 - - waku-simulator_gowaku_11:8008 - - waku-simulator_gowaku_12:8008 - - waku-simulator_gowaku_13:8008 - - waku-simulator_gowaku_14:8008 - - waku-simulator_gowaku_15:8008 - - waku-simulator_gowaku_16:8008 - - waku-simulator_gowaku_17:8008 - - waku-simulator_gowaku_18:8008 - - waku-simulator_gowaku_19:8008 - - waku-simulator_gowaku_20:8008 - - waku-simulator_gowaku_21:8008 - - waku-simulator_gowaku_22:8008 - - waku-simulator_gowaku_23:8008 - - waku-simulator_gowaku_24:8008 - - waku-simulator_gowaku_25:8008 - - waku-simulator_gowaku_26:8008 - - waku-simulator_gowaku_27:8008 - - waku-simulator_gowaku_28:8008 - - waku-simulator_gowaku_29:8008 - - waku-simulator_gowaku_30:8008 - - waku-simulator_gowaku_31:8008 - - waku-simulator_gowaku_32:8008 - - waku-simulator_gowaku_33:8008 - - waku-simulator_gowaku_34:8008 - - waku-simulator_gowaku_35:8008 - - waku-simulator_gowaku_36:8008 - - waku-simulator_gowaku_37:8008 - - waku-simulator_gowaku_38:8008 - - waku-simulator_gowaku_39:8008 - - waku-simulator_gowaku_40:8008 - - waku-simulator_gowaku_41:8008 - - waku-simulator_gowaku_42:8008 - - waku-simulator_gowaku_43:8008 - - waku-simulator_gowaku_44:8008 - - waku-simulator_gowaku_45:8008 - - waku-simulator_gowaku_46:8008 - - waku-simulator_gowaku_47:8008 - - waku-simulator_gowaku_48:8008 - - waku-simulator_gowaku_49:8008 - - waku-simulator_gowaku_50:8008 - - waku-simulator_gowaku_51:8008 - - waku-simulator_gowaku_52:8008 - - waku-simulator_gowaku_53:8008 - - waku-simulator_gowaku_54:8008 - - waku-simulator_gowaku_55:8008 - - waku-simulator_gowaku_56:8008 - - waku-simulator_gowaku_57:8008 - - waku-simulator_gowaku_58:8008 - - waku-simulator_gowaku_59:8008 - - waku-simulator_gowaku_60:8008 - - waku-simulator_gowaku_61:8008 - - waku-simulator_gowaku_62:8008 - - waku-simulator_gowaku_63:8008 - - waku-simulator_gowaku_64:8008 - - waku-simulator_gowaku_65:8008 - - waku-simulator_gowaku_66:8008 - - waku-simulator_gowaku_67:8008 - - waku-simulator_gowaku_68:8008 - - waku-simulator_gowaku_69:8008 - - waku-simulator_gowaku_70:8008 - - waku-simulator_gowaku_71:8008 - - waku-simulator_gowaku_72:8008 - - waku-simulator_gowaku_73:8008 - - waku-simulator_gowaku_74:8008 - - waku-simulator_gowaku_75:8008 - - waku-simulator_gowaku_76:8008 - - waku-simulator_gowaku_77:8008 - - waku-simulator_gowaku_78:8008 - - waku-simulator_gowaku_79:8008 - - waku-simulator_gowaku_80:8008 - - waku-simulator_gowaku_81:8008 - - waku-simulator_gowaku_82:8008 - - waku-simulator_gowaku_83:8008 - - waku-simulator_gowaku_84:8008 - - waku-simulator_gowaku_85:8008 - - waku-simulator_gowaku_86:8008 - - waku-simulator_gowaku_87:8008 - - waku-simulator_gowaku_88:8008 - - waku-simulator_gowaku_89:8008 - - waku-simulator_gowaku_90:8008 - - waku-simulator_gowaku_91:8008 - - waku-simulator_gowaku_92:8008 - - waku-simulator_gowaku_93:8008 - - waku-simulator_gowaku_94:8008 - - waku-simulator_gowaku_95:8008 - - waku-simulator_gowaku_96:8008 - - waku-simulator_gowaku_97:8008 - - waku-simulator_gowaku_98:8008 - - waku-simulator_gowaku_99:8008 - - waku-simulator_gowaku_100:8008 \ No newline at end of file + - waku-simulator_nwaku_200:8008 \ No newline at end of file diff --git a/run_gowaku.sh b/run_gowaku.sh deleted file mode 100755 index ee3fee8..0000000 --- a/run_gowaku.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -IP=$(ip a | grep "inet " | grep -Fv 127.0.0.1 | sed 's/.*inet \([^/]*\).*/\1/') - -echo "I am a gowaku node" - -RETRIES=${RETRIES:=10} - -while [ -z "${BOOTSTRAP_ENR}" ] && [ ${RETRIES} -ge 0 ]; do - BOOTSTRAP_ENR=$(wget -qO- http://bootstrap:8645/debug/v1/info --header='Content-Type:application/json' 2> /dev/null | sed 's/.*"enrUri":"\([^"]*\)".*/\1/'); - echo "Bootstrap node not ready, retrying (retries left: ${RETRIES})" - sleep 1 - RETRIES=$(( $RETRIES - 1 )) -done - -if [ -z "${BOOTSTRAP_ENR}" ]; then - echo "Could not get BOOTSTRAP_ENR and none provided. Failing" - exit 1 -fi - -echo "Using bootstrap node: ${BOOTSTRAP_ENR}" -exec /usr/bin/waku\ - --discv5-discovery\ - --discv5-bootstrap-node=${BOOTSTRAP_ENR}\ - --metrics-server=True\ - --metrics-server-address=0.0.0.0 - -