From 4bd0a620e5ad520c82b84b7ca809ef3289c17942 Mon Sep 17 00:00:00 2001 From: lifengchao Date: Mon, 23 Sep 2024 10:43:03 +0800 Subject: [PATCH 1/3] =?UTF-8?q?TSG-22675=20clickhouse=E6=96=B0=E5=A2=9ESSL?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tsg_olap_clickhouse_ddl.sql | 20 + .../tsg_olap_clickhouse_ddl_check.sql | 6 +- .../tsg_olap_clickhouse_ddl_24.10.sql | 3411 +++++++++++++++++ .../tsg_olap_clickhouse_ddl_check_24.10.sql | 22 + .../tsg_olap_clickhouse_ddl_upgrade_24.10.sql | 1027 +++++ 5 files changed, 4483 insertions(+), 3 deletions(-) create mode 100644 tsg_olap/upgrade/TSG-24.10/clickhouse/tsg_olap_clickhouse_ddl_24.10.sql create mode 100644 tsg_olap/upgrade/TSG-24.10/clickhouse/tsg_olap_clickhouse_ddl_check_24.10.sql create mode 100644 tsg_olap/upgrade/TSG-24.10/clickhouse/tsg_olap_clickhouse_ddl_upgrade_24.10.sql diff --git a/tsg_olap/installation/clickhouse/最新全量建表语句/tsg_olap_clickhouse_ddl.sql b/tsg_olap/installation/clickhouse/最新全量建表语句/tsg_olap_clickhouse_ddl.sql index 0840c6c..13890d3 100644 --- a/tsg_olap/installation/clickhouse/最新全量建表语句/tsg_olap_clickhouse_ddl.sql +++ b/tsg_olap/installation/clickhouse/最新全量建表语句/tsg_olap_clickhouse_ddl.sql @@ -220,6 +220,8 @@ ssl_cn String, ssl_handshake_latency_ms Nullable(Int32), ssl_ja3_hash String, ssl_ja3s_hash String, +ssl_ja4_fingerprint String, +ssl_ja4s_fingerprint String, ssl_cert_issuer String, ssl_cert_subject String, ssl_esni_flag Nullable(Int32), @@ -470,6 +472,8 @@ ssl_cn String, ssl_handshake_latency_ms Nullable(Int32), ssl_ja3_hash String, ssl_ja3s_hash String, +ssl_ja4_fingerprint String, +ssl_ja4s_fingerprint String, ssl_cert_issuer String, ssl_cert_subject String, ssl_esni_flag Nullable(Int32), @@ -718,6 +722,8 @@ ssl_cn String, ssl_handshake_latency_ms Nullable(Int32), ssl_ja3_hash String, ssl_ja3s_hash String, +ssl_ja4_fingerprint String, +ssl_ja4s_fingerprint String, ssl_cert_issuer String, ssl_cert_subject String, ssl_esni_flag Nullable(Int32), @@ -967,6 +973,8 @@ ssl_cn String, ssl_handshake_latency_ms Nullable(Int32), ssl_ja3_hash String, ssl_ja3s_hash String, +ssl_ja4_fingerprint String, +ssl_ja4s_fingerprint String, ssl_cert_issuer String, ssl_cert_subject String, ssl_esni_flag Nullable(Int32), @@ -1215,6 +1223,8 @@ ssl_cn String, ssl_handshake_latency_ms Nullable(Int32), ssl_ja3_hash String, ssl_ja3s_hash String, +ssl_ja4_fingerprint String, +ssl_ja4s_fingerprint String, ssl_cert_issuer String, ssl_cert_subject String, ssl_esni_flag Nullable(Int32), @@ -1464,6 +1474,8 @@ ssl_cn String, ssl_handshake_latency_ms Nullable(Int32), ssl_ja3_hash String, ssl_ja3s_hash String, +ssl_ja4_fingerprint String, +ssl_ja4s_fingerprint String, ssl_cert_issuer String, ssl_cert_subject String, ssl_esni_flag Nullable(Int32), @@ -2387,6 +2399,8 @@ TO tsg_galaxy_v3.security_event_local ssl_handshake_latency_ms Nullable(Int32), ssl_ja3_hash String, ssl_ja3s_hash String, + ssl_ja4_fingerprint String, + ssl_ja4s_fingerprint String, ssl_cert_issuer String, ssl_cert_subject String, ssl_esni_flag Nullable(Int32), @@ -2633,6 +2647,8 @@ SELECT ssl_handshake_latency_ms, ssl_ja3_hash, ssl_ja3s_hash, + ssl_ja4_fingerprint, + ssl_ja4s_fingerprint, ssl_cert_issuer, ssl_cert_subject, ssl_esni_flag, @@ -2884,6 +2900,8 @@ TO tsg_galaxy_v3.monitor_event_local ssl_handshake_latency_ms Nullable(Int32), ssl_ja3_hash String, ssl_ja3s_hash String, + ssl_ja4_fingerprint String, + ssl_ja4s_fingerprint String, ssl_cert_issuer String, ssl_cert_subject String, ssl_esni_flag Nullable(Int32), @@ -3130,6 +3148,8 @@ SELECT ssl_handshake_latency_ms, ssl_ja3_hash, ssl_ja3s_hash, + ssl_ja4_fingerprint, + ssl_ja4s_fingerprint, ssl_cert_issuer, ssl_cert_subject, ssl_esni_flag, 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 2bf242c..534cb8b 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 Date: Tue, 24 Sep 2024 17:56:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?TSG-22690=20Clickhouse=E6=96=B0=E5=A2=9Exx?= =?UTF-8?q?=5Frule=5Fuuid=5Flist=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tsg_olap_clickhouse_ddl.sql | 76 ++++++++++++- .../tsg_olap_clickhouse_ddl_check.sql | 8 +- .../tsg_olap_clickhouse_ddl_24.10.sql | 76 ++++++++++++- .../tsg_olap_clickhouse_ddl_check_24.10.sql | 8 +- .../tsg_olap_clickhouse_ddl_upgrade_24.10.sql | 107 +++++++++++++++++- 5 files changed, 261 insertions(+), 14 deletions(-) diff --git a/tsg_olap/installation/clickhouse/最新全量建表语句/tsg_olap_clickhouse_ddl.sql b/tsg_olap/installation/clickhouse/最新全量建表语句/tsg_olap_clickhouse_ddl.sql index 13890d3..4523b5f 100644 --- a/tsg_olap/installation/clickhouse/最新全量建表语句/tsg_olap_clickhouse_ddl.sql +++ b/tsg_olap/installation/clickhouse/最新全量建表语句/tsg_olap_clickhouse_ddl.sql @@ -116,12 +116,18 @@ flags_identify_info String, c2s_ttl Nullable(Int32), s2c_ttl Nullable(Int32), security_rule_list Array(Int64), +security_rule_uuid_list Array(String), security_action String, monitor_rule_list Array(Int64), +monitor_rule_uuid_list Array(String), shaping_rule_list Array(Int64), +shaping_rule_uuid_list Array(String), proxy_rule_list Array(Int64), +proxy_rule_uuid_list Array(String), statistics_rule_list Array(Int64), +statistics_rule_uuid_list Array(String), sc_rule_list Array(Int64), +sc_rule_uuid_list Array(String), sc_rsp_raw Array(Int64), sc_rsp_decrypted Array(Int64), proxy_action String, @@ -368,12 +374,18 @@ flags_identify_info String, c2s_ttl Nullable(Int32), s2c_ttl Nullable(Int32), security_rule_list Array(Int64), +security_rule_uuid_list Array(String), security_action String, monitor_rule_list Array(Int64), +monitor_rule_uuid_list Array(String), shaping_rule_list Array(Int64), +shaping_rule_uuid_list Array(String), proxy_rule_list Array(Int64), +proxy_rule_uuid_list Array(String), statistics_rule_list Array(Int64), +statistics_rule_uuid_list Array(String), sc_rule_list Array(Int64), +sc_rule_uuid_list Array(String), sc_rsp_raw Array(Int64), sc_rsp_decrypted Array(Int64), proxy_action String, @@ -618,12 +630,18 @@ flags_identify_info String, c2s_ttl Nullable(Int32), s2c_ttl Nullable(Int32), security_rule_list Array(Int64), +security_rule_uuid_list Array(String), security_action String, monitor_rule_list Array(Int64), +monitor_rule_uuid_list Array(String), shaping_rule_list Array(Int64), +shaping_rule_uuid_list Array(String), proxy_rule_list Array(Int64), +proxy_rule_uuid_list Array(String), statistics_rule_list Array(Int64), +statistics_rule_uuid_list Array(String), sc_rule_list Array(Int64), +sc_rule_uuid_list Array(String), sc_rsp_raw Array(Int64), sc_rsp_decrypted Array(Int64), proxy_action String, @@ -869,12 +887,18 @@ flags_identify_info String, c2s_ttl Nullable(Int32), s2c_ttl Nullable(Int32), security_rule_list Array(Int64), +security_rule_uuid_list Array(String), security_action String, monitor_rule_list Array(Int64), +monitor_rule_uuid_list Array(String), shaping_rule_list Array(Int64), +shaping_rule_uuid_list Array(String), proxy_rule_list Array(Int64), +proxy_rule_uuid_list Array(String), statistics_rule_list Array(Int64), +statistics_rule_uuid_list Array(String), sc_rule_list Array(Int64), +sc_rule_uuid_list Array(String), sc_rsp_raw Array(Int64), sc_rsp_decrypted Array(Int64), proxy_action String, @@ -1119,12 +1143,18 @@ flags_identify_info String, c2s_ttl Nullable(Int32), s2c_ttl Nullable(Int32), security_rule_list Array(Int64), +security_rule_uuid_list Array(String), security_action String, monitor_rule_list Array(Int64), +monitor_rule_uuid_list Array(String), shaping_rule_list Array(Int64), +shaping_rule_uuid_list Array(String), proxy_rule_list Array(Int64), +proxy_rule_uuid_list Array(String), statistics_rule_list Array(Int64), +statistics_rule_uuid_list Array(String), sc_rule_list Array(Int64), +sc_rule_uuid_list Array(String), sc_rsp_raw Array(Int64), sc_rsp_decrypted Array(Int64), proxy_action String, @@ -1370,12 +1400,18 @@ flags_identify_info String, c2s_ttl Nullable(Int32), s2c_ttl Nullable(Int32), security_rule_list Array(Int64), +security_rule_uuid_list Array(String), security_action String, monitor_rule_list Array(Int64), +monitor_rule_uuid_list Array(String), shaping_rule_list Array(Int64), +shaping_rule_uuid_list Array(String), proxy_rule_list Array(Int64), +proxy_rule_uuid_list Array(String), statistics_rule_list Array(Int64), +statistics_rule_uuid_list Array(String), sc_rule_list Array(Int64), +sc_rule_uuid_list Array(String), sc_rsp_raw Array(Int64), sc_rsp_decrypted Array(Int64), proxy_action String, @@ -1958,12 +1994,18 @@ flags_identify_info String, c2s_ttl Nullable(Int32), s2c_ttl Nullable(Int32), security_rule_list Array(Int64), +security_rule_uuid_list Array(String), security_action String, monitor_rule_list Array(Int64), +monitor_rule_uuid_list Array(String), shaping_rule_list Array(Int64), +shaping_rule_uuid_list Array(String), proxy_rule_list Array(Int64), +proxy_rule_uuid_list Array(String), statistics_rule_list Array(Int64), +statistics_rule_uuid_list Array(String), sc_rule_list Array(Int64), +sc_rule_uuid_list Array(String), sc_rsp_raw Array(Int64), sc_rsp_decrypted Array(Int64), proxy_action String, @@ -2126,12 +2168,18 @@ flags_identify_info String, c2s_ttl Nullable(Int32), s2c_ttl Nullable(Int32), security_rule_list Array(Int64), +security_rule_uuid_list Array(String), security_action String, monitor_rule_list Array(Int64), +monitor_rule_uuid_list Array(String), shaping_rule_list Array(Int64), +shaping_rule_uuid_list Array(String), proxy_rule_list Array(Int64), +proxy_rule_uuid_list Array(String), statistics_rule_list Array(Int64), +statistics_rule_uuid_list Array(String), sc_rule_list Array(Int64), +sc_rule_uuid_list Array(String), sc_rsp_raw Array(Int64), sc_rsp_decrypted Array(Int64), proxy_action String, @@ -2295,12 +2343,18 @@ TO tsg_galaxy_v3.security_event_local c2s_ttl Nullable(Int32), s2c_ttl Nullable(Int32), security_rule_list Array(Int64), + security_rule_uuid_list Array(String), security_action String, monitor_rule_list Array(Int64), + monitor_rule_uuid_list Array(String), shaping_rule_list Array(Int64), + shaping_rule_uuid_list Array(String), proxy_rule_list Array(Int64), + proxy_rule_uuid_list Array(String), statistics_rule_list Array(Int64), + statistics_rule_uuid_list Array(String), sc_rule_list Array(Int64), + sc_rule_uuid_list Array(String), sc_rsp_raw Array(Int64), sc_rsp_decrypted Array(Int64), proxy_action String, @@ -2543,12 +2597,18 @@ SELECT c2s_ttl, s2c_ttl, security_rule_list, + security_rule_uuid_list, security_action, monitor_rule_list, + monitor_rule_uuid_list, shaping_rule_list, + shaping_rule_uuid_list, proxy_rule_list, + proxy_rule_uuid_list, statistics_rule_list, + statistics_rule_uuid_list, sc_rule_list, + sc_rule_uuid_list, sc_rsp_raw, sc_rsp_decrypted, proxy_action, @@ -2762,7 +2822,7 @@ SELECT tunnel_endpoint_a_desc, tunnel_endpoint_b_desc FROM tsg_galaxy_v3.session_record_local -WHERE empty(security_rule_list) = 0 +WHERE empty(security_rule_uuid_list) = 0 ; -- tsg_galaxy_v3.monitor_event_materialized_view @@ -2796,12 +2856,18 @@ TO tsg_galaxy_v3.monitor_event_local c2s_ttl Nullable(Int32), s2c_ttl Nullable(Int32), security_rule_list Array(Int64), + security_rule_uuid_list Array(String), security_action String, monitor_rule_list Array(Int64), + monitor_rule_uuid_list Array(String), shaping_rule_list Array(Int64), + shaping_rule_uuid_list Array(String), proxy_rule_list Array(Int64), + proxy_rule_uuid_list Array(String), statistics_rule_list Array(Int64), + statistics_rule_uuid_list Array(String), sc_rule_list Array(Int64), + sc_rule_uuid_list Array(String), sc_rsp_raw Array(Int64), sc_rsp_decrypted Array(Int64), proxy_action String, @@ -3044,12 +3110,18 @@ SELECT c2s_ttl, s2c_ttl, security_rule_list, + security_rule_uuid_list, security_action, monitor_rule_list, + monitor_rule_uuid_list, shaping_rule_list, + shaping_rule_uuid_list, proxy_rule_list, + proxy_rule_uuid_list, statistics_rule_list, + statistics_rule_uuid_list, sc_rule_list, + sc_rule_uuid_list, sc_rsp_raw, sc_rsp_decrypted, proxy_action, @@ -3263,7 +3335,7 @@ SELECT tunnel_endpoint_a_desc, tunnel_endpoint_b_desc FROM tsg_galaxy_v3.session_record_local -WHERE empty(monitor_rule_list) = 0 +WHERE empty(monitor_rule_uuid_list) = 0 ; 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 534cb8b..db6a697 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 Date: Thu, 26 Sep 2024 10:50:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?TSG-22703=20clickhouse=E5=BA=93=E8=A1=A8dos?= =?UTF-8?q?=5Fevent=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5rule=5Fuuid?= =?UTF-8?q?=EF=BC=8C=E5=88=A0=E9=99=A4=E5=AD=97=E6=AE=B5profile=5Fid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../最新全量建表语句/tsg_olap_clickhouse_ddl.sql | 4 ++-- .../tsg_olap_clickhouse_ddl_check.sql | 2 +- .../clickhouse/tsg_olap_clickhouse_ddl_24.10.sql | 4 ++-- .../tsg_olap_clickhouse_ddl_check_24.10.sql | 2 +- .../tsg_olap_clickhouse_ddl_upgrade_24.10.sql | 11 +++++++++++ 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/tsg_olap/installation/clickhouse/最新全量建表语句/tsg_olap_clickhouse_ddl.sql b/tsg_olap/installation/clickhouse/最新全量建表语句/tsg_olap_clickhouse_ddl.sql index 4523b5f..450947c 100644 --- a/tsg_olap/installation/clickhouse/最新全量建表语句/tsg_olap_clickhouse_ddl.sql +++ b/tsg_olap/installation/clickhouse/最新全量建表语句/tsg_olap_clickhouse_ddl.sql @@ -4,8 +4,8 @@ CREATE TABLE IF NOT EXISTS tsg_galaxy_v3.dos_event_local on cluster ck_cluster ( vsys_id Int32, recv_time Int64, log_id UInt64, - profile_id Int64, rule_id Int64, + rule_uuid String, start_time Int64, end_time Int64, attack_type String, @@ -30,8 +30,8 @@ CREATE TABLE IF NOT EXISTS tsg_galaxy_v3.dos_event on cluster ck_cluster ( vsys_id Int32, recv_time Int64, log_id UInt64, - profile_id Int64, rule_id Int64, + rule_uuid String, start_time Int64, end_time Int64, attack_type String, 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 db6a697..7f40128 100644 --- a/tsg_olap/installation/clickhouse/最新全量建表语句/tsg_olap_clickhouse_ddl_check.sql +++ b/tsg_olap/installation/clickhouse/最新全量建表语句/tsg_olap_clickhouse_ddl_check.sql @@ -1,6 +1,6 @@ SELECT log_id, recv_time, vsys_id, assessment_date, lot_number, file_name, assessment_file, assessment_type, features, `size`, file_checksum_sha 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