From e06ea805ec344d8d963eae4af2d46b42f784db6d Mon Sep 17 00:00:00 2001 From: Aaron Gibson Date: Wed, 29 Jul 2026 14:38:21 +0200 Subject: [PATCH 1/6] refer to notebook.ooni.org by its backend domain name this avoids the collision of prometheus_node_exporter and nginx configuration for jupyter; we renamed notebook when ooni.nu was suspended and realized that this causes deployment problems because the ansible roles that deploy nginx configurations write the same hostname, causing only one site to be enabled. --- ansible/deploy-clickhouse.yml | 2 +- .../{notebook.ooni.org => notebook1.htz-fsn.prod.ooni.nu} | 0 ansible/inventory | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename ansible/host_vars/{notebook.ooni.org => notebook1.htz-fsn.prod.ooni.nu} (100%) diff --git a/ansible/deploy-clickhouse.yml b/ansible/deploy-clickhouse.yml index 630d1736..b047ae67 100644 --- a/ansible/deploy-clickhouse.yml +++ b/ansible/deploy-clickhouse.yml @@ -1,7 +1,7 @@ --- - name: Deploy oonidata clickhouse hosts hosts: - - notebook.ooni.org + - notebook1.htz-fsn.prod.ooni.nu - data1.htz-fsn.prod.ooni.nu - data2.htz-fsn.prod.ooni.nu - data3.htz-fsn.prod.ooni.nu diff --git a/ansible/host_vars/notebook.ooni.org b/ansible/host_vars/notebook1.htz-fsn.prod.ooni.nu similarity index 100% rename from ansible/host_vars/notebook.ooni.org rename to ansible/host_vars/notebook1.htz-fsn.prod.ooni.nu diff --git a/ansible/inventory b/ansible/inventory index 8b2a9211..9a878bf1 100644 --- a/ansible/inventory +++ b/ansible/inventory @@ -5,7 +5,7 @@ ghs_ams ## Role tags [clickhouse] -notebook.ooni.org +notebook1.htz-fsn.prod.ooni.nu data1.htz-fsn.prod.ooni.nu data2.htz-fsn.prod.ooni.nu data3.htz-fsn.prod.ooni.nu @@ -17,7 +17,7 @@ data1.htz-fsn.prod.ooni.nu [htz_fsn] monitoring.ooni.org -notebook.ooni.org +notebook1.htz-fsn.prod.ooni.nu data1.htz-fsn.prod.ooni.nu data2.htz-fsn.prod.ooni.nu data3.htz-fsn.prod.ooni.nu From d6fc4149522f10d15114083e65c634182e32fa68 Mon Sep 17 00:00:00 2001 From: Aaron Gibson Date: Wed, 29 Jul 2026 14:58:40 +0200 Subject: [PATCH 2/6] fix typo in ssl_domains hostname... --- ansible/host_vars/notebook1.htz-fsn.prod.ooni.nu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/host_vars/notebook1.htz-fsn.prod.ooni.nu b/ansible/host_vars/notebook1.htz-fsn.prod.ooni.nu index 2b68cbfc..e20463d9 100644 --- a/ansible/host_vars/notebook1.htz-fsn.prod.ooni.nu +++ b/ansible/host_vars/notebook1.htz-fsn.prod.ooni.nu @@ -165,5 +165,5 @@ clickhouse_default_users: # configure extra domains for dehydrated ssl_domains: - - notebook1.htz-fns.prod.ooni.nu + - notebook1.htz-fsn.prod.ooni.nu - notebook.ooni.org From 38507174dabfc39d392746d5045f550c6320f802 Mon Sep 17 00:00:00 2001 From: Aaron Gibson Date: Wed, 29 Jul 2026 15:05:09 +0200 Subject: [PATCH 3/6] add notebook.ooni.org as jupyter service tag --- ansible/inventory | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ansible/inventory b/ansible/inventory index 9a878bf1..00abe935 100644 --- a/ansible/inventory +++ b/ansible/inventory @@ -13,6 +13,9 @@ data3.htz-fsn.prod.ooni.nu [airflow] data1.htz-fsn.prod.ooni.nu +[jupyter] +notebook.ooni.org + ## Location tags [htz_fsn] From 489f38128c21b4e6adfe22e9b03e276e20da9e9c Mon Sep 17 00:00:00 2001 From: Aaron Gibson Date: Wed, 29 Jul 2026 15:12:02 +0200 Subject: [PATCH 4/6] restore notebook1.htz-fsn.prod.ooni.nu in deploy-notebook.yml to avoid needing two sets of host_vars for notebook.ooni.org and notebook1.htz-fsn.prod.ooni.nu, we use the canonical infrastructure domain for deployments and specify the additional ssl_domains to be maintained by dehydrated in the host_vars --- ansible/deploy-notebook.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ansible/deploy-notebook.yml b/ansible/deploy-notebook.yml index 318f62e4..6701b6c6 100644 --- a/ansible/deploy-notebook.yml +++ b/ansible/deploy-notebook.yml @@ -1,12 +1,11 @@ --- - name: Deploy notebook host - hosts: notebook.ooni.org + hosts: notebook1.htz-fsn.prod.ooni.nu become: true tags: - notebook vars: notebook_domain: "notebook.ooni.org" - ssl_domains: - - "{{ inventory_hostname }}" + ssl_domains: "{{ hostvars[inventory_hostname].ssl_domains | default([inventory_hostname]) }}" roles: - notebook From c2488db796e5d6ecb8f6b8d4ec171d8248bf316a Mon Sep 17 00:00:00 2001 From: Aaron Gibson Date: Wed, 29 Jul 2026 15:13:48 +0200 Subject: [PATCH 5/6] Revert "add notebook.ooni.org as jupyter service tag" This reverts commit 38507174dabfc39d392746d5045f550c6320f802. do not complicate things by adding multiple references to the same host --- ansible/inventory | 3 --- 1 file changed, 3 deletions(-) diff --git a/ansible/inventory b/ansible/inventory index 00abe935..9a878bf1 100644 --- a/ansible/inventory +++ b/ansible/inventory @@ -13,9 +13,6 @@ data3.htz-fsn.prod.ooni.nu [airflow] data1.htz-fsn.prod.ooni.nu -[jupyter] -notebook.ooni.org - ## Location tags [htz_fsn] From 17da96bb931a8a55e9b6434d01577f02b93e0d37 Mon Sep 17 00:00:00 2001 From: Aaron Gibson Date: Wed, 29 Jul 2026 15:19:02 +0200 Subject: [PATCH 6/6] prometheus: revert notebook.ooni.org to notebook1.htz-fsn.prod.ooni.nu --- ansible/roles/prometheus/templates/prometheus.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/prometheus/templates/prometheus.yml b/ansible/roles/prometheus/templates/prometheus.yml index 2790f27e..ed675d0d 100755 --- a/ansible/roles/prometheus/templates/prometheus.yml +++ b/ansible/roles/prometheus/templates/prometheus.yml @@ -83,7 +83,7 @@ scrape_configs: - https://data1.htz-fsn.prod.ooni.nu/metrics/node_exporter - https://data2.htz-fsn.prod.ooni.nu/metrics/node_exporter - https://data3.htz-fsn.prod.ooni.nu/metrics/node_exporter - - https://notebook.ooni.org/metrics/node_exporter + - https://notebook1.htz-fsn.prod.ooni.nu/metrics/node_exporter - http://0.do.th.prod.ooni.io:9001/metrics - http://1.do.th.prod.ooni.io:9001/metrics - http://2.do.th.prod.ooni.io:9001/metrics @@ -154,7 +154,7 @@ scrape_configs: - data1.htz-fsn.prod.ooni.nu - data2.htz-fsn.prod.ooni.nu - data3.htz-fsn.prod.ooni.nu - - notebook.ooni.org + - notebook1.htz-fsn.prod.ooni.nu - job_name: 'raw-netdata' scrape_interval: 5s