From 9bdc8c577ad6bbae64fdc16ae6d3fa93aa070877 Mon Sep 17 00:00:00 2001
From: ruslandoga <67764432+ruslandoga@users.noreply.github.com>
Date: Fri, 13 Sep 2024 13:52:58 +0700
Subject: [PATCH] improve ch config

---
 clickhouse/clickhouse-config.xml      | 23 -----------------------
 clickhouse/clickhouse-user-config.xml |  8 --------
 compose.yml                           |  5 +++--
 3 files changed, 3 insertions(+), 33 deletions(-)
 delete mode 100644 clickhouse/clickhouse-config.xml
 delete mode 100644 clickhouse/clickhouse-user-config.xml

diff --git a/clickhouse/clickhouse-config.xml b/clickhouse/clickhouse-config.xml
deleted file mode 100644
index 0dfaa70..0000000
--- a/clickhouse/clickhouse-config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<clickhouse>
-    <logger>
-        <level>warning</level>
-        <console>true</console>
-    </logger>
-    
-    <!-- 
-    Avoid the warning: "Listen [::]:9009 failed: Address family for hostname not supported". 
-    If Docker has IPv6 disabled, bind ClickHouse to IPv4 to prevent this issue. 
-    Add this to the configuration to ensure it listens on all IPv4 interfaces:
-    <listen_host>0.0.0.0</listen_host>
-    -->
-
-    <!-- Stop all the unnecessary logging -->
-    <query_thread_log remove="remove"/>
-    <query_log remove="remove"/>
-    <text_log remove="remove"/>
-    <trace_log remove="remove"/>
-    <metric_log remove="remove"/>
-    <asynchronous_metric_log remove="remove"/>
-    <session_log remove="remove"/>
-    <part_log remove="remove"/>
-</clickhouse>
diff --git a/clickhouse/clickhouse-user-config.xml b/clickhouse/clickhouse-user-config.xml
deleted file mode 100644
index 56cf1cd..0000000
--- a/clickhouse/clickhouse-user-config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<clickhouse>
-    <profiles>
-        <default>
-            <log_queries>0</log_queries>
-            <log_query_threads>0</log_query_threads>
-        </default>
-    </profiles>
-</clickhouse>
diff --git a/compose.yml b/compose.yml
index 1f4d869..38634d6 100644
--- a/compose.yml
+++ b/compose.yml
@@ -17,8 +17,9 @@ services:
     volumes:
       - event-data:/var/lib/clickhouse
       - event-logs:/var/log/clickhouse-server
-      - ./clickhouse/clickhouse-config.xml:/etc/clickhouse-server/config.d/logging.xml:ro
-      - ./clickhouse/clickhouse-user-config.xml:/etc/clickhouse-server/users.d/logging.xml:ro
+      - ./clickhouse/logs.xml:/etc/clickhouse-server/config.d/logs.xml:ro
+      # This makes ClickHouse bind to IPv4 only, since Docker doesn't support IPv6 by default.
+      - ./clickhouse/ipv4.xml:/etc/clickhouse-server/config.d/ipv4.xml:ro
     ulimits:
       nofile:
         soft: 262144