Skip to content

Add nginx routing through port for clickhouse servers #432

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

Merged
LDiazN merged 2 commits into from
May 21, 2026
Merged

Add nginx routing through port for clickhouse servers #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90a8698
Add nginx routing through port for clickhouse servers
LDiazN May 20, 2026
73be721
Add clickhouse url values in host vars
LDiazN May 21, 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
4 changes: 3 additions & 1 deletion ansible/host_vars/clickhouseproxy.dev.ooni.io/vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
clickhouse_url: "clickhouse3.prod.ooni.io"
clickhouse_url: "clickhouse3.prod.ooni.io"
clickhouse_url_1: "clickhouse3.prod.ooni.io"
clickhouse_url_2: "clickhouse3.prod.ooni.io"
4 changes: 3 additions & 1 deletion ansible/host_vars/clickhouseproxy.prod.ooni.io/vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
clickhouse_url: "clickhouse2.prod.ooni.io"
clickhouse_url: "clickhouse1.prod.ooni.io"
clickhouse_url_1: "clickhouse1.prod.ooni.io"
clickhouse_url_2: "clickhouse2.prod.ooni.io"
5 changes: 4 additions & 1 deletion ansible/roles/clickhouse_proxy/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
tls_cert_dir: /var/lib/dehydrated/certs
tls_cert_dir: /var/lib/dehydrated/certs
clickhouse_port: 9000
clickhouse_url_1: "{{ clickhouse_url }}"
Comment thread
aagbsn marked this conversation as resolved.
clickhouse_url_2: "{{ clickhouse_url }}"
12 changes: 8 additions & 4 deletions ansible/roles/clickhouse_proxy/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,19 @@
- name: Flush all handlers now
meta: flush_handlers

- name: Allow traffic on port 9000
- name: Allow traffic on ClickHouse proxy ports
tags: clickhouse-proxy
blockinfile:
path: /etc/ooni/nftables/tcp/9000.nft
path: "/etc/ooni/nftables/tcp/{{ item }}.nft"
create: yes
block: |
add rule inet filter input tcp dport 9000 counter accept comment "clickhouse"
add rule inet filter input tcp dport {{ item }} counter accept comment "clickhouse proxy"
loop:
- 9000
- 9001
- 9002
notify:
- reload nftables
- reload nftables

- name: Allow traffic on port 9100
tags: prometheus-proxy
Expand Down
25 changes: 23 additions & 2 deletions ansible/roles/clickhouse_proxy/templates/99-stream.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,33 @@
stream {
upstream clickhouse_backend {
upstream clickhouse_default {
server {{ clickhouse_url }}:{{ clickhouse_port }};
}

upstream clickhouse_1 {
server {{ clickhouse_url_1 }}:{{ clickhouse_port }};
}

upstream clickhouse_2 {
server {{ clickhouse_url_2 }}:{{ clickhouse_port }};
}

# Port-based routing on clickhouseproxy.<env>.ooni.io:
# 9000 -> clickhouse_url (default)
# 9001 -> clickhouse_url_1
# 9002 -> clickhouse_url_2
server {
listen 9000;
proxy_pass clickhouse_default;
}

proxy_pass clickhouse_backend;
server {
listen 9001;
proxy_pass clickhouse_1;
}

server {
listen 9002;
proxy_pass clickhouse_2;
}

error_log /var/log/nginx/error.log;
Expand Down
2 changes: 1 addition & 1 deletion tf/environments/dev/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,7 @@ module "ooni_clickhouse_proxy" {
cidr_blocks = ["0.0.0.0/0"],
}, {
from_port = 9000,
to_port = 9000,
to_port = 9002, // for several clickhouse instances
protocol = "tcp",
cidr_blocks = concat(module.network.vpc_subnet_private[*].cidr_block, ["${module.ooni_fastpath.aws_instance_private_ip}/32", "${module.ooni_fastpath.aws_instance_public_ip}/32"],
["${module.ooniapi_testlists.aws_instance_private_ip}/32", "${module.ooniapi_testlists.aws_instance_public_ip}/32"]),
Expand Down
2 changes: 1 addition & 1 deletion tf/environments/prod/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ module "ooni_clickhouse_proxy" {
cidr_blocks = ["0.0.0.0/0"],
}, {
from_port = 9000,
to_port = 9000,
to_port = 9002, // for several clickhouse instances
protocol = "tcp",
cidr_blocks = concat(
module.network.vpc_subnet_public[*].cidr_block,
Expand Down
Loading