Debugging click cluster setup

ooni · Nov 12, 2024 · 12fee2b · 12fee2b
1 parent 87acee4
commit 12fee2b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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