From ef19bdf442445568547dc467215558fcf0965781 Mon Sep 17 00:00:00 2001
From: Luca Deri <deri@ntop.org>
Date: Tue, 17 Jan 2023 13:33:52 +0100
Subject: [PATCH] Updated clickhouse cluster configuration

---
 clickhouse/clickhouse1/clusters.xml  |  1 +
 clickhouse/clickhouse1/keeper.xml    | 40 ++++++++++++++++++++++++++++
 clickhouse/clickhouse1/macros.xml    |  3 ++-
 clickhouse/clickhouse1/zookeeper.xml | 15 -----------
 clickhouse/clickhouse2/clusters.xml  |  1 +
 clickhouse/clickhouse2/keeper.xml    | 40 ++++++++++++++++++++++++++++
 clickhouse/clickhouse2/macros.xml    |  3 ++-
 clickhouse/clickhouse2/zookeeper.xml | 15 -----------
 httpdocs/dist                        |  2 +-
 tests/e2e                            |  2 +-
 10 files changed, 88 insertions(+), 34 deletions(-)
 create mode 100644 clickhouse/clickhouse1/keeper.xml
 delete mode 100644 clickhouse/clickhouse1/zookeeper.xml
 create mode 100644 clickhouse/clickhouse2/keeper.xml
 delete mode 100644 clickhouse/clickhouse2/zookeeper.xml

diff --git a/clickhouse/clickhouse1/clusters.xml b/clickhouse/clickhouse1/clusters.xml
index 27c2f9de43..eff230eac8 100644
--- a/clickhouse/clickhouse1/clusters.xml
+++ b/clickhouse/clickhouse1/clusters.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" ?>
 <clickhouse>
   <remote_servers>
     <ntop_cluster>
diff --git a/clickhouse/clickhouse1/keeper.xml b/clickhouse/clickhouse1/keeper.xml
new file mode 100644
index 0000000000..ab379cd14d
--- /dev/null
+++ b/clickhouse/clickhouse1/keeper.xml
@@ -0,0 +1,40 @@
+<clickhouse>
+  <keeper_server>
+    <tcp_port>2181</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>warning</raft_logs_level>
+      <rotate_log_storage_interval>10000</rotate_log_storage_interval>
+    </coordination_settings>
+
+    <raft_configuration>
+      <server>
+	<id>1</id>
+	<hostname>192.168.2.92</hostname>
+	<port>9444</port>
+      </server>
+      <server>
+	<id>2</id>
+	<hostname>192.168.2.93</hostname>
+	<port>9444</port>
+      </server>
+    </raft_configuration>
+
+  </keeper_server>
+
+  <zookeeper>
+    <node>
+      <host>localhost</host>
+      <port>2181</port>
+    </node>
+  </zookeeper>
+
+  <distributed_ddl>
+    <path>/clickhouse/ntop_cluster/task_queue/ddl</path>
+  </distributed_ddl>
+</clickhouse>
diff --git a/clickhouse/clickhouse1/macros.xml b/clickhouse/clickhouse1/macros.xml
index 9518592730..09df10e646 100644
--- a/clickhouse/clickhouse1/macros.xml
+++ b/clickhouse/clickhouse1/macros.xml
@@ -1,7 +1,8 @@
+<?xml version="1.0" ?>
 <clickhouse>
   <macros>
     <cluster>ntop_cluster</cluster>
+    <replica>replica1</replica>
     <shard>1</shard>
-    <replica>clickhouse1</replica>
   </macros>
 </clickhouse>
diff --git a/clickhouse/clickhouse1/zookeeper.xml b/clickhouse/clickhouse1/zookeeper.xml
deleted file mode 100644
index 79236a5761..0000000000
--- a/clickhouse/clickhouse1/zookeeper.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<clickhouse>
-  <zookeeper>
-    <node>
-      <host>192.168.2.221</host>
-      <port>2181</port>
-    </node>
-    <session_timeout_ms>30000</session_timeout_ms>
-    <operation_timeout_ms>10000</operation_timeout_ms>
-    <!-- <root>/path/to/zookeeper/node</root> -->
-    <!-- <identity>user:password</identity> -->
-  </zookeeper>
-  <distributed_ddl>
-    <path>/clickhouse/task_queue/ddl</path>
-  </distributed_ddl>
-</clickhouse>
diff --git a/clickhouse/clickhouse2/clusters.xml b/clickhouse/clickhouse2/clusters.xml
index 27c2f9de43..eff230eac8 100644
--- a/clickhouse/clickhouse2/clusters.xml
+++ b/clickhouse/clickhouse2/clusters.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" ?>
 <clickhouse>
   <remote_servers>
     <ntop_cluster>
diff --git a/clickhouse/clickhouse2/keeper.xml b/clickhouse/clickhouse2/keeper.xml
new file mode 100644
index 0000000000..7cbeaaf8fb
--- /dev/null
+++ b/clickhouse/clickhouse2/keeper.xml
@@ -0,0 +1,40 @@
+<clickhouse>
+  <keeper_server>
+    <tcp_port>2181</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>warning</raft_logs_level>
+      <rotate_log_storage_interval>10000</rotate_log_storage_interval>
+    </coordination_settings>
+
+    <raft_configuration>
+      <server>
+	<id>1</id>
+	<hostname>192.168.2.92</hostname>
+	<port>9444</port>
+      </server>
+      <server>
+	<id>2</id>
+	<hostname>192.168.2.93</hostname>
+	<port>9444</port>
+      </server>
+    </raft_configuration>
+
+  </keeper_server>
+
+  <zookeeper>
+    <node>
+      <host>localhost</host>
+      <port>2181</port>
+    </node>
+  </zookeeper>
+
+  <distributed_ddl>
+    <path>/clickhouse/ntop_cluster/task_queue/ddl</path>
+  </distributed_ddl>
+</clickhouse>
diff --git a/clickhouse/clickhouse2/macros.xml b/clickhouse/clickhouse2/macros.xml
index 61653e6c0b..8166044a56 100644
--- a/clickhouse/clickhouse2/macros.xml
+++ b/clickhouse/clickhouse2/macros.xml
@@ -1,7 +1,8 @@
+<?xml version="1.0" ?>
 <clickhouse>
   <macros>
     <cluster>ntop_cluster</cluster>
+    <replica>replica2</replica>
     <shard>1</shard>
-    <replica>clickhouse2</replica>
   </macros>
 </clickhouse>
diff --git a/clickhouse/clickhouse2/zookeeper.xml b/clickhouse/clickhouse2/zookeeper.xml
deleted file mode 100644
index 79236a5761..0000000000
--- a/clickhouse/clickhouse2/zookeeper.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<clickhouse>
-  <zookeeper>
-    <node>
-      <host>192.168.2.221</host>
-      <port>2181</port>
-    </node>
-    <session_timeout_ms>30000</session_timeout_ms>
-    <operation_timeout_ms>10000</operation_timeout_ms>
-    <!-- <root>/path/to/zookeeper/node</root> -->
-    <!-- <identity>user:password</identity> -->
-  </zookeeper>
-  <distributed_ddl>
-    <path>/clickhouse/task_queue/ddl</path>
-  </distributed_ddl>
-</clickhouse>
diff --git a/httpdocs/dist b/httpdocs/dist
index a39060f999..993570b44b 160000
--- a/httpdocs/dist
+++ b/httpdocs/dist
@@ -1 +1 @@
-Subproject commit a39060f99963dcd60556e129b6b217c3c1a76620
+Subproject commit 993570b44b1aecfeeaba0a925831c4e8b93c9f73
diff --git a/tests/e2e b/tests/e2e
index 2952058b55..fd70672866 160000
--- a/tests/e2e
+++ b/tests/e2e
@@ -1 +1 @@
-Subproject commit 2952058b550dae1b4ef207ddf6124cde3cf33340
+Subproject commit fd70672866a6d1c54a6ab5906120e792c4d41432