From 3551927628240a51b6ae855fbe84b5201d6346f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arturo=20Filast=C3=B2?= Date: Wed, 8 Apr 2026 10:54:40 +0200 Subject: [PATCH 1/3] Drop backend-hel from inventory and prometheus scraping --- ansible/inventory | 4 ++-- ansible/roles/prometheus/templates/prometheus.yml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ansible/inventory b/ansible/inventory index e48af402..3ce780b4 100644 --- a/ansible/inventory +++ b/ansible/inventory @@ -23,8 +23,8 @@ openvpn1.htz-fsn.prod.ooni.nu openvpn2.htz-fsn.prod.ooni.nu backend-fsn.ooni.org -[htz_hel] -backend-hel.ooni.org +#[htz_hel] +#backend-hel.ooni.org [ghs_ams] ams-slack-1.ooni.org diff --git a/ansible/roles/prometheus/templates/prometheus.yml b/ansible/roles/prometheus/templates/prometheus.yml index ba107dc2..bee23c9e 100755 --- a/ansible/roles/prometheus/templates/prometheus.yml +++ b/ansible/roles/prometheus/templates/prometheus.yml @@ -163,7 +163,6 @@ scrape_configs: static_configs: - targets: - backend-fsn.ooni.org:19999 - - backend-hel.ooni.org:19999 - job_name: 'ooni-api' scrape_interval: 5s From 2cf88b475dad1ef9941477729814558bd099b269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arturo=20Filast=C3=B2?= Date: Wed, 8 Apr 2026 10:57:00 +0200 Subject: [PATCH 2/3] Drop backend-hel from allow list in clickhouse --- ansible/group_vars/clickhouse/vars.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/ansible/group_vars/clickhouse/vars.yml b/ansible/group_vars/clickhouse/vars.yml index e97ff16b..bccd20b4 100644 --- a/ansible/group_vars/clickhouse/vars.yml +++ b/ansible/group_vars/clickhouse/vars.yml @@ -7,8 +7,6 @@ nftables_clickhouse_allow: ip: 168.119.7.188 - fqdn: notebook1.htz-fsn.prod.ooni.nu ip: 138.201.19.39 - - fqdn: backend-hel.ooni.org - ip: 65.108.192.151 - fqdn: backend-fsn.ooni.org ip: 162.55.247.208 - fqdn: monitoring.ooni.org From d2224efa4ea628441527eb37441dc27432fcd8fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arturo=20Filast=C3=B2?= Date: Wed, 8 Apr 2026 10:57:11 +0200 Subject: [PATCH 3/3] Point reverse proxy to backend-fsn --- tf/environments/dev/main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tf/environments/dev/main.tf b/tf/environments/dev/main.tf index 89157c64..17780b54 100644 --- a/tf/environments/dev/main.tf +++ b/tf/environments/dev/main.tf @@ -664,7 +664,7 @@ module "ooniapi_reverseproxy" { } task_environment = { - TARGET_URL = "https://backend-hel.ooni.org/" + TARGET_URL = "https://backend-fsn.ooni.org/" } ooniapi_service_security_groups = [ @@ -1130,7 +1130,7 @@ module "ooniapi_oonimeasurements" { task_environment = { # it has to be a json-compliant array - OTHER_COLLECTORS = jsonencode(["http://fastpath.${local.environment}.ooni.io:8475", "https://backend-hel.ooni.org"]) + OTHER_COLLECTORS = jsonencode(["http://fastpath.${local.environment}.ooni.io:8475", "https://backend-fsn.ooni.org"]) BASE_URL = "https://api.${local.environment}.ooni.io" S3_BUCKET_NAME = "ooni-data-eu-fra-test" VALKEY_URL = local.ooniapi_valkey_url