From 41626fef5adb431c80de1bdabe77db587aec3dc8 Mon Sep 17 00:00:00 2001
From: Mohamed Marrouchi <marrouchi.mohamed@gmail.com>
Date: Thu, 25 Jan 2024 17:05:49 +0100
Subject: [PATCH] fix: clickhouse cluster

---
 .../cluster_configs/docker_related_config.xml |  13 --
 .../cluster_configs/macros_01.xml             |  10 -
 .../cluster_configs/macros_02.xml             |  10 -
 .../cluster_configs/macros_03.xml             |  10 -
 .../cluster_configs/macros_04.xml             |  10 -
 .../cluster_configs/remote_servers.xml        |  21 --
 .../cluster_configs/use_keeper.xml            |  20 --
 .../etc/clickhouse-server/config.d/config.xml |  62 ++++++
 .../etc/clickhouse-server/users.d/users.xml   |  37 ++++
 .../etc/clickhouse-server/config.d/config.xml |  62 ++++++
 .../etc/clickhouse-server/users.d/users.xml   |  37 ++++
 .../etc/clickhouse-server/config.d/config.xml |  62 ++++++
 .../etc/clickhouse-server/users.d/users.xml   |  37 ++++
 .../etc/clickhouse-keeper/keeper_config.xml}  |  20 +-
 .../etc/clickhouse-keeper/keeper_config.xml}  |  20 +-
 .../etc/clickhouse-keeper/keeper_config.xml}  |  20 +-
 .../docker-compose.cluster.dev.yml            |  40 ++--
 .../docker-compose.cluster.yml                | 180 +++++++-----------
 .../docker-compose.dev.yml                    |   4 +-
 .../docker-compose.yml                        |   2 +-
 .../importer/config/clickhouseTables.js       |  12 +-
 .../package-metadata.json                     |   2 +-
 22 files changed, 432 insertions(+), 259 deletions(-)
 delete mode 100644 analytics-datastore-clickhouse/cluster_configs/docker_related_config.xml
 delete mode 100644 analytics-datastore-clickhouse/cluster_configs/macros_01.xml
 delete mode 100644 analytics-datastore-clickhouse/cluster_configs/macros_02.xml
 delete mode 100644 analytics-datastore-clickhouse/cluster_configs/macros_03.xml
 delete mode 100644 analytics-datastore-clickhouse/cluster_configs/macros_04.xml
 delete mode 100644 analytics-datastore-clickhouse/cluster_configs/remote_servers.xml
 delete mode 100644 analytics-datastore-clickhouse/cluster_configs/use_keeper.xml
 create mode 100644 analytics-datastore-clickhouse/configs/clickhouse-01/etc/clickhouse-server/config.d/config.xml
 create mode 100644 analytics-datastore-clickhouse/configs/clickhouse-01/etc/clickhouse-server/users.d/users.xml
 create mode 100644 analytics-datastore-clickhouse/configs/clickhouse-02/etc/clickhouse-server/config.d/config.xml
 create mode 100644 analytics-datastore-clickhouse/configs/clickhouse-02/etc/clickhouse-server/users.d/users.xml
 create mode 100644 analytics-datastore-clickhouse/configs/clickhouse-03/etc/clickhouse-server/config.d/config.xml
 create mode 100644 analytics-datastore-clickhouse/configs/clickhouse-03/etc/clickhouse-server/users.d/users.xml
 rename analytics-datastore-clickhouse/{cluster_configs/enable_keeper_01.xml => configs/clickhouse-keeper-01/etc/clickhouse-keeper/keeper_config.xml} (60%)
 rename analytics-datastore-clickhouse/{cluster_configs/enable_keeper_02.xml => configs/clickhouse-keeper-02/etc/clickhouse-keeper/keeper_config.xml} (60%)
 rename analytics-datastore-clickhouse/{cluster_configs/enable_keeper_03.xml => configs/clickhouse-keeper-03/etc/clickhouse-keeper/keeper_config.xml} (60%)

diff --git a/analytics-datastore-clickhouse/cluster_configs/docker_related_config.xml b/analytics-datastore-clickhouse/cluster_configs/docker_related_config.xml
deleted file mode 100644
index 302483e3..00000000
--- a/analytics-datastore-clickhouse/cluster_configs/docker_related_config.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<clickhouse>
-     <!-- Listen wildcard address to allow accepting connections from other containers and host network. -->
-    <listen_host>::</listen_host>
-    <listen_host>0.0.0.0</listen_host>
-    <listen_try>1</listen_try>
-
-    <!-- Uncomment this during dev debugging -->
-    <!--
-    <logger>
-        <console>1</console>
-    </logger>
-    -->
-</clickhouse>
diff --git a/analytics-datastore-clickhouse/cluster_configs/macros_01.xml b/analytics-datastore-clickhouse/cluster_configs/macros_01.xml
deleted file mode 100644
index 6b8bfcd4..00000000
--- a/analytics-datastore-clickhouse/cluster_configs/macros_01.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<clickhouse>
-    <distributed_ddl>
-            <path>/clickhouse/task_queue/ddl</path>
-    </distributed_ddl>
-    <macros>
-        <cluster>cluster_3R</cluster>
-        <shard>1</shard>
-        <replica>r1</replica>
-    </macros>
-</clickhouse>
diff --git a/analytics-datastore-clickhouse/cluster_configs/macros_02.xml b/analytics-datastore-clickhouse/cluster_configs/macros_02.xml
deleted file mode 100644
index ed814492..00000000
--- a/analytics-datastore-clickhouse/cluster_configs/macros_02.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<clickhouse>
-    <distributed_ddl>
-            <path>/clickhouse/task_queue/ddl</path>
-    </distributed_ddl>
-    <macros>
-        <cluster>cluster_3R</cluster>
-        <shard>1</shard>
-        <replica>r2</replica>
-    </macros>
-</clickhouse>
diff --git a/analytics-datastore-clickhouse/cluster_configs/macros_03.xml b/analytics-datastore-clickhouse/cluster_configs/macros_03.xml
deleted file mode 100644
index 6883f6e8..00000000
--- a/analytics-datastore-clickhouse/cluster_configs/macros_03.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<clickhouse>
-    <distributed_ddl>
-            <path>/clickhouse/task_queue/ddl</path>
-    </distributed_ddl>
-    <macros>
-        <cluster>cluster_3R</cluster>
-        <shard>1</shard>
-        <replica>r3</replica>
-    </macros>
-</clickhouse>
diff --git a/analytics-datastore-clickhouse/cluster_configs/macros_04.xml b/analytics-datastore-clickhouse/cluster_configs/macros_04.xml
deleted file mode 100644
index 56b44e95..00000000
--- a/analytics-datastore-clickhouse/cluster_configs/macros_04.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<clickhouse>
-    <distributed_ddl>
-            <path>/clickhouse/task_queue/ddl</path>
-    </distributed_ddl>
-    <macros>
-        <cluster>cluster_3R</cluster>
-        <shard>1</shard>
-        <replica>r4</replica>
-    </macros>
-</clickhouse>
diff --git a/analytics-datastore-clickhouse/cluster_configs/remote_servers.xml b/analytics-datastore-clickhouse/cluster_configs/remote_servers.xml
deleted file mode 100644
index a400adc7..00000000
--- a/analytics-datastore-clickhouse/cluster_configs/remote_servers.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<clickhouse>
-    <remote_servers>
-        <cluster_3R>
-            <shard>
-                <internal_replication>true</internal_replication>
-                <replica>
-                    <host>analytics-datastore-clickhouse-01</host>
-                    <port>9000</port>
-                </replica>
-                <replica>
-                    <host>analytics-datastore-clickhouse-02</host>
-                    <port>9000</port>
-                </replica>
-                <replica>
-                    <host>analytics-datastore-clickhouse-03</host>
-                    <port>9000</port>
-                </replica>
-            </shard>
-        </cluster_3R>
-    </remote_servers>
-</clickhouse>
diff --git a/analytics-datastore-clickhouse/cluster_configs/use_keeper.xml b/analytics-datastore-clickhouse/cluster_configs/use_keeper.xml
deleted file mode 100644
index 4ce78405..00000000
--- a/analytics-datastore-clickhouse/cluster_configs/use_keeper.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<clickhouse>
-    <zookeeper>
-        <node index="1">
-            <host>analytics-datastore-clickhouse-01</host>
-            <port>9181</port>
-        </node>
-        <node index="2">
-            <host>analytics-datastore-clickhouse-02</host>
-            <port>9181</port>
-        </node>
-        <node index="3">
-            <host>analytics-datastore-clickhouse-03</host>
-            <port>9181</port>
-        </node>
-        <node index="4">
-            <host>analytics-datastore-clickhouse-04</host>
-            <port>9181</port>
-        </node>
-    </zookeeper>
-</clickhouse>
diff --git a/analytics-datastore-clickhouse/configs/clickhouse-01/etc/clickhouse-server/config.d/config.xml b/analytics-datastore-clickhouse/configs/clickhouse-01/etc/clickhouse-server/config.d/config.xml
new file mode 100644
index 00000000..c25020dd
--- /dev/null
+++ b/analytics-datastore-clickhouse/configs/clickhouse-01/etc/clickhouse-server/config.d/config.xml
@@ -0,0 +1,62 @@
+<clickhouse replace="true">
+    <logger>
+        <level>debug</level>
+        <log>/var/log/clickhouse-server/clickhouse-server.log</log>
+        <errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>
+        <size>1000M</size>
+        <count>3</count>
+    </logger>
+    <display_name>cluster_1S_3R node 1</display_name>
+    <listen_host>0.0.0.0</listen_host>
+    <http_port>8123</http_port>
+    <tcp_port>9000</tcp_port>
+    <user_directories>
+        <users_xml>
+            <path>users.xml</path>
+        </users_xml>
+        <local_directory>
+            <path>/var/lib/clickhouse/access/</path>
+        </local_directory>
+    </user_directories>
+    <distributed_ddl>
+        <path>/clickhouse/task_queue/ddl</path>
+    </distributed_ddl>
+    <remote_servers >
+        <cluster_1S_3R>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>clickhouse-01</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>clickhouse-02</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>clickhouse-03</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </cluster_1S_3R>
+    </remote_servers>
+    <zookeeper>
+        <node>
+            <host>clickhouse-keeper-01</host>
+            <port>9181</port>
+        </node>
+        <node>
+            <host>clickhouse-keeper-02</host>
+            <port>9181</port>
+        </node>
+        <node>
+            <host>clickhouse-keeper-03</host>
+            <port>9181</port>
+        </node>
+    </zookeeper>
+    <macros>
+        <shard>01</shard>
+        <replica>01</replica>
+        <cluster>cluster_1S_3R</cluster>
+    </macros>
+</clickhouse>
diff --git a/analytics-datastore-clickhouse/configs/clickhouse-01/etc/clickhouse-server/users.d/users.xml b/analytics-datastore-clickhouse/configs/clickhouse-01/etc/clickhouse-server/users.d/users.xml
new file mode 100644
index 00000000..0f32c646
--- /dev/null
+++ b/analytics-datastore-clickhouse/configs/clickhouse-01/etc/clickhouse-server/users.d/users.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<clickhouse replace="true">
+    <profiles>
+        <default>
+            <max_memory_usage>10000000000</max_memory_usage>
+            <use_uncompressed_cache>0</use_uncompressed_cache>
+            <load_balancing>in_order</load_balancing>
+            <log_queries>1</log_queries>
+        </default>
+    </profiles>
+    <users>
+        <default>
+            <access_management>1</access_management>
+            <profile>default</profile>
+            <networks>
+                <ip>::/0</ip>
+            </networks>
+            <quota>default</quota>
+            <access_management>1</access_management>
+            <named_collection_control>1</named_collection_control>
+            <show_named_collections>1</show_named_collections>
+            <show_named_collections_secrets>1</show_named_collections_secrets>
+        </default>
+    </users>
+    <quotas>
+        <default>
+            <interval>
+                <duration>3600</duration>
+                <queries>0</queries>
+                <errors>0</errors>
+                <result_rows>0</result_rows>
+                <read_rows>0</read_rows>
+                <execution_time>0</execution_time>
+            </interval>
+        </default>
+    </quotas>
+</clickhouse>
diff --git a/analytics-datastore-clickhouse/configs/clickhouse-02/etc/clickhouse-server/config.d/config.xml b/analytics-datastore-clickhouse/configs/clickhouse-02/etc/clickhouse-server/config.d/config.xml
new file mode 100644
index 00000000..f581699b
--- /dev/null
+++ b/analytics-datastore-clickhouse/configs/clickhouse-02/etc/clickhouse-server/config.d/config.xml
@@ -0,0 +1,62 @@
+<clickhouse replace="true">
+    <logger>
+        <level>debug</level>
+        <log>/var/log/clickhouse-server/clickhouse-server.log</log>
+        <errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>
+        <size>1000M</size>
+        <count>3</count>
+    </logger>
+    <display_name>cluster_1S_3R node 2</display_name>
+    <listen_host>0.0.0.0</listen_host>
+    <http_port>8123</http_port>
+    <tcp_port>9000</tcp_port>
+    <user_directories>
+        <users_xml>
+            <path>users.xml</path>
+        </users_xml>
+        <local_directory>
+            <path>/var/lib/clickhouse/access/</path>
+        </local_directory>
+    </user_directories>
+    <distributed_ddl>
+        <path>/clickhouse/task_queue/ddl</path>
+    </distributed_ddl>
+    <remote_servers>
+        <cluster_1S_3R>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>clickhouse-01</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>clickhouse-02</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>clickhouse-03</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </cluster_1S_3R>
+    </remote_servers>
+    <zookeeper>
+        <node>
+            <host>clickhouse-keeper-01</host>
+            <port>9181</port>
+        </node>
+        <node>
+            <host>clickhouse-keeper-02</host>
+            <port>9181</port>
+        </node>
+        <node>
+            <host>clickhouse-keeper-03</host>
+            <port>9181</port>
+        </node>
+    </zookeeper>
+    <macros>
+        <shard>01</shard>
+        <replica>02</replica>
+        <cluster>cluster_1S_3R</cluster>
+    </macros>
+</clickhouse>
diff --git a/analytics-datastore-clickhouse/configs/clickhouse-02/etc/clickhouse-server/users.d/users.xml b/analytics-datastore-clickhouse/configs/clickhouse-02/etc/clickhouse-server/users.d/users.xml
new file mode 100644
index 00000000..0f32c646
--- /dev/null
+++ b/analytics-datastore-clickhouse/configs/clickhouse-02/etc/clickhouse-server/users.d/users.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<clickhouse replace="true">
+    <profiles>
+        <default>
+            <max_memory_usage>10000000000</max_memory_usage>
+            <use_uncompressed_cache>0</use_uncompressed_cache>
+            <load_balancing>in_order</load_balancing>
+            <log_queries>1</log_queries>
+        </default>
+    </profiles>
+    <users>
+        <default>
+            <access_management>1</access_management>
+            <profile>default</profile>
+            <networks>
+                <ip>::/0</ip>
+            </networks>
+            <quota>default</quota>
+            <access_management>1</access_management>
+            <named_collection_control>1</named_collection_control>
+            <show_named_collections>1</show_named_collections>
+            <show_named_collections_secrets>1</show_named_collections_secrets>
+        </default>
+    </users>
+    <quotas>
+        <default>
+            <interval>
+                <duration>3600</duration>
+                <queries>0</queries>
+                <errors>0</errors>
+                <result_rows>0</result_rows>
+                <read_rows>0</read_rows>
+                <execution_time>0</execution_time>
+            </interval>
+        </default>
+    </quotas>
+</clickhouse>
diff --git a/analytics-datastore-clickhouse/configs/clickhouse-03/etc/clickhouse-server/config.d/config.xml b/analytics-datastore-clickhouse/configs/clickhouse-03/etc/clickhouse-server/config.d/config.xml
new file mode 100644
index 00000000..11423117
--- /dev/null
+++ b/analytics-datastore-clickhouse/configs/clickhouse-03/etc/clickhouse-server/config.d/config.xml
@@ -0,0 +1,62 @@
+<clickhouse replace="true">
+    <logger>
+        <level>debug</level>
+        <log>/var/log/clickhouse-server/clickhouse-server.log</log>
+        <errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>
+        <size>1000M</size>
+        <count>3</count>
+    </logger>
+    <display_name>cluster_1S_3R node 3</display_name>
+    <listen_host>0.0.0.0</listen_host>
+    <http_port>8123</http_port>
+    <tcp_port>9000</tcp_port>
+    <user_directories>
+        <users_xml>
+            <path>users.xml</path>
+        </users_xml>
+        <local_directory>
+            <path>/var/lib/clickhouse/access/</path>
+        </local_directory>
+    </user_directories>
+    <distributed_ddl>
+        <path>/clickhouse/task_queue/ddl</path>
+    </distributed_ddl>
+    <remote_servers>
+        <cluster_1S_3R>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>clickhouse-01</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>clickhouse-02</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>clickhouse-03</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </cluster_1S_3R>
+    </remote_servers>
+    <zookeeper>
+        <node>
+            <host>clickhouse-keeper-01</host>
+            <port>9181</port>
+        </node>
+        <node>
+            <host>clickhouse-keeper-02</host>
+            <port>9181</port>
+        </node>
+        <node>
+            <host>clickhouse-keeper-03</host>
+            <port>9181</port>
+        </node>
+    </zookeeper>
+    <macros>
+        <shard>01</shard>
+        <replica>03</replica>
+        <cluster>cluster_1S_3R</cluster>
+    </macros>
+</clickhouse>
diff --git a/analytics-datastore-clickhouse/configs/clickhouse-03/etc/clickhouse-server/users.d/users.xml b/analytics-datastore-clickhouse/configs/clickhouse-03/etc/clickhouse-server/users.d/users.xml
new file mode 100644
index 00000000..0f32c646
--- /dev/null
+++ b/analytics-datastore-clickhouse/configs/clickhouse-03/etc/clickhouse-server/users.d/users.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<clickhouse replace="true">
+    <profiles>
+        <default>
+            <max_memory_usage>10000000000</max_memory_usage>
+            <use_uncompressed_cache>0</use_uncompressed_cache>
+            <load_balancing>in_order</load_balancing>
+            <log_queries>1</log_queries>
+        </default>
+    </profiles>
+    <users>
+        <default>
+            <access_management>1</access_management>
+            <profile>default</profile>
+            <networks>
+                <ip>::/0</ip>
+            </networks>
+            <quota>default</quota>
+            <access_management>1</access_management>
+            <named_collection_control>1</named_collection_control>
+            <show_named_collections>1</show_named_collections>
+            <show_named_collections_secrets>1</show_named_collections_secrets>
+        </default>
+    </users>
+    <quotas>
+        <default>
+            <interval>
+                <duration>3600</duration>
+                <queries>0</queries>
+                <errors>0</errors>
+                <result_rows>0</result_rows>
+                <read_rows>0</read_rows>
+                <execution_time>0</execution_time>
+            </interval>
+        </default>
+    </quotas>
+</clickhouse>
diff --git a/analytics-datastore-clickhouse/cluster_configs/enable_keeper_01.xml b/analytics-datastore-clickhouse/configs/clickhouse-keeper-01/etc/clickhouse-keeper/keeper_config.xml
similarity index 60%
rename from analytics-datastore-clickhouse/cluster_configs/enable_keeper_01.xml
rename to analytics-datastore-clickhouse/configs/clickhouse-keeper-01/etc/clickhouse-keeper/keeper_config.xml
index b89c0adc..903b66c8 100644
--- a/analytics-datastore-clickhouse/cluster_configs/enable_keeper_01.xml
+++ b/analytics-datastore-clickhouse/configs/clickhouse-keeper-01/etc/clickhouse-keeper/keeper_config.xml
@@ -1,30 +1,36 @@
-<clickhouse>
+<clickhouse replace="true">
+    <logger>
+        <level>information</level>
+        <log>/var/log/clickhouse-keeper/clickhouse-keeper.log</log>
+        <errorlog>/var/log/clickhouse-keeper/clickhouse-keeper.err.log</errorlog>
+        <size>1000M</size>
+        <count>3</count>
+    </logger>
+    <listen_host>0.0.0.0</listen_host>
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>1</server_id>
         <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
         <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
-
         <coordination_settings>
             <operation_timeout_ms>10000</operation_timeout_ms>
             <session_timeout_ms>30000</session_timeout_ms>
-            <raft_logs_level>trace</raft_logs_level>
+            <raft_logs_level>information</raft_logs_level>
         </coordination_settings>
-
         <raft_configuration>
             <server>
                 <id>1</id>
-                <hostname>analytics-datastore-clickhouse-01</hostname>
+                <hostname>clickhouse-keeper-01</hostname>
                 <port>9234</port>
             </server>
             <server>
                 <id>2</id>
-                <hostname>analytics-datastore-clickhouse-02</hostname>
+                <hostname>clickhouse-keeper-02</hostname>
                 <port>9234</port>
             </server>
             <server>
                 <id>3</id>
-                <hostname>analytics-datastore-clickhouse-03</hostname>
+                <hostname>clickhouse-keeper-03</hostname>
                 <port>9234</port>
             </server>
         </raft_configuration>
diff --git a/analytics-datastore-clickhouse/cluster_configs/enable_keeper_02.xml b/analytics-datastore-clickhouse/configs/clickhouse-keeper-02/etc/clickhouse-keeper/keeper_config.xml
similarity index 60%
rename from analytics-datastore-clickhouse/cluster_configs/enable_keeper_02.xml
rename to analytics-datastore-clickhouse/configs/clickhouse-keeper-02/etc/clickhouse-keeper/keeper_config.xml
index 20d9a362..cced46bb 100644
--- a/analytics-datastore-clickhouse/cluster_configs/enable_keeper_02.xml
+++ b/analytics-datastore-clickhouse/configs/clickhouse-keeper-02/etc/clickhouse-keeper/keeper_config.xml
@@ -1,30 +1,36 @@
-<clickhouse>
+<clickhouse replace="true">
+    <logger>
+        <level>information</level>
+        <log>/var/log/clickhouse-keeper/clickhouse-keeper.log</log>
+        <errorlog>/var/log/clickhouse-keeper/clickhouse-keeper.err.log</errorlog>
+        <size>1000M</size>
+        <count>3</count>
+    </logger>
+    <listen_host>0.0.0.0</listen_host>
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>2</server_id>
         <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
         <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
-
         <coordination_settings>
             <operation_timeout_ms>10000</operation_timeout_ms>
             <session_timeout_ms>30000</session_timeout_ms>
-            <raft_logs_level>trace</raft_logs_level>
+            <raft_logs_level>information</raft_logs_level>
         </coordination_settings>
-
         <raft_configuration>
             <server>
                 <id>1</id>
-                <hostname>analytics-datastore-clickhouse-01</hostname>
+                <hostname>clickhouse-keeper-01</hostname>
                 <port>9234</port>
             </server>
             <server>
                 <id>2</id>
-                <hostname>analytics-datastore-clickhouse-02</hostname>
+                <hostname>clickhouse-keeper-02</hostname>
                 <port>9234</port>
             </server>
             <server>
                 <id>3</id>
-                <hostname>analytics-datastore-clickhouse-03</hostname>
+                <hostname>clickhouse-keeper-03</hostname>
                 <port>9234</port>
             </server>
         </raft_configuration>
diff --git a/analytics-datastore-clickhouse/cluster_configs/enable_keeper_03.xml b/analytics-datastore-clickhouse/configs/clickhouse-keeper-03/etc/clickhouse-keeper/keeper_config.xml
similarity index 60%
rename from analytics-datastore-clickhouse/cluster_configs/enable_keeper_03.xml
rename to analytics-datastore-clickhouse/configs/clickhouse-keeper-03/etc/clickhouse-keeper/keeper_config.xml
index 505f4563..b05c064d 100644
--- a/analytics-datastore-clickhouse/cluster_configs/enable_keeper_03.xml
+++ b/analytics-datastore-clickhouse/configs/clickhouse-keeper-03/etc/clickhouse-keeper/keeper_config.xml
@@ -1,30 +1,36 @@
-<clickhouse>
+<clickhouse replace="true">
+    <logger>
+        <level>information</level>
+        <log>/var/log/clickhouse-keeper/clickhouse-keeper.log</log>
+        <errorlog>/var/log/clickhouse-keeper/clickhouse-keeper.err.log</errorlog>
+        <size>1000M</size>
+        <count>3</count>
+    </logger>
+    <listen_host>0.0.0.0</listen_host>
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>3</server_id>
         <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
         <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
-
         <coordination_settings>
             <operation_timeout_ms>10000</operation_timeout_ms>
             <session_timeout_ms>30000</session_timeout_ms>
-            <raft_logs_level>trace</raft_logs_level>
+            <raft_logs_level>information</raft_logs_level>
         </coordination_settings>
-
         <raft_configuration>
             <server>
                 <id>1</id>
-                <hostname>analytics-datastore-clickhouse-01</hostname>
+                <hostname>clickhouse-keeper-01</hostname>
                 <port>9234</port>
             </server>
             <server>
                 <id>2</id>
-                <hostname>analytics-datastore-clickhouse-02</hostname>
+                <hostname>clickhouse-keeper-02</hostname>
                 <port>9234</port>
             </server>
             <server>
                 <id>3</id>
-                <hostname>analytics-datastore-clickhouse-03</hostname>
+                <hostname>clickhouse-keeper-03</hostname>
                 <port>9234</port>
             </server>
         </raft_configuration>
diff --git a/analytics-datastore-clickhouse/docker-compose.cluster.dev.yml b/analytics-datastore-clickhouse/docker-compose.cluster.dev.yml
index 4bac8f96..a1f48380 100644
--- a/analytics-datastore-clickhouse/docker-compose.cluster.dev.yml
+++ b/analytics-datastore-clickhouse/docker-compose.cluster.dev.yml
@@ -4,44 +4,44 @@ services:
   analytics-datastore-clickhouse-01:
     ports:
       - target: 8123
-        published: 8124
+        published: 8123
         mode: host
       - target: 9000
-        published: 9001
-        mode: host
-      - target: 9181
-        published: 9181
+        published: 9000
         mode: host
+
   analytics-datastore-clickhouse-02:
     ports:
       - target: 8123
-        published: 8125
+        published: 8123
         mode: host
       - target: 9000
-        published: 9002
-        mode: host
-      - target: 9181
-        published: 9182
+        published: 9000
         mode: host
+
   analytics-datastore-clickhouse-03:
     ports:
       - target: 8123
-        published: 8126
+        published: 8123
         mode: host
       - target: 9000
-        published: 9003
+        published: 9000
         mode: host
+
+  clickhouse-keeper-01:
+    ports:
       - target: 9181
-        published: 9183
+        published: 9181
         mode: host
-  analytics-datastore-clickhouse-04:
+
+  clickhouse-keeper-02:
     ports:
-      - target: 8123
-        published: 8127
-        mode: host
-      - target: 9000
-        published: 9004
+      - target: 9181
+        published: 9181
         mode: host
+
+  clickhouse-keeper-03:
+    ports:
       - target: 9181
-        published: 9184
+        published: 9181
         mode: host
diff --git a/analytics-datastore-clickhouse/docker-compose.cluster.yml b/analytics-datastore-clickhouse/docker-compose.cluster.yml
index 9fd02064..4e1674c2 100644
--- a/analytics-datastore-clickhouse/docker-compose.cluster.yml
+++ b/analytics-datastore-clickhouse/docker-compose.cluster.yml
@@ -2,160 +2,108 @@ version: '3.9'
 
 services:
   analytics-datastore-clickhouse-01:
-    image: clickhouse/clickhouse-server
-    ulimits:
-      noFile: 262144
-    volumes:
-      - clickhouse-data-01:/var/lib/clickhouse/
+    image: clickhouse/clickhouse-server:latest
+    user: "101:101"
+    container_name: analytics-datastore-clickhouse-01
     hostname: analytics-datastore-clickhouse-01
     deploy: 
       placement: 
         constraints: 
           - "node.labels.name==node-1"
-    configs:
-      - target: /etc/clickhouse-server/config.d/docker_related_config.xml
-        source: docker_related_config.xml
-      - target: /etc/clickhouse-server/config.d/enable_keeper.xml
-        source: clickhouse_enable_keeper_01.xml
-      - target: /etc/clickhouse-server/config.d/macros.xml
-        source: clickhouse_macros_01.xml
-      - target: /etc/clickhouse-server/config.d/remote_servers.xml
-        source: clickhouse_remote_servers.xml
-      - target: /etc/clickhouse-server/config.d/use_keeper.xml
-        source: clickhouse_use_keeper.xml
+    volumes:
+      - ${PWD}/configs/clickhouse-01/etc/clickhouse-server/config.d/config.xml:/etc/clickhouse-server/config.d/config.xml
+      - ${PWD}/configs/clickhouse-01/etc/clickhouse-server/users.d/users.xml:/etc/clickhouse-server/users.d/users.xml
+      - clickhouse-data-01:/var/lib/clickhouse/
+    depends_on:
+      - clickhouse-keeper-01
+      - clickhouse-keeper-02
+      - clickhouse-keeper-03
     networks:
       public:
       default:
 
   analytics-datastore-clickhouse-02:
-    image: clickhouse/clickhouse-server
+    image: clickhouse/clickhouse-server:latest
+    user: "101:101"
+    container_name: analytics-datastore-clickhouse-02
     hostname: analytics-datastore-clickhouse-02
     deploy: 
       placement: 
         constraints: 
           - "node.labels.name==node-2"
-    ulimits:
-      noFile: 262144
     volumes:
+      - ${PWD}/configs/clickhouse-02/etc/clickhouse-server/config.d/config.xml:/etc/clickhouse-server/config.d/config.xml
+      - ${PWD}/configs/clickhouse-02/etc/clickhouse-server/users.d/users.xml:/etc/clickhouse-server/users.d/users.xml
       - clickhouse-data-02:/var/lib/clickhouse/
-    configs:
-      - target: /etc/clickhouse-server/config.d/docker_related_config.xml
-        source: docker_related_config.xml
-      - target: /etc/clickhouse-server/config.d/enable_keeper.xml
-        source: clickhouse_enable_keeper_02.xml
-      - target: /etc/clickhouse-server/config.d/macros.xml
-        source: clickhouse_macros_02.xml
-      - target: /etc/clickhouse-server/config.d/remote_servers.xml
-        source: clickhouse_remote_servers.xml
-      - target: /etc/clickhouse-server/config.d/use_keeper.xml
-        source: clickhouse_use_keeper.xml
+    depends_on:
+      - clickhouse-keeper-01
+      - clickhouse-keeper-02
+      - clickhouse-keeper-03
     networks:
       public:
       default:
 
   analytics-datastore-clickhouse-03:
-    image: clickhouse/clickhouse-server
+    image: clickhouse/clickhouse-server:latest
+    user: "101:101"
+    container_name: analytics-datastore-clickhouse-03
     hostname: analytics-datastore-clickhouse-03
     deploy: 
       placement: 
         constraints: 
           - "node.labels.name==node-3"
-    ulimits:
-      noFile: 262144
     volumes:
-      - clickhouse-data-03:/var/lib/clickhouse/        
-    configs:
-      - target: /etc/clickhouse-server/config.d/docker_related_config.xml
-        source: docker_related_config.xml
-      - target: /etc/clickhouse-server/config.d/enable_keeper.xml
-        source: clickhouse_enable_keeper_03.xml
-      - target: /etc/clickhouse-server/config.d/macros.xml
-        source: clickhouse_macros_03.xml
-      - target: /etc/clickhouse-server/config.d/remote_servers.xml
-        source: clickhouse_remote_servers.xml
-      - target: /etc/clickhouse-server/config.d/use_keeper.xml
-        source: clickhouse_use_keeper.xml
+      - ${PWD}/configs/clickhouse-03/etc/clickhouse-server/config.d/config.xml:/etc/clickhouse-server/config.d/config.xml
+      - ${PWD}/configs/clickhouse-03/etc/clickhouse-server/users.d/users.xml:/etc/clickhouse-server/users.d/users.xml
+      - clickhouse-data-03:/var/lib/clickhouse/
+    depends_on:
+      - clickhouse-keeper-01
+      - clickhouse-keeper-02
+      - clickhouse-keeper-03
     networks:
       public:
       default:
 
-  analytics-datastore-clickhouse-04:
-    image: clickhouse/clickhouse-server
-    hostname: analytics-datastore-clickhouse-04
-    ulimits:
-      noFile: 262144
+  clickhouse-keeper-01:
+    image: clickhouse/clickhouse-keeper:latest-alpine
+    user: "101:101"
+    container_name: clickhouse-keeper-01
+    hostname: clickhouse-keeper-01
+    deploy: 
+      placement: 
+        constraints: 
+          - "node.labels.name==node-1"
     volumes:
-      - clickhouse-data-04:/var/lib/clickhouse/        
-    configs:
-      - target: /etc/clickhouse-server/config.d/docker_related_config.xml
-        source: docker_related_config.xml
-      - target: /etc/clickhouse-server/config.d/macros.xml
-        source: clickhouse_macros_04.xml
-      - target: /etc/clickhouse-server/config.d/remote_servers.xml
-        source: clickhouse_remote_servers.xml
-      - target: /etc/clickhouse-server/config.d/use_keeper.xml
-        source: clickhouse_use_keeper.xml
-    networks:
-      public:
-      default:
+     - ${PWD}/configs/clickhouse-keeper-01/etc/clickhouse-keeper/keeper_config.xml:/etc/clickhouse-keeper/keeper_config.xml
+
+  clickhouse-keeper-02:
+    image: clickhouse/clickhouse-keeper:latest-alpine
+    user: "101:101"
+    container_name: clickhouse-keeper-02
+    hostname: clickhouse-keeper-02
+    deploy: 
+      placement: 
+        constraints: 
+          - "node.labels.name==node-2"
+    volumes:
+     - ${PWD}/configs/clickhouse-keeper-02/etc/clickhouse-keeper/keeper_config.xml:/etc/clickhouse-keeper/keeper_config.xml
+
+  clickhouse-keeper-03:
+    image: clickhouse/clickhouse-keeper:latest-alpine
+    user: "101:101"
+    container_name: clickhouse-keeper-03
+    hostname: clickhouse-keeper-03
+    deploy: 
+      placement: 
+        constraints: 
+          - "node.labels.name==node-3"
+    volumes:
+     - ${PWD}/configs/clickhouse-keeper-03/etc/clickhouse-keeper/keeper_config.xml:/etc/clickhouse-keeper/keeper_config.xml
 
 volumes:
   clickhouse-data-01:
   clickhouse-data-02:
   clickhouse-data-03:
-  clickhouse-data-04:
-  
-configs:
-  docker_related_config.xml:
-    file: ./cluster_configs/docker_related_config.xml
-    name: docker_related_config.xml-${docker_related_config_xml_DIGEST:?err}
-    labels: 
-      name: clickhouse
-  clickhouse_enable_keeper_01.xml:
-    file: ./cluster_configs/enable_keeper_01.xml
-    name: enable_keeper_01.xml-${enable_keeper_01_xml_DIGEST:?err}
-    labels: 
-      name: clickhouse
-  clickhouse_enable_keeper_02.xml:
-    file: ./cluster_configs/enable_keeper_02.xml
-    name: enable_keeper_02.xml-${enable_keeper_02_xml_DIGEST:?err}
-    labels: 
-      name: clickhouse
-  clickhouse_enable_keeper_03.xml:
-    file: ./cluster_configs/enable_keeper_03.xml
-    name: enable_keeper_03.xml-${enable_keeper_03_xml_DIGEST:?err}
-    labels: 
-      name: clickhouse
-  clickhouse_macros_01.xml:
-    file: ./cluster_configs/macros_01.xml
-    name: macros_01.xml-${macros_01_xml_DIGEST:?err}
-    labels: 
-      name: clickhouse
-  clickhouse_macros_02.xml:
-    file: ./cluster_configs/macros_02.xml
-    name: macros_02.xml-${macros_02_xml_DIGEST:?err}
-    labels: 
-      name: clickhouse
-  clickhouse_macros_03.xml:
-    file: ./cluster_configs/macros_03.xml
-    name: macros_03.xml-${macros_03_xml_DIGEST:?err}
-    labels: 
-      name: clickhouse
-  clickhouse_macros_04.xml:
-    file: ./cluster_configs/macros_04.xml
-    name: macros_04.xml-${macros_04_xml_DIGEST:?err}
-    labels: 
-      name: clickhouse
-  clickhouse_remote_servers.xml:
-    file: ./cluster_configs/remote_servers.xml
-    name: remote_servers.xml-${remote_servers_xml_DIGEST:?err}
-    labels: 
-      name: clickhouse
-  clickhouse_use_keeper.xml:
-    file: ./cluster_configs/use_keeper.xml
-    name: use_keeper.xml-${use_keeper_xml_DIGEST:?err}
-    labels: 
-      name: clickhouse
 
 networks:
   public:
diff --git a/analytics-datastore-clickhouse/docker-compose.dev.yml b/analytics-datastore-clickhouse/docker-compose.dev.yml
index 79c24f41..71e0bb1d 100644
--- a/analytics-datastore-clickhouse/docker-compose.dev.yml
+++ b/analytics-datastore-clickhouse/docker-compose.dev.yml
@@ -4,8 +4,8 @@ services:
   analytics-datastore-clickhouse:
     ports:
       - target: 8123
-        published: 8124
+        published: 8123
         mode: host
       - target: 9000
-        published: 9001
+        published: 9000
         mode: host
diff --git a/analytics-datastore-clickhouse/docker-compose.yml b/analytics-datastore-clickhouse/docker-compose.yml
index b5a050cd..baeb90a7 100644
--- a/analytics-datastore-clickhouse/docker-compose.yml
+++ b/analytics-datastore-clickhouse/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.9'
 
 services:
   analytics-datastore-clickhouse:
-    image: clickhouse/clickhouse-server
+    image: clickhouse/clickhouse-server:latest
     ulimits:
       noFile: 262144
     volumes:
diff --git a/analytics-datastore-clickhouse/importer/config/clickhouseTables.js b/analytics-datastore-clickhouse/importer/config/clickhouseTables.js
index 8c3ba4e7..bc5348d9 100644
--- a/analytics-datastore-clickhouse/importer/config/clickhouseTables.js
+++ b/analytics-datastore-clickhouse/importer/config/clickhouseTables.js
@@ -1,9 +1,9 @@
-const CLUSTERED_MODE = process.env.CLUSTERED_MODE || 'true';
+const CLUSTERED_MODE = process.env.CLUSTERED_MODE || "true";
 
 const queries =
   Boolean(CLUSTERED_MODE) === true
     ? [
-        `CREATE TABLE default_table(
+        `CREATE TABLE my_table(
 			createdAt Date,
 			updatedAt Date
 		) 
@@ -11,12 +11,16 @@ const queries =
 		ORDER BY tuple();`,
       ]
     : [
-        `CREATE TABLE default.default_table ON CLUSTER '{cluster}' (
+        // Replicated table
+        `CREATE TABLE default.my_table ON CLUSTER '{cluster}' (
 			createdAt Date,
 			updatedAt Date
 		)
-		ENGINE = ReplicatedMergeTree('/clickhouse/tables/{cluster}/{shard}/{table}', '{replica}')
+		ENGINE = ReplicatedMergeTree('/clickhouse/tables/{cluster}/{shard}/my_table', '{replica}')
 		ORDER BY tuple();`,
+        // Distributed table : Writes and queries should be made against this table
+        `CREATE TABLE default.my_table_distributed ON CLUSTER '{cluster}' AS default.my_table
+		ENGINE = Distributed('{cluster}', default, my_table, rand())`,
       ];
 
 module.exports = queries;
diff --git a/analytics-datastore-clickhouse/package-metadata.json b/analytics-datastore-clickhouse/package-metadata.json
index 680a3bb7..eadb176a 100644
--- a/analytics-datastore-clickhouse/package-metadata.json
+++ b/analytics-datastore-clickhouse/package-metadata.json
@@ -3,7 +3,7 @@
   "name": "Analytics Datastore Clickhouse",
   "description": "A column database",
   "type": "infrastructure",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "dependencies": [],
   "environmentVariables": {
     "CLICKHOUSE_HOST": "analytics-datastore-clickhouse",