From 12fee2b02831089d8614d864e3bb92025708a884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arturo=20Filast=C3=B2?= Date: Tue, 12 Nov 2024 13:24:27 +0100 Subject: [PATCH] Debugging click cluster setup --- ansible/group_vars/clickhouse/vars.yml | 10 +++++----- ansible/host_vars/notebook.ooni.org | 5 +++-- ansible/inventory | 1 + ansible/playbook.yml | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ansible/group_vars/clickhouse/vars.yml b/ansible/group_vars/clickhouse/vars.yml index 75b4ec8..f2a771f 100644 --- a/ansible/group_vars/clickhouse/vars.yml +++ b/ansible/group_vars/clickhouse/vars.yml @@ -59,13 +59,14 @@ clickhouse_remote_servers: secret: "{{ lookup('amazon.aws.aws_secret', 'oonidevops/clickhouse_oonidata_cluster_secret', profile='oonidevops_user_prod') }}" shards: - shard: + internal_replication: true replicas: - 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 @@ -89,8 +90,7 @@ clickhouse_default_users: quota: default - user: name: write - password: "{{ lookup('amazon.aws.aws_secret', 'oonidevops/clickhouse_write_password', profile='oonidevops_user_prod') | hash('sha256') }}" - password_type: "SHA256_PASSWORD" + password_sha256_hex: "{{ lookup('amazon.aws.aws_secret', 'oonidevops/clickhouse_write_password', profile='oonidevops_user_prod') | hash('sha256') }}" networks: - "0.0.0.0/0" profile: write diff --git a/ansible/host_vars/notebook.ooni.org b/ansible/host_vars/notebook.ooni.org index 0ae1642..725e477 100644 --- a/ansible/host_vars/notebook.ooni.org +++ b/ansible/host_vars/notebook.ooni.org @@ -72,6 +72,8 @@ admin_group_name: admin clickhouse_default_profiles: default: readonly: 1 + write: + readonly: 1 clickhouse_listen_hosts: - "127.0.0.1" @@ -86,8 +88,7 @@ clickhouse_default_users: quota: default - user: name: write - password: "{{ lookup('amazon.aws.aws_secret', 'oonidevops/clickhouse_write_password', profile='oonidevops_user_prod') | hash('sha256') }}" - password_type: "SHA256_PASSWORD" + password_sha256_hex: "{{ lookup('amazon.aws.aws_secret', 'oonidevops/clickhouse_write_password', profile='oonidevops_user_prod') | hash('sha256') }}" networks: - "127.0.0.1" profile: write diff --git a/ansible/inventory b/ansible/inventory index 6134062..25f1f5d 100644 --- a/ansible/inventory +++ b/ansible/inventory @@ -16,6 +16,7 @@ data3.htz-fsn.prod.ooni.nu oonidatatest.ooni.nu [clickhouse] +notebook.ooni.org data1.htz-fsn.prod.ooni.nu data2.htz-fsn.prod.ooni.nu data3.htz-fsn.prod.ooni.nu diff --git a/ansible/playbook.yml b/ansible/playbook.yml index d9a53bf..eadd5a7 100644 --- a/ansible/playbook.yml +++ b/ansible/playbook.yml @@ -25,7 +25,7 @@ - name: Deploy oonidata clickhouse hosts hosts: - data1.htz-fsn.prod.ooni.nu - - data2.htz-fsn.prod.ooni.nu + #- data2.htz-fsn.prod.ooni.nu - data3.htz-fsn.prod.ooni.nu - notebook.ooni.org become: true