From d18a73ecc05739b611a1d9260d1a9ef0cea689dc Mon Sep 17 00:00:00 2001
From: Paul <paul@paulbsd.com>
Date: Fri, 1 Mar 2024 17:40:19 +0100
Subject: [PATCH] updated clickhouse state

---
 states/clickhouse/config.sls                |  4 ++++
 states/clickhouse/templates/keeper.xml.j2   | 10 ++++++----
 states/clickhouse/templates/replica.xml.j2  |  2 ++
 states/clickhouse/templates/settings.xml.j2 |  4 ++--
 states/clickhouse/templates/user.xml.j2     |  2 ++
 states/clickhouse/users.sls                 |  4 ++++
 6 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/states/clickhouse/config.sls b/states/clickhouse/config.sls
index 75edb1b..18d1b56 100644
--- a/states/clickhouse/config.sls
+++ b/states/clickhouse/config.sls
@@ -1,5 +1,9 @@
 {%- from "clickhouse/map.jinja" import clickhouse with context -%}
 ---
+clickhouse-config-folder:
+  file.directory:
+    -  name: /etc/clickhouse-server/config.d
+
 clickhouse-config-file-settings:
   file.managed:
     - name: /etc/clickhouse-server/config.d/settings.xml
diff --git a/states/clickhouse/templates/keeper.xml.j2 b/states/clickhouse/templates/keeper.xml.j2
index db73031..eaab661 100644
--- a/states/clickhouse/templates/keeper.xml.j2
+++ b/states/clickhouse/templates/keeper.xml.j2
@@ -5,30 +5,32 @@
     <node>
       <host>{{ nodename }}</host>
       <port>9281</port>
-      <secure>1</secure>
     </node>
 {%- endfor %}
   </zookeeper>
   <keeper_server>
-    <tcp_port_secure>9281</tcp_port_secure>
+    <tcp_port>9281</tcp_port>
     <server_id>{{ clickhouse.clusters[clickhouse.cluster].nodes[salt['grains.get']('fqdn')].id }}</server_id>
     <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
     <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+    <enable_reconfiguration>false</enable_reconfiguration>
 
     <coordination_settings>
       <operation_timeout_ms>10000</operation_timeout_ms>
       <session_timeout_ms>30000</session_timeout_ms>
-      <raft_logs_level>fatal</raft_logs_level>
+      <raft_logs_level>trace</raft_logs_level>
     </coordination_settings>
 
     <raft_configuration>
-      <secure>true</secure>
+      <secure>false</secure>
 {%- for nodename, settings in clickhouse.clusters[clickhouse.cluster].nodes.items() %}
+{%- if settings.keeper|default(false) %}
       <server>
         <id>{{ settings.id }}</id>
         <hostname>{{ nodename }}</hostname>
         <port>9444</port>
       </server>
+{%- endif %}
 {%- endfor %}
     </raft_configuration>
   </keeper_server>
diff --git a/states/clickhouse/templates/replica.xml.j2 b/states/clickhouse/templates/replica.xml.j2
index 56bc2c9..bbed9e0 100644
--- a/states/clickhouse/templates/replica.xml.j2
+++ b/states/clickhouse/templates/replica.xml.j2
@@ -5,6 +5,7 @@
       <shard>
         <internal_replication>false</internal_replication>
 {% for nodename, settings in clickhouse.clusters[clickhouse.cluster].nodes.items() %}
+{%- if settings.replica|default(false) %}
         <replica>
           <host>{{ nodename }}</host>
           <port>9440</port>
@@ -12,6 +13,7 @@
           <password></password>
           <secure>1</secure>
         </replica>
+{%- endif %}
 {% endfor %}
       </shard>
       </{{ clickhouse.cluster }}>
diff --git a/states/clickhouse/templates/settings.xml.j2 b/states/clickhouse/templates/settings.xml.j2
index 0ba2c77..242a1b4 100644
--- a/states/clickhouse/templates/settings.xml.j2
+++ b/states/clickhouse/templates/settings.xml.j2
@@ -5,8 +5,8 @@
   <default_replica_path>/clickhouse/{cluster}/tables/{uuid}/{database}/{table}-{shard}</default_replica_path>
   <logger>
     <level>warning</level>
-    <log>/var/log/clickhouse-server/clickhouse-server-%F-%T.log</log>
-    <errorlog>/var/log/clickhouse-server/clickhouse-server-%F-%T.err.log</errorlog>
+    <log>/var/log/clickhouse-server/clickhouse-server.log</log>
+    <errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>
     <count>10</count>
     <size>100M</size>
     <stream_compress>1</stream_compress>
diff --git a/states/clickhouse/templates/user.xml.j2 b/states/clickhouse/templates/user.xml.j2
index cd43562..abff9ed 100644
--- a/states/clickhouse/templates/user.xml.j2
+++ b/states/clickhouse/templates/user.xml.j2
@@ -2,11 +2,13 @@
 <clickhouse>
   <users>
     <{{ name }}>
+{%- if params.networks|default(None) %}
       <networks>
       {%- for network in params.networks|default(["127.0.0.1/8"]) %}
         <ip>{{ network }}</ip>
       {%- endfor %}
       </networks>
+{%- endif %}
       <profile>{{ params.profile|default("default") }}</profile>
       <quota>{{ params.quota|default("default") }}</quota>
       <default_database>{{ params.default_database|default("default") }}</default_database>
diff --git a/states/clickhouse/users.sls b/states/clickhouse/users.sls
index 472be8c..592cd57 100644
--- a/states/clickhouse/users.sls
+++ b/states/clickhouse/users.sls
@@ -1,5 +1,9 @@
 ---
 {%- from "clickhouse/map.jinja" import clickhouse with context %}
+clickhouse-users-folder:
+  file.directory:
+    -  name: /etc/clickhouse-server/users.d
+
 {% for user, params in clickhouse.users.items() %}
 clickhouse-user-{{ user }}:
   file.managed: