Skip to content

Add clickhouse2 #427

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

Draft
aagbsn wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

Add clickhouse2 #427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5c241fd
update nftables rule for data2 (clickhouse2)
aagbsn May 14, 2026
2f8137c
node_exporter: use dehydrated when use_https is enabled
aagbsn May 15, 2026
dffc917
add data2 to prometheus.yml
aagbsn May 15, 2026
f968e02
Merge remote-tracking branch 'origin/main' into add_clickhouse2
aagbsn May 18, 2026
ac1cdc4
throttle replication to 50% of capacity
aagbsn May 18, 2026
e462074
re-add default admin profile, missing on notebook1
aagbsn May 18, 2026
a09d8eb
remove clickhouse_version override from notebook1
aagbsn May 18, 2026
6221f8f
add extra domains to dehydrated
aagbsn May 18, 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
Expand Up @@ -3,7 +3,7 @@
hosts:
- notebook1.htz-fsn.prod.ooni.nu
- data1.htz-fsn.prod.ooni.nu
# - data2.htz-fsn.prod.ooni.nu
- data2.htz-fsn.prod.ooni.nu
- data3.htz-fsn.prod.ooni.nu
become: true
tags:
Expand Down
16 changes: 11 additions & 5 deletions ansible/group_vars/clickhouse/vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ nftables_clickhouse_allow:
- fqdn: data1.htz-fsn.prod.ooni.nu
ip: 142.132.254.225
- fqdn: data2.htz-fsn.prod.ooni.nu
ip: 88.198.54.12
ip: 23.88.74.249
- fqdn: data3.htz-fsn.prod.ooni.nu
ip: 168.119.7.188
- fqdn: notebook1.htz-fsn.prod.ooni.nu
Expand All @@ -26,7 +26,7 @@ nftables_zookeeper_allow:
- fqdn: data1.htz-fsn.prod.ooni.nu
ip: 142.132.254.225
- fqdn: data2.htz-fsn.prod.ooni.nu
ip: 88.198.54.12
ip: 23.88.74.249
- fqdn: data3.htz-fsn.prod.ooni.nu
ip: 168.119.7.188
- fqdn: notebook1.htz-fsn.prod.ooni.nu
Expand All @@ -41,6 +41,9 @@ clickhouse_config:
max_server_memory_usage: 0
max_thread_pool_size: 10000
max_server_memory_usage_to_ram_ratio: 0.9
# for 1GB/s 50% utilization cap
max_replicated_sends_network_bandwidth_for_server: 62500000
max_replicated_fetches_network_bandwidth_for_server: 62500000
total_memory_profiler_step: 4194304
total_memory_tracker_sample_probability: 0
uncompressed_cache_size: 8589934592
Expand Down Expand Up @@ -113,6 +116,9 @@ clickhouse_zookeeper:
- node:
host: clickhouse1.prod.ooni.io
port: 9181
# - node:
# host: clickhouse2.prod.ooni.io
# port: 9181
- node:
host: clickhouse3.prod.ooni.io
port: 9181
Expand All @@ -131,9 +137,9 @@ clickhouse_remote_servers:
- replica:
host: clickhouse1.prod.ooni.io
port: 9000
#- replica:
# host: clickhouse2.prod.ooni.io
# port: 9000
- replica:
host: clickhouse2.prod.ooni.io
port: 9000
- replica:
host: clickhouse3.prod.ooni.io
port: 9000
Expand Down
4 changes: 4 additions & 0 deletions ansible/host_vars/data1.htz-fsn.prod.ooni.nu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# configure extra domains for dehydrated
ssl_domains:
- data1.htz-fns.pr:qod.ooni.nu
- airflow.prod.ooni.io
8 changes: 7 additions & 1 deletion ansible/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 @@ -136,8 +136,9 @@ clickhouse_default_profiles:
readonly: 2
write:
readonly: 0
admin:
readonly: 0

clickhouse_version: "24.10.2.80"
clickhouse_release_type: stable
clickhouse_listen_hosts:
- "127.0.0.1"
Expand All @@ -160,3 +161,8 @@ clickhouse_default_users:
- "127.0.0.1"
profile: write
quota: default

# configure extra domains for dehydrated
ssl_domains:
- notebook1.htz-fns.prod.ooni.nu
- notebook.ooni.org
2 changes: 2 additions & 0 deletions ansible/inventory
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ ghs_ams
[clickhouse]
notebook1.htz-fsn.prod.ooni.nu
data1.htz-fsn.prod.ooni.nu
data2.htz-fsn.prod.ooni.nu
data3.htz-fsn.prod.ooni.nu

[airflow]
Expand All @@ -18,6 +19,7 @@ data1.htz-fsn.prod.ooni.nu
monitoring.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
openvpn1.htz-fsn.prod.ooni.nu
openvpn2.htz-fsn.prod.ooni.nu
Expand Down
2 changes: 2 additions & 0 deletions ansible/roles/prometheus/templates/prometheus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ scrape_configs:
static_configs:
- targets:
- 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://notebook1.htz-fsn.prod.ooni.nu/metrics/node_exporter
- http://0.do.th.prod.ooni.io:9001/metrics
Expand Down Expand Up @@ -151,6 +152,7 @@ scrape_configs:
static_configs:
- targets:
- data1.htz-fsn.prod.ooni.nu
- data2.htz-fsn.prod.ooni.nu
- data3.htz-fsn.prod.ooni.nu
- notebook1.htz-fsn.prod.ooni.nu

Expand Down
Loading