From 302db2cb6673d8dcb0cf69ccdcf0f3b1be5470f6 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@zdjizhi.com>
Date: Tue, 4 Jan 2022 15:50:21 +0800
Subject: [PATCH] 22.01 update

---
 .../TSG-21.12/clickhouse/config.xml           |   3 +-
 .../TSG-21.12/clickhouse/users.xml            |  13 ---
 .../TSG-21.12/nacos/README.txt                |  11 ++
 .../TSG-22.01/clickhouse/update-01-ck.sql     | 101 +++++++++++-------
 4 files changed, 73 insertions(+), 55 deletions(-)
 delete mode 100644 TSG发布版本更新记录/TSG-21.12/clickhouse/users.xml
 create mode 100644 TSG发布版本更新记录/TSG-21.12/nacos/README.txt

diff --git a/TSG发布版本更新记录/TSG-21.12/clickhouse/config.xml b/TSG发布版本更新记录/TSG-21.12/clickhouse/config.xml
index 25c5bcd..4320e5e 100644
--- a/TSG发布版本更新记录/TSG-21.12/clickhouse/config.xml
+++ b/TSG发布版本更新记录/TSG-21.12/clickhouse/config.xml
@@ -1,3 +1,4 @@
 <!-- 将clickhouse的配置文件config.xml下面的最大查询并发度参数由150改为500 -->
 
-<max_concurrent_queries>500</max_concurrent_queries>
\ No newline at end of file
+<max_concurrent_queries>500</max_concurrent_queries>
+
diff --git a/TSG发布版本更新记录/TSG-21.12/clickhouse/users.xml b/TSG发布版本更新记录/TSG-21.12/clickhouse/users.xml
deleted file mode 100644
index 4c1c3cb..0000000
--- a/TSG发布版本更新记录/TSG-21.12/clickhouse/users.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- 将clickhouse的配置文件users.xml,在原有的default，readonly标签下新增以下配置-->
-
-<default>
-    <max_distributed_connections>4096</max_distributed_connections>
-    <connect_timeout>100</connect_timeout>
-</default>
-
-
-<readonly>
-<max_distributed_connections>4096</max_distributed_connections>
-<connect_timeout>100</connect_timeout>
-
-</readonly>
\ No newline at end of file
diff --git a/TSG发布版本更新记录/TSG-21.12/nacos/README.txt b/TSG发布版本更新记录/TSG-21.12/nacos/README.txt
new file mode 100644
index 0000000..4bca3f1
--- /dev/null
+++ b/TSG发布版本更新记录/TSG-21.12/nacos/README.txt
@@ -0,0 +1,11 @@
+nacos conf下application.properties
+
+jdbc配置增加
+
+&failOverReadOnly=false
+
+修改完成后重启nacos集群生效
+
+命令
+service keepnacosalive stop
+service keepnacosalive start
\ No newline at end of file
diff --git a/TSG发布版本更新记录/TSG-22.01/clickhouse/update-01-ck.sql b/TSG发布版本更新记录/TSG-22.01/clickhouse/update-01-ck.sql
index ed730c3..fd9c3ea 100644
--- a/TSG发布版本更新记录/TSG-22.01/clickhouse/update-01-ck.sql
+++ b/TSG发布版本更新记录/TSG-22.01/clickhouse/update-01-ck.sql
@@ -29,49 +29,35 @@ ALTER TABLE tsg_galaxy_v3.gtpc_record ON CLUSTER ck_query ADD COLUMN IF NOT EXIS
 ALTER TABLE tsg_galaxy_v3.voip_record ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS common_app_behavior String after common_device_group; 
 
 
-ALTER TABLE tsg_galaxy_v3.session_record ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS stratum_mining_program String after ssh_hassh; 
-ALTER TABLE tsg_galaxy_v3.session_record ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS stratum_mining_pools String after ssh_hassh; 
-ALTER TABLE tsg_galaxy_v3.session_record ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS stratum_cryptocurrency String after ssh_hassh; 
-
-ALTER TABLE tsg_galaxy_v3.security_event ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS stratum_mining_program String after ssh_hassh; 
-ALTER TABLE tsg_galaxy_v3.security_event ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS stratum_mining_pools String after ssh_hassh; 
-ALTER TABLE tsg_galaxy_v3.security_event ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS stratum_cryptocurrency String after ssh_hassh; 
-
-ALTER TABLE tsg_galaxy_v3.interim_session_record ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS stratum_mining_program String after ssh_hassh; 
-ALTER TABLE tsg_galaxy_v3.interim_session_record ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS stratum_mining_pools String after ssh_hassh; 
-ALTER TABLE tsg_galaxy_v3.interim_session_record ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS stratum_cryptocurrency String after ssh_hassh; 
-
-
-ALTER TABLE tsg_galaxy_v3.session_record ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS stratum_mining_program String after ssh_hassh; 
-ALTER TABLE tsg_galaxy_v3.session_record ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS stratum_mining_pools String after ssh_hassh; 
-ALTER TABLE tsg_galaxy_v3.session_record ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS stratum_cryptocurrency String after ssh_hassh; 
-
-ALTER TABLE tsg_galaxy_v3.security_event ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS stratum_mining_program String after ssh_hassh; 
-ALTER TABLE tsg_galaxy_v3.security_event ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS stratum_mining_pools String after ssh_hassh; 
-ALTER TABLE tsg_galaxy_v3.security_event ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS stratum_cryptocurrency String after ssh_hassh; 
-
-ALTER TABLE tsg_galaxy_v3.interim_session_record ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS stratum_mining_program String after ssh_hassh; 
-ALTER TABLE tsg_galaxy_v3.interim_session_record ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS stratum_mining_pools String after ssh_hassh; 
-ALTER TABLE tsg_galaxy_v3.interim_session_record ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS stratum_cryptocurrency String after ssh_hassh; 
-
-
-
-ALTER TABLE tsg_galaxy_v3.session_record_local ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS stratum_mining_program String after ssh_hassh; 
-ALTER TABLE tsg_galaxy_v3.session_record_local ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS stratum_mining_pools String after ssh_hassh; 
-ALTER TABLE tsg_galaxy_v3.session_record_local ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS stratum_cryptocurrency String after ssh_hassh; 
-
-ALTER TABLE tsg_galaxy_v3.security_event_local ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS stratum_mining_program String after ssh_hassh; 
-ALTER TABLE tsg_galaxy_v3.security_event_local ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS stratum_mining_pools String after ssh_hassh; 
-ALTER TABLE tsg_galaxy_v3.security_event_local ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS stratum_cryptocurrency String after ssh_hassh; 
-
-ALTER TABLE tsg_galaxy_v3.interim_session_record_local ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS stratum_mining_program String after ssh_hassh; 
-ALTER TABLE tsg_galaxy_v3.interim_session_record_local ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS stratum_mining_pools String after ssh_hassh; 
-ALTER TABLE tsg_galaxy_v3.interim_session_record_local ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS stratum_cryptocurrency String after ssh_hassh; 
-
-
-
+ALTER TABLE tsg_galaxy_v3.session_record_local ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS common_packet_capture_file String after common_link_info_s2c;
+ALTER TABLE tsg_galaxy_v3.interim_session_record_local ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS common_packet_capture_file String after common_link_info_s2c;
+ALTER TABLE tsg_galaxy_v3.transaction_record_local ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS common_packet_capture_file String after common_link_info_s2c;
+ALTER TABLE tsg_galaxy_v3.security_event_local ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS common_packet_capture_file String after common_link_info_s2c;
+ALTER TABLE tsg_galaxy_v3.proxy_event_local ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS common_packet_capture_file String after common_link_info_s2c;
+ALTER TABLE tsg_galaxy_v3.sys_packet_capture_event_local ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS common_packet_capture_file String after common_link_info_s2c;
+ALTER TABLE tsg_galaxy_v3.radius_record_local ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS common_packet_capture_file String after common_link_info_s2c;
+ALTER TABLE tsg_galaxy_v3.gtpc_record_local ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS common_packet_capture_file String after common_link_info_s2c;
+ALTER TABLE tsg_galaxy_v3.voip_record_local ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS common_packet_capture_file String after common_link_info_s2c;
 
+ALTER TABLE tsg_galaxy_v3.session_record ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS common_packet_capture_file String after common_link_info_s2c;
+ALTER TABLE tsg_galaxy_v3.interim_session_record ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS common_packet_capture_file String after common_link_info_s2c;
+ALTER TABLE tsg_galaxy_v3.transaction_record ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS common_packet_capture_file String after common_link_info_s2c;
+ALTER TABLE tsg_galaxy_v3.security_event ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS common_packet_capture_file String after common_link_info_s2c;
+ALTER TABLE tsg_galaxy_v3.proxy_event ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS common_packet_capture_file String after common_link_info_s2c;
+ALTER TABLE tsg_galaxy_v3.sys_packet_capture_event ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS common_packet_capture_file String after common_link_info_s2c;
+ALTER TABLE tsg_galaxy_v3.radius_record ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS common_packet_capture_file String after common_link_info_s2c;
+ALTER TABLE tsg_galaxy_v3.gtpc_record ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS common_packet_capture_file String after common_link_info_s2c;
+ALTER TABLE tsg_galaxy_v3.voip_record ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS common_packet_capture_file String after common_link_info_s2c;
 
+ALTER TABLE tsg_galaxy_v3.session_record ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS common_packet_capture_file String after common_link_info_s2c;
+ALTER TABLE tsg_galaxy_v3.interim_session_record ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS common_packet_capture_file String after common_link_info_s2c;
+ALTER TABLE tsg_galaxy_v3.transaction_record ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS common_packet_capture_file String after common_link_info_s2c;
+ALTER TABLE tsg_galaxy_v3.security_event ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS common_packet_capture_file String after common_link_info_s2c;
+ALTER TABLE tsg_galaxy_v3.proxy_event ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS common_packet_capture_file String after common_link_info_s2c;
+ALTER TABLE tsg_galaxy_v3.sys_packet_capture_event ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS common_packet_capture_file String after common_link_info_s2c;
+ALTER TABLE tsg_galaxy_v3.radius_record ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS common_packet_capture_file String after common_link_info_s2c;
+ALTER TABLE tsg_galaxy_v3.gtpc_record ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS common_packet_capture_file String after common_link_info_s2c;
+ALTER TABLE tsg_galaxy_v3.voip_record ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS common_packet_capture_file String after common_link_info_s2c;
 
 
 
@@ -80,9 +66,42 @@ ALTER TABLE tsg_galaxy_v3.interim_session_record_local ON CLUSTER ck_cluster ADD
 
 
 
+ALTER TABLE tsg_galaxy_v3.session_record ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS stratum_mining_program String after ssh_hassh;
+ALTER TABLE tsg_galaxy_v3.session_record ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS stratum_mining_pools String after ssh_hassh;
+ALTER TABLE tsg_galaxy_v3.session_record ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS stratum_cryptocurrency String after ssh_hassh;
+
+ALTER TABLE tsg_galaxy_v3.security_event ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS stratum_mining_program String after ssh_hassh;
+ALTER TABLE tsg_galaxy_v3.security_event ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS stratum_mining_pools String after ssh_hassh;
+ALTER TABLE tsg_galaxy_v3.security_event ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS stratum_cryptocurrency String after ssh_hassh;
+
+ALTER TABLE tsg_galaxy_v3.interim_session_record ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS stratum_mining_program String after ssh_hassh;
+ALTER TABLE tsg_galaxy_v3.interim_session_record ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS stratum_mining_pools String after ssh_hassh;
+ALTER TABLE tsg_galaxy_v3.interim_session_record ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS stratum_cryptocurrency String after ssh_hassh;
+
+
+ALTER TABLE tsg_galaxy_v3.session_record ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS stratum_mining_program String after ssh_hassh;
+ALTER TABLE tsg_galaxy_v3.session_record ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS stratum_mining_pools String after ssh_hassh;
+ALTER TABLE tsg_galaxy_v3.session_record ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS stratum_cryptocurrency String after ssh_hassh;
+
+ALTER TABLE tsg_galaxy_v3.security_event ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS stratum_mining_program String after ssh_hassh;
+ALTER TABLE tsg_galaxy_v3.security_event ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS stratum_mining_pools String after ssh_hassh;
+ALTER TABLE tsg_galaxy_v3.security_event ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS stratum_cryptocurrency String after ssh_hassh;
+
+ALTER TABLE tsg_galaxy_v3.interim_session_record ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS stratum_mining_program String after ssh_hassh;
+ALTER TABLE tsg_galaxy_v3.interim_session_record ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS stratum_mining_pools String after ssh_hassh;
+ALTER TABLE tsg_galaxy_v3.interim_session_record ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS stratum_cryptocurrency String after ssh_hassh;
 
 
 
+ALTER TABLE tsg_galaxy_v3.session_record_local ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS stratum_mining_program String after ssh_hassh;
+ALTER TABLE tsg_galaxy_v3.session_record_local ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS stratum_mining_pools String after ssh_hassh;
+ALTER TABLE tsg_galaxy_v3.session_record_local ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS stratum_cryptocurrency String after ssh_hassh;
 
+ALTER TABLE tsg_galaxy_v3.security_event_local ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS stratum_mining_program String after ssh_hassh;
+ALTER TABLE tsg_galaxy_v3.security_event_local ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS stratum_mining_pools String after ssh_hassh;
+ALTER TABLE tsg_galaxy_v3.security_event_local ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS stratum_cryptocurrency String after ssh_hassh;
 
+ALTER TABLE tsg_galaxy_v3.interim_session_record_local ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS stratum_mining_program String after ssh_hassh;
+ALTER TABLE tsg_galaxy_v3.interim_session_record_local ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS stratum_mining_pools String after ssh_hassh;
+ALTER TABLE tsg_galaxy_v3.interim_session_record_local ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS stratum_cryptocurrency String after ssh_hassh;