From e13413f9f2711dbac941b1308788f6b73956a048 Mon Sep 17 00:00:00 2001 From: lifengchao Date: Wed, 6 Nov 2024 15:28:53 +0800 Subject: [PATCH] =?UTF-8?q?TSG-23436=20Clickhouse=E8=A1=A5=E5=85=85?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5sc=5Frsp=5Fraw=5Fuuid=5Flis?= =?UTF-8?q?t,sc=5Frsp=5Fdecrypted=5Fuuid=5Flist?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tsg_olap_clickhouse_ddl.sql | 24 ++++++++++++ .../tsg_olap_clickhouse_ddl_check.sql | 8 ++-- .../tsg_olap_clickhouse_ddl_24.10.sql | 24 ++++++++++++ .../tsg_olap_clickhouse_ddl_check_24.10.sql | 8 ++-- .../tsg_olap_clickhouse_ddl_upgrade_24.10.sql | 38 ++++++++++++++++++- .../tsg_olap_clickhouse_ddl_24.11.sql | 24 ++++++++++++ .../tsg_olap_clickhouse_ddl_check_24.11.sql | 8 ++-- .../tsg_olap_clickhouse_ddl_upgrade_24.11.sql | 8 ++++ 8 files changed, 129 insertions(+), 13 deletions(-) diff --git a/tsg_olap/installation/clickhouse/最新全量建表语句/tsg_olap_clickhouse_ddl.sql b/tsg_olap/installation/clickhouse/最新全量建表语句/tsg_olap_clickhouse_ddl.sql index 10b5573..461f5f4 100644 --- a/tsg_olap/installation/clickhouse/最新全量建表语句/tsg_olap_clickhouse_ddl.sql +++ b/tsg_olap/installation/clickhouse/最新全量建表语句/tsg_olap_clickhouse_ddl.sql @@ -133,7 +133,9 @@ statistics_rule_uuid_list Array(String), sc_rule_list Array(Int64), sc_rule_uuid_list Array(String), sc_rsp_raw Array(Int64), +sc_rsp_raw_uuid_list Array(String), sc_rsp_decrypted Array(Int64), +sc_rsp_decrypted_uuid_list Array(String), proxy_action String, proxy_pinning_status Nullable(Int32), proxy_intercept_status Nullable(Int32), @@ -395,7 +397,9 @@ statistics_rule_uuid_list Array(String), sc_rule_list Array(Int64), sc_rule_uuid_list Array(String), sc_rsp_raw Array(Int64), +sc_rsp_raw_uuid_list Array(String), sc_rsp_decrypted Array(Int64), +sc_rsp_decrypted_uuid_list Array(String), proxy_action String, proxy_pinning_status Nullable(Int32), proxy_intercept_status Nullable(Int32), @@ -655,7 +659,9 @@ statistics_rule_uuid_list Array(String), sc_rule_list Array(Int64), sc_rule_uuid_list Array(String), sc_rsp_raw Array(Int64), +sc_rsp_raw_uuid_list Array(String), sc_rsp_decrypted Array(Int64), +sc_rsp_decrypted_uuid_list Array(String), proxy_action String, proxy_pinning_status Nullable(Int32), proxy_intercept_status Nullable(Int32), @@ -916,7 +922,9 @@ statistics_rule_uuid_list Array(String), sc_rule_list Array(Int64), sc_rule_uuid_list Array(String), sc_rsp_raw Array(Int64), +sc_rsp_raw_uuid_list Array(String), sc_rsp_decrypted Array(Int64), +sc_rsp_decrypted_uuid_list Array(String), proxy_action String, proxy_pinning_status Nullable(Int32), proxy_intercept_status Nullable(Int32), @@ -1176,7 +1184,9 @@ statistics_rule_uuid_list Array(String), sc_rule_list Array(Int64), sc_rule_uuid_list Array(String), sc_rsp_raw Array(Int64), +sc_rsp_raw_uuid_list Array(String), sc_rsp_decrypted Array(Int64), +sc_rsp_decrypted_uuid_list Array(String), proxy_action String, proxy_pinning_status Nullable(Int32), proxy_intercept_status Nullable(Int32), @@ -1437,7 +1447,9 @@ statistics_rule_uuid_list Array(String), sc_rule_list Array(Int64), sc_rule_uuid_list Array(String), sc_rsp_raw Array(Int64), +sc_rsp_raw_uuid_list Array(String), sc_rsp_decrypted Array(Int64), +sc_rsp_decrypted_uuid_list Array(String), proxy_action String, proxy_pinning_status Nullable(Int32), proxy_intercept_status Nullable(Int32), @@ -2035,7 +2047,9 @@ statistics_rule_uuid_list Array(String), sc_rule_list Array(Int64), sc_rule_uuid_list Array(String), sc_rsp_raw Array(Int64), +sc_rsp_raw_uuid_list Array(String), sc_rsp_decrypted Array(Int64), +sc_rsp_decrypted_uuid_list Array(String), proxy_action String, proxy_pinning_status Nullable(Int32), proxy_intercept_status Nullable(Int32), @@ -2213,7 +2227,9 @@ statistics_rule_uuid_list Array(String), sc_rule_list Array(Int64), sc_rule_uuid_list Array(String), sc_rsp_raw Array(Int64), +sc_rsp_raw_uuid_list Array(String), sc_rsp_decrypted Array(Int64), +sc_rsp_decrypted_uuid_list Array(String), proxy_action String, proxy_pinning_status Nullable(Int32), proxy_intercept_status Nullable(Int32), @@ -2392,7 +2408,9 @@ TO tsg_galaxy_v3.security_event_local sc_rule_list Array(Int64), sc_rule_uuid_list Array(String), sc_rsp_raw Array(Int64), + sc_rsp_raw_uuid_list Array(String), sc_rsp_decrypted Array(Int64), + sc_rsp_decrypted_uuid_list Array(String), proxy_action String, proxy_pinning_status Nullable(Int32), proxy_intercept_status Nullable(Int32), @@ -2650,7 +2668,9 @@ SELECT sc_rule_list, sc_rule_uuid_list, sc_rsp_raw, + sc_rsp_raw_uuid_list, sc_rsp_decrypted, + sc_rsp_decrypted_uuid_list, proxy_action, proxy_pinning_status, proxy_intercept_status, @@ -2913,7 +2933,9 @@ TO tsg_galaxy_v3.monitor_event_local sc_rule_list Array(Int64), sc_rule_uuid_list Array(String), sc_rsp_raw Array(Int64), + sc_rsp_raw_uuid_list Array(String), sc_rsp_decrypted Array(Int64), + sc_rsp_decrypted_uuid_list Array(String), proxy_action String, proxy_pinning_status Nullable(Int32), proxy_intercept_status Nullable(Int32), @@ -3171,7 +3193,9 @@ SELECT sc_rule_list, sc_rule_uuid_list, sc_rsp_raw, + sc_rsp_raw_uuid_list, sc_rsp_decrypted, + sc_rsp_decrypted_uuid_list, proxy_action, proxy_pinning_status, proxy_intercept_status, diff --git a/tsg_olap/installation/clickhouse/最新全量建表语句/tsg_olap_clickhouse_ddl_check.sql b/tsg_olap/installation/clickhouse/最新全量建表语句/tsg_olap_clickhouse_ddl_check.sql index 577dffc..73d7b66 100644 --- a/tsg_olap/installation/clickhouse/最新全量建表语句/tsg_olap_clickhouse_ddl_check.sql +++ b/tsg_olap/installation/clickhouse/最新全量建表语句/tsg_olap_clickhouse_ddl_check.sql @@ -2,13 +2,13 @@ SELECT log_id, recv_time, vsys_id, assessment_date, lot_number, file_name, asses FROM tsg_galaxy_v3.assessment_event where recv_time >= toUnixTimestamp('2030-01-01 00:00:00') AND recv_time = toUnixTimestamp('2030-01-01 00:00:00') AND recv_time = toUnixTimestamp('2030-01-01 00:00:00') AND recv_time = toUnixTimestamp('2030-01-01 00:00:00') AND recv_time = toUnixTimestamp('2030-01-01 00:00:00') AND recv_time = toUnixTimestamp('2030-01-01 00:00:00') AND recv_time = toUnixTimestamp('2030-01-01 00:00:00') AND recv_time = toUnixTimestamp('2030-01-01 00:00:00') AND recv_time = toUnixTimestamp('2030-01-01 00:00:00') AND recv_time = toUnixTimestamp('2030-01-01 00:00:00') AND recv_time = toUnixTimestamp('2030-01-01 00:00:00') AND recv_time = toUnixTimestamp('2030-01-01 00:00:00') AND recv_time = toUnixTimestamp('2030-01-01 00:00:00') AND recv_time = toUnixTimestamp('2030-01-01 00:00:00') AND recv_time = toUnixTimestamp('2030-01-01 00:00:00') AND recv_time = toUnixTimestamp('2030-01-01 00:00:00') AND recv_time = toUnixTimestamp('2030-01-01 00:00:00') AND recv_time = toUnixTimestamp('2030-01-01 00:00:00') AND recv_time = toUnixTimestamp('2030-01-01 00:00:00') AND recv_time = toUnixTimestamp('2030-01-01 00:00:00') AND recv_time = toUnixTimestamp('2030-01-01 00:00:00') AND recv_time