Skip to content

Fix 469 nginx notebook1 collision #470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aagbsn wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Fix 469 nginx notebook1 collision #470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e06ea80
refer to notebook.ooni.org by its backend domain name
aagbsn Jul 29, 2026
d6fc414
fix typo in ssl_domains hostname...
aagbsn Jul 29, 2026
3850717
add notebook.ooni.org as jupyter service tag
aagbsn Jul 29, 2026
489f381
restore notebook1.htz-fsn.prod.ooni.nu in deploy-notebook.yml
aagbsn Jul 29, 2026
c2488db
Revert "add notebook.ooni.org as jupyter service tag"
aagbsn Jul 29, 2026
17da96b
prometheus: revert notebook.ooni.org to notebook1.htz-fsn.prod.ooni.nu
aagbsn Jul 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ansible/deploy-clickhouse.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 2 additions & 3 deletions ansible/deploy-notebook.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion ansible/host_vars/notebook.ooni.org → .../host_vars/notebook1.htz-fsn.prod.ooni.nu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions ansible/inventory
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ansible/roles/prometheus/templates/prometheus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading