From b84aad80c7b65fcff74ad356bac12aa93807e6b9 Mon Sep 17 00:00:00 2001
From: karencfv <karencfv@users.noreply.github.com>
Date: Tue, 19 Nov 2024 17:11:58 +1300
Subject: [PATCH 1/2] Enable system.metric_log and
 system.asynchronous_metric_log tables

---
 clickhouse-admin/types/src/config.rs | 32 ++++++++++++++++++++++++++++
 smf/clickhouse/config.xml            | 32 ++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+)

diff --git a/clickhouse-admin/types/src/config.rs b/clickhouse-admin/types/src/config.rs
index 27eb569b91..b51cf78216 100644
--- a/clickhouse-admin/types/src/config.rs
+++ b/clickhouse-admin/types/src/config.rs
@@ -132,6 +132,38 @@ impl ReplicaConfig {
         <flush_interval_milliseconds>10000</flush_interval_milliseconds>
     </query_log>
 
+    <metric_log>
+        <database>system</database>
+        <table>metric_log</table>
+        <!-- 
+            TTL will be 30 days until we've finished long running tests.
+            After that, we can reduce it to a week or two.
+        -->
+        <engine>Engine = MergeTree ORDER BY event_time TTL event_date + INTERVAL 30 DAY</engine>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+        <collect_interval_milliseconds>1000</collect_interval_milliseconds>
+        <max_size_rows>1048576</max_size_rows>
+        <reserved_size_rows>8192</reserved_size_rows>
+        <buffer_size_rows_flush_threshold>524288</buffer_size_rows_flush_threshold>
+        <flush_on_crash>false</flush_on_crash>
+    </metric_log>
+
+    <asynchronous_metric_log>
+        <database>system</database>
+        <table>asynchronous_metric_log</table>
+        <!-- 
+            TTL will be 30 days until we've finished long running tests.
+            After that, we can reduce it to a week or two.
+        -->
+        <engine>Engine = MergeTree ORDER BY event_time TTL event_date + INTERVAL 30 DAY</engine>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+        <collect_interval_milliseconds>1000</collect_interval_milliseconds>
+        <max_size_rows>1048576</max_size_rows>
+        <reserved_size_rows>8192</reserved_size_rows>
+        <buffer_size_rows_flush_threshold>524288</buffer_size_rows_flush_threshold>
+        <flush_on_crash>false</flush_on_crash>
+    </asynchronous_metric_log>
+
     <tmp_path>{temp_files_path}</tmp_path>
     <user_files_path>{user_files_path}</user_files_path>
     <default_profile>default</default_profile>
diff --git a/smf/clickhouse/config.xml b/smf/clickhouse/config.xml
index 58ae5dcaf5..6b85f4f45a 100644
--- a/smf/clickhouse/config.xml
+++ b/smf/clickhouse/config.xml
@@ -13,6 +13,38 @@
         <flush_interval_milliseconds>10000</flush_interval_milliseconds>
     </query_log>
 
+    <metric_log>
+        <database>system</database>
+        <table>metric_log</table>
+        <!-- 
+            TTL will be 30 days until we've finished long running tests.
+            After that, we can reduce it to a week or two.
+        -->
+        <engine>Engine = MergeTree ORDER BY event_time TTL event_date + INTERVAL 30 DAY</engine>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+        <collect_interval_milliseconds>1000</collect_interval_milliseconds>
+        <max_size_rows>1048576</max_size_rows>
+        <reserved_size_rows>8192</reserved_size_rows>
+        <buffer_size_rows_flush_threshold>524288</buffer_size_rows_flush_threshold>
+        <flush_on_crash>false</flush_on_crash>
+    </metric_log>
+
+    <asynchronous_metric_log>
+        <database>system</database>
+        <table>asynchronous_metric_log</table>
+        <!-- 
+            TTL will be 30 days until we've finished long running tests.
+            After that, we can reduce it to a week or two.
+        -->
+        <engine>Engine = MergeTree ORDER BY event_time TTL event_date + INTERVAL 30 DAY</engine>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+        <collect_interval_milliseconds>1000</collect_interval_milliseconds>
+        <max_size_rows>1048576</max_size_rows>
+        <reserved_size_rows>8192</reserved_size_rows>
+        <buffer_size_rows_flush_threshold>524288</buffer_size_rows_flush_threshold>
+        <flush_on_crash>false</flush_on_crash>
+    </asynchronous_metric_log>
+
     <mlock_executable>true</mlock_executable>
 
     <tcp_port>9000</tcp_port>

From 11c6e1d293de65f5b0bcf861ac6dd0bab13c04a6 Mon Sep 17 00:00:00 2001
From: karencfv <karencfv@users.noreply.github.com>
Date: Tue, 19 Nov 2024 17:31:20 +1300
Subject: [PATCH 2/2] clean up

---
 clickhouse-admin/types/src/config.rs          |  4 +--
 .../types/testutils/replica-server-config.xml | 32 +++++++++++++++++++
 smf/clickhouse/config.xml                     |  4 +--
 3 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/clickhouse-admin/types/src/config.rs b/clickhouse-admin/types/src/config.rs
index b51cf78216..120ff32312 100644
--- a/clickhouse-admin/types/src/config.rs
+++ b/clickhouse-admin/types/src/config.rs
@@ -135,7 +135,7 @@ impl ReplicaConfig {
     <metric_log>
         <database>system</database>
         <table>metric_log</table>
-        <!-- 
+        <!--
             TTL will be 30 days until we've finished long running tests.
             After that, we can reduce it to a week or two.
         -->
@@ -151,7 +151,7 @@ impl ReplicaConfig {
     <asynchronous_metric_log>
         <database>system</database>
         <table>asynchronous_metric_log</table>
-        <!-- 
+        <!--
             TTL will be 30 days until we've finished long running tests.
             After that, we can reduce it to a week or two.
         -->
diff --git a/clickhouse-admin/types/testutils/replica-server-config.xml b/clickhouse-admin/types/testutils/replica-server-config.xml
index 3aeacd073d..8a0687e9af 100644
--- a/clickhouse-admin/types/testutils/replica-server-config.xml
+++ b/clickhouse-admin/types/testutils/replica-server-config.xml
@@ -49,6 +49,38 @@
         <flush_interval_milliseconds>10000</flush_interval_milliseconds>
     </query_log>
 
+    <metric_log>
+        <database>system</database>
+        <table>metric_log</table>
+        <!--
+            TTL will be 30 days until we've finished long running tests.
+            After that, we can reduce it to a week or two.
+        -->
+        <engine>Engine = MergeTree ORDER BY event_time TTL event_date + INTERVAL 30 DAY</engine>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+        <collect_interval_milliseconds>1000</collect_interval_milliseconds>
+        <max_size_rows>1048576</max_size_rows>
+        <reserved_size_rows>8192</reserved_size_rows>
+        <buffer_size_rows_flush_threshold>524288</buffer_size_rows_flush_threshold>
+        <flush_on_crash>false</flush_on_crash>
+    </metric_log>
+
+    <asynchronous_metric_log>
+        <database>system</database>
+        <table>asynchronous_metric_log</table>
+        <!--
+            TTL will be 30 days until we've finished long running tests.
+            After that, we can reduce it to a week or two.
+        -->
+        <engine>Engine = MergeTree ORDER BY event_time TTL event_date + INTERVAL 30 DAY</engine>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+        <collect_interval_milliseconds>1000</collect_interval_milliseconds>
+        <max_size_rows>1048576</max_size_rows>
+        <reserved_size_rows>8192</reserved_size_rows>
+        <buffer_size_rows_flush_threshold>524288</buffer_size_rows_flush_threshold>
+        <flush_on_crash>false</flush_on_crash>
+    </asynchronous_metric_log>
+
     <tmp_path>./data/tmp</tmp_path>
     <user_files_path>./data/user_files</user_files_path>
     <default_profile>default</default_profile>
diff --git a/smf/clickhouse/config.xml b/smf/clickhouse/config.xml
index 6b85f4f45a..352023300a 100644
--- a/smf/clickhouse/config.xml
+++ b/smf/clickhouse/config.xml
@@ -16,7 +16,7 @@
     <metric_log>
         <database>system</database>
         <table>metric_log</table>
-        <!-- 
+        <!--
             TTL will be 30 days until we've finished long running tests.
             After that, we can reduce it to a week or two.
         -->
@@ -32,7 +32,7 @@
     <asynchronous_metric_log>
         <database>system</database>
         <table>asynchronous_metric_log</table>
-        <!-- 
+        <!--
             TTL will be 30 days until we've finished long running tests.
             After that, we can reduce it to a week or two.
         -->