From a881eebc85cae38b858647103b89158702828654 Mon Sep 17 00:00:00 2001 From: Sergey Klimuk Date: Fri, 28 Jun 2024 14:25:03 +0300 Subject: [PATCH 1/2] Enable logging to grafana --- operations/deploy-dev.hcl | 10 ++++++++-- operations/deploy-live.hcl | 10 ++++++++-- operations/deploy-stage.hcl | 10 ++++++++-- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/operations/deploy-dev.hcl b/operations/deploy-dev.hcl index 838e4f9..c62c420 100644 --- a/operations/deploy-dev.hcl +++ b/operations/deploy-dev.hcl @@ -101,7 +101,7 @@ ORPort {{ env `NOMAD_PORT_orport` }} service { name = "sbws-relay-dev" provider = "nomad" - tags = ["sbws"] + tags = ["sbws", "logging"] port = "control-port" } } @@ -127,6 +127,12 @@ ORPort {{ env `NOMAD_PORT_orport` }} ] } + service { + name = "sbws-scanner-dev-task" + provider = "nomad" + tags = ["logging"] + } + resources { cpu = 1000 memory = 1000 @@ -189,7 +195,7 @@ external_control_port = {{ env `NOMAD_PORT_control_port` }} service { name = "sbws-destination-dev" provider = "nomad" - tags = ["sbws"] + tags = ["sbws", "logging"] port = "http-port" check { name = "sbws destination nginx http server alive" diff --git a/operations/deploy-live.hcl b/operations/deploy-live.hcl index 5c28248..eb4209a 100644 --- a/operations/deploy-live.hcl +++ b/operations/deploy-live.hcl @@ -101,7 +101,7 @@ ORPort {{ env `NOMAD_PORT_orport` }} service { name = "sbws-relay-live" provider = "nomad" - tags = ["sbws"] + tags = ["sbws", "logging"] port = "control-port" } } @@ -127,6 +127,12 @@ ORPort {{ env `NOMAD_PORT_orport` }} ] } + service { + name = "sbws-scanner-live-task" + provider = "nomad" + tags = ["logging"] + } + resources { cpu = 1000 memory = 1500 @@ -189,7 +195,7 @@ external_control_port = {{ env `NOMAD_PORT_control_port` }} service { name = "sbws-destination-live" provider = "nomad" - tags = ["sbws"] + tags = ["sbws", "logging"] port = "http-port" check { name = "sbws destination nginx http server alive" diff --git a/operations/deploy-stage.hcl b/operations/deploy-stage.hcl index 904de6a..a0ed0d5 100644 --- a/operations/deploy-stage.hcl +++ b/operations/deploy-stage.hcl @@ -101,7 +101,7 @@ ORPort {{ env `NOMAD_PORT_orport` }} service { name = "sbws-relay-stage" provider = "nomad" - tags = ["sbws"] + tags = ["sbws", "logging"] port = "control-port" } } @@ -127,6 +127,12 @@ ORPort {{ env `NOMAD_PORT_orport` }} ] } + service { + name = "sbws-scanner-stage-task" + provider = "nomad" + tags = ["logging"] + } + resources { cpu = 1000 memory = 1500 @@ -189,7 +195,7 @@ external_control_port = {{ env `NOMAD_PORT_control_port` }} service { name = "sbws-destination-stage" provider = "nomad" - tags = ["sbws"] + tags = ["sbws", "logging"] port = "http-port" check { name = "sbws destination nginx http server alive" From 832568d9cad0d5a905465af37250dcf1667e9103 Mon Sep 17 00:00:00 2001 From: Yurii Kovalchuk <103324562+yumirkov@users.noreply.github.com> Date: Fri, 12 Jul 2024 14:15:43 +0300 Subject: [PATCH 2/2] ATOR-368 - Restart permission reset (#17) --- docker/scanner/docker-entrypoint.sh | 2 ++ operations/deploy-live.hcl | 24 ++++++++++++++++++------ operations/deploy-stage.hcl | 4 ++-- sbws/lib/v3bwfile.py | 2 +- 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/docker/scanner/docker-entrypoint.sh b/docker/scanner/docker-entrypoint.sh index 1a652b1..7927253 100755 --- a/docker/scanner/docker-entrypoint.sh +++ b/docker/scanner/docker-entrypoint.sh @@ -7,4 +7,6 @@ crontab -l | { cat; echo "35 0 * * * /usr/local/bin/sbws -c /root/.sbws.ini cle service cron start +chmod -R 644 /root/.sbws/v3bw + sbws scanner diff --git a/operations/deploy-live.hcl b/operations/deploy-live.hcl index eb4209a..5c05582 100644 --- a/operations/deploy-live.hcl +++ b/operations/deploy-live.hcl @@ -4,19 +4,31 @@ job "sbws-live" { namespace = "ator-network" group "sbws-live-group" { - count = 3 + count = 7 spread { attribute = "${node.unique.id}" weight = 100 target "067a42a8-d8fe-8b19-5851-43079e0eabb4" { - percent = 34 + percent = 14 } target "16be0723-edc1-83c4-6c02-193d96ec308a" { - percent = 33 + percent = 14 } target "e6e0baed-8402-fd5c-7a15-8dd49e7b60d9" { - percent = 33 + percent = 14 + } + target "5ace4a92-63c4-ac72-3ed1-e4485fa0d4a4" { + percent = 14 + } + target "eb42c498-e7a8-415f-14e9-31e9e71e5707" { + percent = 14 + } + target "4aa61f61-893a-baf4-541b-870e99ac4839" { + percent = 15 + } + target "c2adc610-6316-cd9d-c678-cda4b0080b52" { + percent = 15 } } @@ -67,8 +79,8 @@ job "sbws-live" { } resources { - cpu = 256 - memory = 128 + cpu = 512 + memory = 1024 } template { diff --git a/operations/deploy-stage.hcl b/operations/deploy-stage.hcl index a0ed0d5..e48a27c 100644 --- a/operations/deploy-stage.hcl +++ b/operations/deploy-stage.hcl @@ -67,8 +67,8 @@ job "sbws-stage" { } resources { - cpu = 256 - memory = 128 + cpu = 512 + memory = 1024 } template { diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index a1a9e56..1c96ca0 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -1504,7 +1504,7 @@ def read_number_consensus_relays(consensus_path): "percentage of measured relays because the cached " "consensus file is not found." ) - log.debug("Number of relays in the network %s", num) + log.info("Number of relays in the network %s", num) return num @staticmethod