From 361fcfe34002f9d4a36d3c9207504fffbf428173 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arturo=20Filast=C3=B2?= <arturo@filasto.net>
Date: Mon, 22 Apr 2024 15:44:02 +0200
Subject: [PATCH 1/2] Move 3.th.ooni.org over to AWS

---
 tf/environments/prod/dns_records.tf | 17 -----------------
 tf/environments/prod/main.tf        |  5 ++---
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/tf/environments/prod/dns_records.tf b/tf/environments/prod/dns_records.tf
index 7a970a80..0651fb97 100644
--- a/tf/environments/prod/dns_records.tf
+++ b/tf/environments/prod/dns_records.tf
@@ -1000,23 +1000,6 @@ resource "aws_route53_record" "test-ooni-nu-_NS_" {
 
 ## Records for the th.ooni.org zone
 
-
-resource "aws_route53_record" "_3-th-ooni-org-_AAAA_" {
-  name    = "3.th.ooni.org"
-  records = ["2604:a880:4:1d0::69e:f000"]
-  ttl     = "60"
-  type    = "AAAA"
-  zone_id = local.dns_root_zone_ooni_org
-}
-
-resource "aws_route53_record" "_3-th-ooni-org-_A_" {
-  name    = "3.th.ooni.org"
-  records = ["146.190.119.3"]
-  ttl     = "60"
-  type    = "A"
-  zone_id = local.dns_root_zone_ooni_org
-}
-
 resource "aws_route53_record" "_2-th-ooni-org-_A_" {
   name    = "2.th.ooni.org"
   records = ["161.35.89.250"]
diff --git a/tf/environments/prod/main.tf b/tf/environments/prod/main.tf
index 87401b14..9cbe7ead 100644
--- a/tf/environments/prod/main.tf
+++ b/tf/environments/prod/main.tf
@@ -563,9 +563,8 @@ module "oonith_oohelperd" {
   }
 
   alternative_names = {
-    "4.th.ooni.org" = local.dns_root_zone_ooni_org,
-    "5.th.ooni.org" = local.dns_root_zone_ooni_org,
-    "6.th.ooni.org" = local.dns_root_zone_ooni_org,
+    "3.th.ooni.org" = local.dns_root_zone_ooni_org,
+    "4.th.ooni.org" = local.dns_root_zone_ooni_org
   }
 
   oonith_service_security_groups = [

From 3692093fe6a98360f8aee90c6a0b09f7e553af21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arturo=20Filast=C3=B2?= <arturo@filasto.net>
Date: Mon, 22 Apr 2024 15:46:40 +0200
Subject: [PATCH 2/2] Update prometheus monitoring targets

---
 ansible/roles/prometheus/templates/prometheus.yml | 3 ---
 ansible/roles/prometheus/vars/main.yml            | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/ansible/roles/prometheus/templates/prometheus.yml b/ansible/roles/prometheus/templates/prometheus.yml
index 81ce2485..93c2e2af 100755
--- a/ansible/roles/prometheus/templates/prometheus.yml
+++ b/ansible/roles/prometheus/templates/prometheus.yml
@@ -88,8 +88,6 @@ scrape_configs:
         - 0.th.ooni.org:19999
         - 1.th.ooni.org:19999
         - 2.th.ooni.org:19999
-        - 3.th.ooni.org:19999
-        # - 2.th.ooni.org:19999
 
   - job_name: 'test-helpers'
     scrape_interval: 5s
@@ -100,7 +98,6 @@ scrape_configs:
         - 0.th.ooni.org:9001
         - 1.th.ooni.org:9001
         - 2.th.ooni.org:9001
-        - 3.th.ooni.org:9001
 
   - job_name: 'ooni-api'
     scrape_interval: 5s
diff --git a/ansible/roles/prometheus/vars/main.yml b/ansible/roles/prometheus/vars/main.yml
index cb0da57d..90d6a45c 100644
--- a/ansible/roles/prometheus/vars/main.yml
+++ b/ansible/roles/prometheus/vars/main.yml
@@ -27,6 +27,7 @@ blackbox_jobs:
       - "https://1.th.ooni.org/"
       - "https://2.th.ooni.org/"
       - "https://3.th.ooni.org/"
+      - "https://4.th.ooni.org/"
 
   - name: "ooni collector"
     module: "ooni_collector_ok"