From f53e8692cdb699e901f43b1a1147ed942b06f338 Mon Sep 17 00:00:00 2001
From: Andrew Davis <1709934+Savid@users.noreply.github.com>
Date: Mon, 25 Mar 2024 13:22:50 +1000
Subject: [PATCH] feat(docker): force clickhouse keeper images

---
 .../etc/clickhouse-server/config.d/config.xml |  5 +---
 .../etc/clickhouse-server/config.d/config.xml |  7 ++----
 .../etc/clickhouse-keeper/keeper_config.xml   | 25 +++++++++++++------
 .../etc/clickhouse-keeper/keeper_config.xml   | 15 +++++------
 .../etc/clickhouse-keeper/keeper_config.xml   | 15 +++++------
 docker-compose.yml                            |  8 +++---
 6 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/deploy/local/docker-compose/clickhouse/clickhouse-01/etc/clickhouse-server/config.d/config.xml b/deploy/local/docker-compose/clickhouse/clickhouse-01/etc/clickhouse-server/config.d/config.xml
index 3e4c823f..7b96ce2c 100644
--- a/deploy/local/docker-compose/clickhouse/clickhouse-01/etc/clickhouse-server/config.d/config.xml
+++ b/deploy/local/docker-compose/clickhouse/clickhouse-01/etc/clickhouse-server/config.d/config.xml
@@ -1,10 +1,7 @@
 <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>
+        <console>1</console>
     </logger>
     <display_name>cluster_2S_1R node 1</display_name>
     <listen_host>0.0.0.0</listen_host>
diff --git a/deploy/local/docker-compose/clickhouse/clickhouse-02/etc/clickhouse-server/config.d/config.xml b/deploy/local/docker-compose/clickhouse/clickhouse-02/etc/clickhouse-server/config.d/config.xml
index e0b25395..569c06f2 100644
--- a/deploy/local/docker-compose/clickhouse/clickhouse-02/etc/clickhouse-server/config.d/config.xml
+++ b/deploy/local/docker-compose/clickhouse/clickhouse-02/etc/clickhouse-server/config.d/config.xml
@@ -1,10 +1,7 @@
 <clickhouse replace="true">
     <logger>
-        <level>trace</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>
+        <level>debug</level>
+        <console>1</console>
     </logger>
     <display_name>cluster_2S_1R node 2</display_name>
     <listen_host>0.0.0.0</listen_host>
diff --git a/deploy/local/docker-compose/clickhouse/clickhouse-keeper-01/etc/clickhouse-keeper/keeper_config.xml b/deploy/local/docker-compose/clickhouse/clickhouse-keeper-01/etc/clickhouse-keeper/keeper_config.xml
index 6d0d566c..b27b4805 100644
--- a/deploy/local/docker-compose/clickhouse/clickhouse-keeper-01/etc/clickhouse-keeper/keeper_config.xml
+++ b/deploy/local/docker-compose/clickhouse/clickhouse-keeper-01/etc/clickhouse-keeper/keeper_config.xml
@@ -1,21 +1,22 @@
 <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>1</count>
+        <level>debug</level>
+        <console>1</console>
     </logger>
     <listen_host>0.0.0.0</listen_host>
     <keeper_server>
-        <tcp_port>9181</tcp_port>
         <server_id>1</server_id>
+        <tcp_port>9181</tcp_port>
+        <path>/var/lib/clickhouse-keeper</path>
         <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
         <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+        <enable_reconfiguration>true</enable_reconfiguration>
+        <four_letter_word_allow_list>*</four_letter_word_allow_list>
+
         <coordination_settings>
             <operation_timeout_ms>10000</operation_timeout_ms>
             <session_timeout_ms>30000</session_timeout_ms>
-            <raft_logs_level>information</raft_logs_level>
+            <raft_logs_level>warning</raft_logs_level>
         </coordination_settings>
         <raft_configuration>
             <server>
@@ -23,6 +24,16 @@
                 <hostname>clickhouse-keeper-01</hostname>
                 <port>9234</port>
             </server>
+            <server>
+                <id>2</id>
+                <hostname>clickhouse-keeper-02</hostname>
+                <port>9234</port>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>clickhouse-keeper-03</hostname>
+                <port>9234</port>
+            </server>
         </raft_configuration>
     </keeper_server>
 </clickhouse>
diff --git a/deploy/local/docker-compose/clickhouse/clickhouse-keeper-02/etc/clickhouse-keeper/keeper_config.xml b/deploy/local/docker-compose/clickhouse/clickhouse-keeper-02/etc/clickhouse-keeper/keeper_config.xml
index cced46bb..722a5e3f 100644
--- a/deploy/local/docker-compose/clickhouse/clickhouse-keeper-02/etc/clickhouse-keeper/keeper_config.xml
+++ b/deploy/local/docker-compose/clickhouse/clickhouse-keeper-02/etc/clickhouse-keeper/keeper_config.xml
@@ -1,21 +1,22 @@
 <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>
+        <level>debug</level>
+        <console>1</console>
     </logger>
     <listen_host>0.0.0.0</listen_host>
     <keeper_server>
-        <tcp_port>9181</tcp_port>
         <server_id>2</server_id>
+        <tcp_port>9181</tcp_port>
+        <path>/var/lib/clickhouse-keeper</path>
         <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
         <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+        <enable_reconfiguration>true</enable_reconfiguration>
+        <four_letter_word_allow_list>*</four_letter_word_allow_list>
+
         <coordination_settings>
             <operation_timeout_ms>10000</operation_timeout_ms>
             <session_timeout_ms>30000</session_timeout_ms>
-            <raft_logs_level>information</raft_logs_level>
+            <raft_logs_level>warning</raft_logs_level>
         </coordination_settings>
         <raft_configuration>
             <server>
diff --git a/deploy/local/docker-compose/clickhouse/clickhouse-keeper-03/etc/clickhouse-keeper/keeper_config.xml b/deploy/local/docker-compose/clickhouse/clickhouse-keeper-03/etc/clickhouse-keeper/keeper_config.xml
index b05c064d..506217b2 100644
--- a/deploy/local/docker-compose/clickhouse/clickhouse-keeper-03/etc/clickhouse-keeper/keeper_config.xml
+++ b/deploy/local/docker-compose/clickhouse/clickhouse-keeper-03/etc/clickhouse-keeper/keeper_config.xml
@@ -1,21 +1,22 @@
 <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>
+        <level>debug</level>
+        <console>1</console>
     </logger>
     <listen_host>0.0.0.0</listen_host>
     <keeper_server>
-        <tcp_port>9181</tcp_port>
         <server_id>3</server_id>
+        <tcp_port>9181</tcp_port>
+        <path>/var/lib/clickhouse-keeper</path>
         <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
         <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+        <enable_reconfiguration>true</enable_reconfiguration>
+        <four_letter_word_allow_list>*</four_letter_word_allow_list>
+
         <coordination_settings>
             <operation_timeout_ms>10000</operation_timeout_ms>
             <session_timeout_ms>30000</session_timeout_ms>
-            <raft_logs_level>information</raft_logs_level>
+            <raft_logs_level>warning</raft_logs_level>
         </coordination_settings>
         <raft_configuration>
             <server>
diff --git a/docker-compose.yml b/docker-compose.yml
index d32575c7..e8db4fb0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -58,7 +58,7 @@ services:
       retries: 15
       start_period: 15s
   clickhouse-keeper-01:
-    image: "clickhouse/clickhouse-keeper:${CHKVER:-latest-alpine}"
+    image: "clickhouse/clickhouse-keeper:23.12-alpine"
     user: "101:101"
     container_name: clickhouse-keeper-01
     hostname: clickhouse-keeper-01
@@ -75,7 +75,7 @@ services:
       retries: 3
       start_period: 5s
   clickhouse-keeper-02:
-    image: "clickhouse/clickhouse-keeper:${CHKVER:-latest-alpine}"
+    image: "clickhouse/clickhouse-keeper:23.12-alpine"
     user: "101:101"
     container_name: clickhouse-keeper-02
     hostname: clickhouse-keeper-02
@@ -92,7 +92,7 @@ services:
       retries: 3
       start_period: 5s
   clickhouse-keeper-03:
-    image: "clickhouse/clickhouse-keeper:${CHKVER:-latest-alpine}"
+    image: "clickhouse/clickhouse-keeper:23.12-alpine"
     user: "101:101"
     container_name: clickhouse-keeper-03
     hostname: clickhouse-keeper-03
@@ -346,4 +346,4 @@ volumes:
   clickhouse-02-data:
     driver: local
   prometheus-data:
-    driver: local
\ No newline at end of file
+    driver: local