From ba2eb4879dfa7e0d67852c7bad2ffa380de0d739 Mon Sep 17 00:00:00 2001 From: lifengchao Date: Mon, 22 Jul 2024 14:44:00 +0800 Subject: [PATCH] =?UTF-8?q?TSG-21890=20clickhouse=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=85=AC=E5=85=B1=E5=AD=97=E6=AE=B5client=5Fip=5Ftags/server?= =?UTF-8?q?=5Fip=5Ftags/server=5Ffqdn=5Ftags?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tsg_olap_clickhouse_ddl.sql | 37 +- .../tsg_olap_clickhouse_ddl_check.sql | 8 +- .../tsg_olap_clickhouse_ddl_24.08.sql | 3377 +++++++++++++++++ .../tsg_olap_clickhouse_ddl_check_24.08.sql | 22 + .../tsg_olap_clickhouse_ddl_upgrade_24.08.sql | 1034 +++++ 5 files changed, 4473 insertions(+), 5 deletions(-) create mode 100644 tsg_olap/upgrade/TSG-24.08/clickhouse/tsg_olap_clickhouse_ddl_24.08.sql create mode 100644 tsg_olap/upgrade/TSG-24.08/clickhouse/tsg_olap_clickhouse_ddl_check_24.08.sql create mode 100644 tsg_olap/upgrade/TSG-24.08/clickhouse/tsg_olap_clickhouse_ddl_upgrade_24.08.sql diff --git a/tsg_olap/installation/clickhouse/最新全量建表语句/tsg_olap_clickhouse_ddl.sql b/tsg_olap/installation/clickhouse/最新全量建表语句/tsg_olap_clickhouse_ddl.sql index 5fb146b..b9c94b1 100644 --- a/tsg_olap/installation/clickhouse/最新全量建表语句/tsg_olap_clickhouse_ddl.sql +++ b/tsg_olap/installation/clickhouse/最新全量建表语句/tsg_olap_clickhouse_ddl.sql @@ -137,6 +137,7 @@ proxy_intercept_error String, monitor_mirrored_pkts Nullable(Int32), monitor_mirrored_bytes Nullable(Int32), client_ip String, +client_ip_tags Array(String), client_port Int32, client_os_desc String, client_geolocation LowCardinality(String), @@ -151,6 +152,7 @@ imsi String, phone_number String, apn String, server_ip String, +server_ip_tags Array(String), server_port Int32, server_os_desc String, server_geolocation LowCardinality(String), @@ -160,6 +162,7 @@ server_administrative_area String, server_sub_administrative_area String, server_asn Nullable(Int64), server_fqdn String, +server_fqdn_tags Array(String), server_domain String, app_transition String,  app LowCardinality(String), @@ -383,6 +386,7 @@ proxy_intercept_error String, monitor_mirrored_pkts Nullable(Int32), monitor_mirrored_bytes Nullable(Int32), client_ip String, +client_ip_tags Array(String), client_port Int32, client_os_desc String, client_geolocation LowCardinality(String), @@ -397,6 +401,7 @@ imsi String, phone_number String, apn String, server_ip String, +server_ip_tags Array(String), server_port Int32, server_os_desc String, server_geolocation LowCardinality(String), @@ -406,6 +411,7 @@ server_administrative_area String, server_sub_administrative_area String, server_asn Nullable(Int64), server_fqdn String, +server_fqdn_tags Array(String), server_domain String, app_transition String,  app LowCardinality(String), @@ -627,6 +633,7 @@ proxy_intercept_error String, monitor_mirrored_pkts Nullable(Int32), monitor_mirrored_bytes Nullable(Int32), client_ip String, +client_ip_tags Array(String), client_port Int32, client_os_desc String, client_geolocation LowCardinality(String), @@ -641,6 +648,7 @@ imsi String, phone_number String, apn String, server_ip String, +server_ip_tags Array(String), server_port Int32, server_os_desc String, server_geolocation LowCardinality(String), @@ -650,6 +658,7 @@ server_administrative_area String, server_sub_administrative_area String, server_asn Nullable(Int64), server_fqdn String, +server_fqdn_tags Array(String), server_domain String, app_transition String,  app LowCardinality(String), @@ -872,6 +881,7 @@ proxy_intercept_error String, monitor_mirrored_pkts Nullable(Int32), monitor_mirrored_bytes Nullable(Int32), client_ip String, +client_ip_tags Array(String), client_port Int32, client_os_desc String, client_geolocation LowCardinality(String), @@ -886,6 +896,7 @@ imsi String, phone_number String, apn String, server_ip String, +server_ip_tags Array(String), server_port Int32, server_os_desc String, server_geolocation LowCardinality(String), @@ -895,6 +906,7 @@ server_administrative_area String, server_sub_administrative_area String, server_asn Nullable(Int64), server_fqdn String, +server_fqdn_tags Array(String), server_domain String, app_transition String,  app LowCardinality(String), @@ -1116,6 +1128,7 @@ proxy_intercept_error String, monitor_mirrored_pkts Nullable(Int32), monitor_mirrored_bytes Nullable(Int32), client_ip String, +client_ip_tags Array(String), client_port Int32, client_os_desc String, client_geolocation LowCardinality(String), @@ -1130,6 +1143,7 @@ imsi String, phone_number String, apn String, server_ip String, +server_ip_tags Array(String), server_port Int32, server_os_desc String, server_geolocation LowCardinality(String), @@ -1139,6 +1153,7 @@ server_administrative_area String, server_sub_administrative_area String, server_asn Nullable(Int64), server_fqdn String, +server_fqdn_tags Array(String), server_domain String, app_transition String,  app LowCardinality(String), @@ -1361,6 +1376,7 @@ proxy_intercept_error String, monitor_mirrored_pkts Nullable(Int32), monitor_mirrored_bytes Nullable(Int32), client_ip String, +client_ip_tags Array(String), client_port Int32, client_os_desc String, client_geolocation LowCardinality(String), @@ -1375,6 +1391,7 @@ imsi String, phone_number String, apn String, server_ip String, +server_ip_tags Array(String), server_port Int32, server_os_desc String, server_geolocation LowCardinality(String), @@ -1384,6 +1401,7 @@ server_administrative_area String, server_sub_administrative_area String, server_asn Nullable(Int64), server_fqdn String, +server_fqdn_tags Array(String), server_domain String, app_transition String,  app LowCardinality(String), @@ -1939,6 +1957,7 @@ proxy_intercept_error String, monitor_mirrored_pkts Nullable(Int32), monitor_mirrored_bytes Nullable(Int32), client_ip String, +client_ip_tags Array(String), client_port Int32, client_os_desc String, client_geolocation LowCardinality(String), @@ -1953,6 +1972,7 @@ imsi String, phone_number String, apn String, server_ip String, +server_ip_tags Array(String), server_port Int32, server_os_desc String, server_geolocation LowCardinality(String), @@ -1962,6 +1982,7 @@ server_administrative_area String, server_sub_administrative_area String, server_asn Nullable(Int64), server_fqdn String, +server_fqdn_tags Array(String), server_domain String, app_transition String,  app LowCardinality(String), @@ -2104,6 +2125,7 @@ proxy_intercept_error String, monitor_mirrored_pkts Nullable(Int32), monitor_mirrored_bytes Nullable(Int32), client_ip String, +client_ip_tags Array(String), client_port Int32, client_os_desc String, client_geolocation LowCardinality(String), @@ -2118,6 +2140,7 @@ imsi String, phone_number String, apn String, server_ip String, +server_ip_tags Array(String), server_port Int32, server_os_desc String, server_geolocation LowCardinality(String), @@ -2127,6 +2150,7 @@ server_administrative_area String, server_sub_administrative_area String, server_asn Nullable(Int64), server_fqdn String, +server_fqdn_tags Array(String), server_domain String, app_transition String,  app LowCardinality(String), @@ -2218,7 +2242,6 @@ tunnel_endpoint_b_desc String ENGINE =Distributed(ck_cluster,tsg_galaxy_v3,proxy_event_local,rand()); - -- tsg_galaxy_v3.security_event_materialized_view CREATE MATERIALIZED VIEW IF NOT EXISTS tsg_galaxy_v3.security_event_materialized_view on cluster ck_cluster TO tsg_galaxy_v3.security_event_local @@ -2271,6 +2294,7 @@ TO tsg_galaxy_v3.security_event_local monitor_mirrored_pkts Nullable(Int32), monitor_mirrored_bytes Nullable(Int32), client_ip String, + client_ip_tags Array(String), client_port Int32, client_os_desc String, client_geolocation LowCardinality(String), @@ -2285,6 +2309,7 @@ TO tsg_galaxy_v3.security_event_local phone_number String, apn String, server_ip String, + server_ip_tags Array(String), server_port Int32, server_os_desc String, server_geolocation LowCardinality(String), @@ -2294,6 +2319,7 @@ TO tsg_galaxy_v3.security_event_local server_sub_administrative_area String, server_asn Nullable(Int64), server_fqdn String, + server_fqdn_tags Array(String), server_domain String, app_transition String, app LowCardinality(String), @@ -2513,6 +2539,7 @@ SELECT monitor_mirrored_pkts, monitor_mirrored_bytes, client_ip, + client_ip_tags, client_port, client_os_desc, client_geolocation, @@ -2527,6 +2554,7 @@ SELECT phone_number, apn, server_ip, + server_ip_tags, server_port, server_os_desc, server_geolocation, @@ -2536,6 +2564,7 @@ SELECT server_sub_administrative_area, server_asn, server_fqdn, + server_fqdn_tags, server_domain, app_transition, app, @@ -2760,6 +2789,7 @@ TO tsg_galaxy_v3.monitor_event_local monitor_mirrored_pkts Nullable(Int32), monitor_mirrored_bytes Nullable(Int32), client_ip String, + client_ip_tags Array(String), client_port Int32, client_os_desc String, client_geolocation LowCardinality(String), @@ -2774,6 +2804,7 @@ TO tsg_galaxy_v3.monitor_event_local phone_number String, apn String, server_ip String, + server_ip_tags Array(String), server_port Int32, server_os_desc String, server_geolocation LowCardinality(String), @@ -2783,6 +2814,7 @@ TO tsg_galaxy_v3.monitor_event_local server_sub_administrative_area String, server_asn Nullable(Int64), server_fqdn String, + server_fqdn_tags Array(String), server_domain String, app_transition String, app LowCardinality(String), @@ -3002,6 +3034,7 @@ SELECT monitor_mirrored_pkts, monitor_mirrored_bytes, client_ip, + client_ip_tags, client_port, client_os_desc, client_geolocation, @@ -3016,6 +3049,7 @@ SELECT phone_number, apn, server_ip, + server_ip_tags, server_port, server_os_desc, server_geolocation, @@ -3025,6 +3059,7 @@ SELECT server_sub_administrative_area, server_asn, server_fqdn, + server_fqdn_tags, server_domain, app_transition, app, 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 a0582a9..e13e871 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