From 9f10cb3f84cc593e5818eeb79f16c8f8d77789f1 Mon Sep 17 00:00:00 2001 From: lifengchao Date: Tue, 5 Nov 2024 09:25:36 +0800 Subject: [PATCH] =?UTF-8?q?TSG-23367=20Clickhouse=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=85=AC=E5=85=B1=E5=AD=97=E6=AE=B5subscriber=5Fid=5Fhmac,=20p?= =?UTF-8?q?hone=5Fnumber=5Fhmac?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tsg_olap_clickhouse_ddl.sql | 44 +- .../tsg_olap_clickhouse_ddl_check.sql | 11 +- .../tsg_olap_clickhouse_ddl_24.11.sql | 3535 +++++++++++++++++ .../tsg_olap_clickhouse_ddl_check_24.11.sql | 23 + .../tsg_olap_clickhouse_ddl_upgrade_24.11.sql | 1073 +++++ 5 files changed, 4673 insertions(+), 13 deletions(-) create mode 100644 tsg_olap/upgrade/TSG-24.11/clickhouse/tsg_olap_clickhouse_ddl_24.11.sql create mode 100644 tsg_olap/upgrade/TSG-24.11/clickhouse/tsg_olap_clickhouse_ddl_check_24.11.sql create mode 100644 tsg_olap/upgrade/TSG-24.11/clickhouse/tsg_olap_clickhouse_ddl_upgrade_24.11.sql diff --git a/tsg_olap/installation/clickhouse/最新全量建表语句/tsg_olap_clickhouse_ddl.sql b/tsg_olap/installation/clickhouse/最新全量建表语句/tsg_olap_clickhouse_ddl.sql index af8653a..10b5573 100644 --- a/tsg_olap/installation/clickhouse/最新全量建表语句/tsg_olap_clickhouse_ddl.sql +++ b/tsg_olap/installation/clickhouse/最新全量建表语句/tsg_olap_clickhouse_ddl.sql @@ -11,16 +11,18 @@ CREATE TABLE IF NOT EXISTS tsg_galaxy_v3.dos_event_local on cluster ck_cluster ( attack_type String, severity String, conditions String, + source_ip String, + source_country String, destination_ip String, destination_country String, source_ip_list String, source_country_list String, sessions Int64, - session_rate Int64, + session_rate Float64, packets Int64, - packet_rate Int64, + packet_rate Float64, bytes Int64, - bit_rate Int64 + bit_rate Float64 ) ENGINE = MergeTree PARTITION BY toYYYYMMDD(toDate(recv_time)) @@ -37,16 +39,18 @@ CREATE TABLE IF NOT EXISTS tsg_galaxy_v3.dos_event on cluster ck_cluster ( attack_type String, severity String, conditions String, + source_ip String, + source_country String, destination_ip String, destination_country String, source_ip_list String, source_country_list String, sessions Int64, - session_rate Int64, + session_rate Float64, packets Int64, - packet_rate Int64, + packet_rate Float64, bytes Int64, - bit_rate Int64 + bit_rate Float64 ) ENGINE =Distributed(ck_cluster,tsg_galaxy_v3,dos_event_local,rand()); @@ -153,9 +157,11 @@ client_administrative_area String, client_sub_administrative_area String, client_asn Nullable(Int64), subscriber_id String, +subscriber_id_hmac String, imei String, imsi String, phone_number String, +phone_number_hmac String, apn String, mobile_identify String, server_ip String, @@ -413,9 +419,11 @@ client_administrative_area String, client_sub_administrative_area String, client_asn Nullable(Int64), subscriber_id String, +subscriber_id_hmac String, imei String, imsi String, phone_number String, +phone_number_hmac String, apn String, mobile_identify String, server_ip String, @@ -671,9 +679,11 @@ client_administrative_area String, client_sub_administrative_area String, client_asn Nullable(Int64), subscriber_id String, +subscriber_id_hmac String, imei String, imsi String, phone_number String, +phone_number_hmac String, apn String, mobile_identify String, server_ip String, @@ -930,9 +940,11 @@ client_administrative_area String, client_sub_administrative_area String, client_asn Nullable(Int64), subscriber_id String, +subscriber_id_hmac String, imei String, imsi String, phone_number String, +phone_number_hmac String, apn String, mobile_identify String, server_ip String, @@ -1188,9 +1200,11 @@ client_administrative_area String, client_sub_administrative_area String, client_asn Nullable(Int64), subscriber_id String, +subscriber_id_hmac String, imei String, imsi String, phone_number String, +phone_number_hmac String, apn String, mobile_identify String, server_ip String, @@ -1447,9 +1461,11 @@ client_administrative_area String, client_sub_administrative_area String, client_asn Nullable(Int64), subscriber_id String, +subscriber_id_hmac String, imei String, imsi String, phone_number String, +phone_number_hmac String, apn String, mobile_identify String, server_ip String, @@ -2043,9 +2059,11 @@ client_administrative_area String, client_sub_administrative_area String, client_asn Nullable(Int64), subscriber_id String, +subscriber_id_hmac String, imei String, imsi String, phone_number String, +phone_number_hmac String, apn String, mobile_identify String, server_ip String, @@ -2219,9 +2237,11 @@ client_administrative_area String, client_sub_administrative_area String, client_asn Nullable(Int64), subscriber_id String, +subscriber_id_hmac String, imei String, imsi String, phone_number String, +phone_number_hmac String, apn String, mobile_identify String, server_ip String, @@ -2396,9 +2416,11 @@ TO tsg_galaxy_v3.security_event_local client_sub_administrative_area String, client_asn Nullable(Int64), subscriber_id String, + subscriber_id_hmac String, imei String, imsi String, phone_number String, + phone_number_hmac String, apn String, mobile_identify String, server_ip String, @@ -2652,9 +2674,11 @@ SELECT client_sub_administrative_area, client_asn, subscriber_id, + subscriber_id_hmac, imei, imsi, phone_number, + phone_number_hmac, apn, mobile_identify, server_ip, @@ -2842,7 +2866,7 @@ SELECT tunnel_endpoint_a_desc, tunnel_endpoint_b_desc FROM tsg_galaxy_v3.session_record_local -WHERE empty(security_rule_uuid_list) = 0 +WHERE notEmpty(security_rule_uuid_list) ; -- tsg_galaxy_v3.monitor_event_materialized_view @@ -2913,9 +2937,11 @@ TO tsg_galaxy_v3.monitor_event_local client_sub_administrative_area String, client_asn Nullable(Int64), subscriber_id String, + subscriber_id_hmac String, imei String, imsi String, phone_number String, + phone_number_hmac String, apn String, mobile_identify String, server_ip String, @@ -3169,9 +3195,11 @@ SELECT client_sub_administrative_area, client_asn, subscriber_id, + subscriber_id_hmac, imei, imsi, phone_number, + phone_number_hmac, apn, mobile_identify, server_ip, @@ -3359,7 +3387,7 @@ SELECT tunnel_endpoint_a_desc, tunnel_endpoint_b_desc FROM tsg_galaxy_v3.session_record_local -WHERE empty(monitor_rule_uuid_list) = 0 +WHERE notEmpty(monitor_rule_uuid_list) ; 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 ecac32c..577dffc 100644 --- a/tsg_olap/installation/clickhouse/最新全量建表语句/tsg_olap_clickhouse_ddl_check.sql +++ b/tsg_olap/installation/clickhouse/最新全量建表语句/tsg_olap_clickhouse_ddl_check.sql @@ -1,14 +1,14 @@ 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 = toUnixTimestamp('2030-01-01 00:00:00') AND recv_time = toUnixTimestamp( SELECT log_id, recv_time, vsys_id, device_id, device_group, data_center, direction, ip_protocol, client_ip, server_ip, internal_ip, external_ip, client_country, server_country, client_asn, server_asn, server_fqdn, server_domain, app, app_category, c2s_ttl, s2c_ttl, c2s_link_id, s2c_link_id, sessions, bytes, sent_bytes, received_bytes, pkts, sent_pkts, received_pkts, asymmetric_c2s_flows, asymmetric_s2c_flows, c2s_fragments, s2c_fragments, c2s_tcp_lost_bytes, s2c_tcp_lost_bytes, c2s_tcp_retransmitted_pkts, s2c_tcp_retransmitted_pkts FROM tsg_galaxy_v3.traffic_sketch_metric 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