From f5a176b1ba5d916eb8d30518d69c2d10b0b07ddb Mon Sep 17 00:00:00 2001 From: Jonatan Maria <117693967+infoboy27@users.noreply.github.com> Date: Mon, 8 Jun 2026 13:26:14 -0400 Subject: [PATCH 1/2] Refactor docker-compose.yaml for consistency and clarity --- monitoring-stack/docker-compose.yaml | 104 +++++++++++---------------- 1 file changed, 42 insertions(+), 62 deletions(-) diff --git a/monitoring-stack/docker-compose.yaml b/monitoring-stack/docker-compose.yaml index b813513..3d94e95 100644 --- a/monitoring-stack/docker-compose.yaml +++ b/monitoring-stack/docker-compose.yaml @@ -1,39 +1,28 @@ - x-loki: &loki-logging driver: loki options: loki-url: "http://localhost:3100/loki/api/v1/push" - max-size: 5m + max-size: "5m" mode: non-blocking - max-buffer-size: 4m - loki-retries: '3' - max-file: '3' - keep-file: 'false' + max-buffer-size: "4m" + loki-retries: "3" + max-file: "3" + keep-file: "false" services: node1: container_name: node1 hostname: node1 image: canopynetwork/canopy:latest - # This is just here as an example on how to build from a branch - #build: - #context: ../docker_image - #dockerfile: ./Dockerfile - #network: host - #args: - # BUILD_PATH: cmd/cli - # BIN_PATH: $BIN_PATH - #BRANCH: latest env_file: - .env ports: - - 9001:9001 # TCP P2P - expose: - - 50000 # Wallet - - 50001 # Explorer - - 50002 # RPC - - 50003 # Admin RPC + - "50000:50000" # Wallet + - "50001:50001" # Explorer + - "50002:50002" # RPC + - "50003:50003" # Admin RPC + - "9001:9001" # TCP P2P command: [ "start" ] volumes: - ../canopy_data/node1:/root/.canopy @@ -49,25 +38,14 @@ services: container_name: node2 hostname: node2 image: canopynetwork/canopy:latest - # This is just here as an example on how to build from a branch - # build: - # context: ../docker_image - #dockerfile: ./Dockerfile - # network: host - #args: - #BUILD_PATH: cmd/cli - # BIN_PATH: $BIN_PATH - # BRANCH: latest - env_file: - .env ports: - - 9002:9002 # TCP P2P - expose: - - 40000 # Wallet - - 40001 # Explorer - - 40002 # RPC - - 40003 # Admin RPC + - "40000:40000" # Wallet + - "40001:40001" # Explorer + - "40002:40002" # RPC + - "40003:40003" # Admin RPC + - "9002:9002" # TCP P2P command: [ "start" ] volumes: - ../canopy_data/node2:/root/.canopy @@ -80,80 +58,82 @@ services: cpus: "2.0" traefik: - cpus: 2 - mem_limit: 2G image: traefik:v3.6.2 container_name: traefik restart: always - env_file: + env_file: - .env ports: - - 80:80 - - 443:443 - - 8082 # metrics + - "80:80" + - "443:443" + - "8082:8082" # metrics volumes: - /var/run/docker.sock:/var/run/docker.sock:ro - ./loadbalancer/traefik.yml:/traefik.yml:ro - ./loadbalancer/services/:/etc/traefik/services/:ro - ./loadbalancer/certs:/letsencrypt logging: *loki-logging + deploy: + resources: + limits: + memory: 2G + cpus: "2.0" prometheus: image: prom/prometheus:v3.5.0 container_name: prometheus + restart: always volumes: - ./monitoring/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml - ./monitoring/prometheus/data:/prometheus/data command: - - '--config.file=/etc/prometheus/prometheus.yml' + - "--config.file=/etc/prometheus/prometheus.yml" expose: - - 9090 - restart: always + - "9090" logging: *loki-logging - grafana: image: grafana/grafana:12.2.0-16557133545 - container_name: grafana + container_name: grafana + restart: always + env_file: + - .env ports: - - "3000:3000" + - "3000:3000" volumes: - ./monitoring/grafana/data:/var/lib/grafana - ./monitoring/grafana/dashboards:/etc/grafana/dashboards - ./monitoring/grafana/provisioning/:/etc/grafana/provisioning/ - env_file: - - .env - restart: always logging: *loki-logging loki: image: grafana/loki:3.4.4 container_name: loki + restart: always + ports: + - "3100:3100" volumes: - ./monitoring/loki/config.yaml:/etc/loki/local-config.yaml - ./monitoring/loki/data:/var/lib/loki - expose: - - 3100 - ports: - - "3100:3100" command: --config.file=/etc/loki/local-config.yaml - restart: always logging: *loki-logging blackbox: container_name: blackbox image: prom/blackbox-exporter:v0.27.0 + restart: always privileged: true expose: - - '9115' + - "9115" volumes: - ./monitoring/blackbox/blackbox.yml:/etc/blackbox_exporter/config.yml cadvisor: image: gcr.io/cadvisor/cadvisor:v0.52.0 container_name: cadvisor + restart: always expose: - - 8080 + - "8080" volumes: - /:/rootfs:ro - /var/run:/var/run:rw @@ -162,8 +142,8 @@ services: node-exporter: image: prom/node-exporter:v1.9.1 - container_name: node-exporter - expose: - - 9100 + container_name: node-exporter restart: always + expose: + - "9100" logging: *loki-logging From 71e7b9214b974e76885cbbfb17fc12fd72722428 Mon Sep 17 00:00:00 2001 From: Jonatan Maria <117693967+infoboy27@users.noreply.github.com> Date: Mon, 8 Jun 2026 13:57:10 -0400 Subject: [PATCH 2/2] Update dialPeers with new seed node address --- canopy_data/node1/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/canopy_data/node1/config.json b/canopy_data/node1/config.json index 4645ebb..c23f6fe 100644 --- a/canopy_data/node1/config.json +++ b/canopy_data/node1/config.json @@ -32,7 +32,7 @@ "90703d453dfa70af3c85f3605e6cc8222d01d68d439ee5a9ade10be631572b330e1793206c8d417d9693be1d5af417fe@tcp://cnpy.network", "b338f09135994130bee5da939513241b5d01ba5e73c409ed5ecea597b86a8b9c05fd27fb5e47a7296350fbae6262a484@tcp://cnpynetwork.com", "9353441f5319ca7b9ee2f8bd764a8c75e3b6b7b13a18b0c4e5252bc0b1232861318b3063255238edc1fb96f08fa2157a@tcp://canopy.seed1.node1.eu.nodefleet.net", - "a3d591f2e602fd18df7c94abf02f6d342939570b169886bb355e6879cd7b9dda8c5d825f7895336d4e29750e65fc65df@tcp://canopy.seed1.node1.us.nodefleet.net" + "848d2f8f07c6728aead228da593d6130cf5b6d1c4ac57862920746499b198b00b7259a36c992c991b3911d6376852c97@tcp://canopy-seed1.us.nodefleet.net" ], "bannedPeerIDs": null,