From 53fa4d61b99540f4012b52fbdf23ca3737ecabcb Mon Sep 17 00:00:00 2001 From: lifengchao Date: Fri, 29 Mar 2024 17:35:00 +0800 Subject: [PATCH] =?UTF-8?q?TSG-20207=20=E5=9F=BA=E4=BA=8EClient/Server=20G?= =?UTF-8?q?eolocation=20=E5=A2=9E=E5=8A=A0=E7=9B=B8=E5=85=B3=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E5=AD=97=E6=AE=B5(client=5Fcountry,client=5Fsuper=5Fa?= =?UTF-8?q?dministrative=5Farea,client=5Fadministrative=5Farea,client=5Fsu?= =?UTF-8?q?b=5Fadministrative=5Farea,=20server=5Fcountry,server=5Fsuper=5F?= =?UTF-8?q?administrative=5Farea,server=5Fadministrative=5Farea,server=5Fs?= =?UTF-8?q?ub=5Fadministrative=5Farea)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Clickhouse_TSG_建表语句.sql | 152 +++ .../Clickhouse_TSG_校验sql.sql | 10 +- .../TSG-24.04/clickhouse/check-24.04.sql | 10 +- .../TSG-24.04/clickhouse/update-24.04-ck.sql | 1121 +++++++++++++++++ 4 files changed, 1283 insertions(+), 10 deletions(-) diff --git a/Clickhouse最新全量建表语句/Clickhouse_TSG_建表语句.sql b/Clickhouse最新全量建表语句/Clickhouse_TSG_建表语句.sql index 4187890..0c586e9 100644 --- a/Clickhouse最新全量建表语句/Clickhouse_TSG_建表语句.sql +++ b/Clickhouse最新全量建表语句/Clickhouse_TSG_建表语句.sql @@ -175,6 +175,10 @@ client_ip String, client_port Int32, client_os_desc String, client_geolocation LowCardinality(String), +client_country String, +client_super_administrative_area String, +client_administrative_area String, +client_sub_administrative_area String, client_asn Nullable(Int64), subscriber_id String, imei String, @@ -185,6 +189,10 @@ server_ip String, server_port Int32, server_os_desc String, server_geolocation LowCardinality(String), +server_country String, +server_super_administrative_area String, +server_administrative_area String, +server_sub_administrative_area String, server_asn Nullable(Int64), server_fqdn String, server_domain String, @@ -406,6 +414,10 @@ client_ip String, client_port Int32, client_os_desc String, client_geolocation LowCardinality(String), +client_country String, +client_super_administrative_area String, +client_administrative_area String, +client_sub_administrative_area String, client_asn Nullable(Int64), subscriber_id String, imei String, @@ -416,6 +428,10 @@ server_ip String, server_port Int32, server_os_desc String, server_geolocation LowCardinality(String), +server_country String, +server_super_administrative_area String, +server_administrative_area String, +server_sub_administrative_area String, server_asn Nullable(Int64), server_fqdn String, server_domain String, @@ -635,6 +651,10 @@ client_ip String, client_port Int32, client_os_desc String, client_geolocation LowCardinality(String), +client_country String, +client_super_administrative_area String, +client_administrative_area String, +client_sub_administrative_area String, client_asn Nullable(Int64), subscriber_id String, imei String, @@ -645,6 +665,10 @@ server_ip String, server_port Int32, server_os_desc String, server_geolocation LowCardinality(String), +server_country String, +server_super_administrative_area String, +server_administrative_area String, +server_sub_administrative_area String, server_asn Nullable(Int64), server_fqdn String, server_domain String, @@ -863,6 +887,10 @@ client_ip String, client_port Int32, client_os_desc String, client_geolocation LowCardinality(String), +client_country String, +client_super_administrative_area String, +client_administrative_area String, +client_sub_administrative_area String, client_asn Nullable(Int64), subscriber_id String, imei String, @@ -873,6 +901,10 @@ server_ip String, server_port Int32, server_os_desc String, server_geolocation LowCardinality(String), +server_country String, +server_super_administrative_area String, +server_administrative_area String, +server_sub_administrative_area String, server_asn Nullable(Int64), server_fqdn String, server_domain String, @@ -1093,6 +1125,10 @@ client_ip String, client_port Int32, client_os_desc String, client_geolocation LowCardinality(String), +client_country String, +client_super_administrative_area String, +client_administrative_area String, +client_sub_administrative_area String, client_asn Nullable(Int64), subscriber_id String, imei String, @@ -1103,6 +1139,10 @@ server_ip String, server_port Int32, server_os_desc String, server_geolocation LowCardinality(String), +server_country String, +server_super_administrative_area String, +server_administrative_area String, +server_sub_administrative_area String, server_asn Nullable(Int64), server_fqdn String, server_domain String, @@ -1321,6 +1361,10 @@ client_ip String, client_port Int32, client_os_desc String, client_geolocation LowCardinality(String), +client_country String, +client_super_administrative_area String, +client_administrative_area String, +client_sub_administrative_area String, client_asn Nullable(Int64), subscriber_id String, imei String, @@ -1331,6 +1375,10 @@ server_ip String, server_port Int32, server_os_desc String, server_geolocation LowCardinality(String), +server_country String, +server_super_administrative_area String, +server_administrative_area String, +server_sub_administrative_area String, server_asn Nullable(Int64), server_fqdn String, server_domain String, @@ -1550,6 +1598,10 @@ client_ip String, client_port Int32, client_os_desc String, client_geolocation LowCardinality(String), +client_country String, +client_super_administrative_area String, +client_administrative_area String, +client_sub_administrative_area String, client_asn Nullable(Int64), subscriber_id String, imei String, @@ -1560,6 +1612,10 @@ server_ip String, server_port Int32, server_os_desc String, server_geolocation LowCardinality(String), +server_country String, +server_super_administrative_area String, +server_administrative_area String, +server_sub_administrative_area String, server_asn Nullable(Int64), server_fqdn String, server_domain String, @@ -1780,6 +1836,10 @@ client_ip String, client_port Int32, client_os_desc String, client_geolocation LowCardinality(String), +client_country String, +client_super_administrative_area String, +client_administrative_area String, +client_sub_administrative_area String, client_asn Nullable(Int64), subscriber_id String, imei String, @@ -1790,6 +1850,10 @@ server_ip String, server_port Int32, server_os_desc String, server_geolocation LowCardinality(String), +server_country String, +server_super_administrative_area String, +server_administrative_area String, +server_sub_administrative_area String, server_asn Nullable(Int64), server_fqdn String, server_domain String, @@ -2008,6 +2072,10 @@ client_ip String, client_port Int32, client_os_desc String, client_geolocation LowCardinality(String), +client_country String, +client_super_administrative_area String, +client_administrative_area String, +client_sub_administrative_area String, client_asn Nullable(Int64), subscriber_id String, imei String, @@ -2018,6 +2086,10 @@ server_ip String, server_port Int32, server_os_desc String, server_geolocation LowCardinality(String), +server_country String, +server_super_administrative_area String, +server_administrative_area String, +server_sub_administrative_area String, server_asn Nullable(Int64), server_fqdn String, server_domain String, @@ -2516,6 +2588,10 @@ client_ip String, client_port Int32, client_os_desc String, client_geolocation LowCardinality(String), +client_country String, +client_super_administrative_area String, +client_administrative_area String, +client_sub_administrative_area String, client_asn Nullable(Int64), subscriber_id String, imei String, @@ -2526,6 +2602,10 @@ server_ip String, server_port Int32, server_os_desc String, server_geolocation LowCardinality(String), +server_country String, +server_super_administrative_area String, +server_administrative_area String, +server_sub_administrative_area String, server_asn Nullable(Int64), server_fqdn String, server_domain String, @@ -2635,6 +2715,10 @@ client_ip String, client_port Int32, client_os_desc String, client_geolocation LowCardinality(String), +client_country String, +client_super_administrative_area String, +client_administrative_area String, +client_sub_administrative_area String, client_asn Nullable(Int64), subscriber_id String, imei String, @@ -2645,6 +2729,10 @@ server_ip String, server_port Int32, server_os_desc String, server_geolocation LowCardinality(String), +server_country String, +server_super_administrative_area String, +server_administrative_area String, +server_sub_administrative_area String, server_asn Nullable(Int64), server_fqdn String, server_domain String, @@ -2752,6 +2840,10 @@ client_ip String, client_port Int32, client_os_desc String, client_geolocation LowCardinality(String), +client_country String, +client_super_administrative_area String, +client_administrative_area String, +client_sub_administrative_area String, client_asn Nullable(Int64), subscriber_id String, imei String, @@ -2762,6 +2854,10 @@ server_ip String, server_port Int32, server_os_desc String, server_geolocation LowCardinality(String), +server_country String, +server_super_administrative_area String, +server_administrative_area String, +server_sub_administrative_area String, server_asn Nullable(Int64), server_fqdn String, server_domain String, @@ -2871,6 +2967,10 @@ client_ip String, client_port Int32, client_os_desc String, client_geolocation LowCardinality(String), +client_country String, +client_super_administrative_area String, +client_administrative_area String, +client_sub_administrative_area String, client_asn Nullable(Int64), subscriber_id String, imei String, @@ -2881,6 +2981,10 @@ server_ip String, server_port Int32, server_os_desc String, server_geolocation LowCardinality(String), +server_country String, +server_super_administrative_area String, +server_administrative_area String, +server_sub_administrative_area String, server_asn Nullable(Int64), server_fqdn String, server_domain String, @@ -3022,6 +3126,10 @@ client_ip String, client_port Int32, client_os_desc String, client_geolocation LowCardinality(String), +client_country String, +client_super_administrative_area String, +client_administrative_area String, +client_sub_administrative_area String, client_asn Nullable(Int64), subscriber_id String, imei String, @@ -3032,6 +3140,10 @@ server_ip String, server_port Int32, server_os_desc String, server_geolocation LowCardinality(String), +server_country String, +server_super_administrative_area String, +server_administrative_area String, +server_sub_administrative_area String, server_asn Nullable(Int64), server_fqdn String, server_domain String, @@ -3170,6 +3282,10 @@ client_ip String, client_port Int32, client_os_desc String, client_geolocation LowCardinality(String), +client_country String, +client_super_administrative_area String, +client_administrative_area String, +client_sub_administrative_area String, client_asn Nullable(Int64), subscriber_id String, imei String, @@ -3180,6 +3296,10 @@ server_ip String, server_port Int32, server_os_desc String, server_geolocation LowCardinality(String), +server_country String, +server_super_administrative_area String, +server_administrative_area String, +server_sub_administrative_area String, server_asn Nullable(Int64), server_fqdn String, server_domain String, @@ -3322,6 +3442,10 @@ TO tsg_galaxy_v3.security_event_local client_port Int32, client_os_desc String, client_geolocation LowCardinality(String), + client_country String, + client_super_administrative_area String, + client_administrative_area String, + client_sub_administrative_area String, client_asn Nullable(Int64), subscriber_id String, imei String, @@ -3332,6 +3456,10 @@ TO tsg_galaxy_v3.security_event_local server_port Int32, server_os_desc String, server_geolocation LowCardinality(String), + server_country String, + server_super_administrative_area String, + server_administrative_area String, + server_sub_administrative_area String, server_asn Nullable(Int64), server_fqdn String, server_domain String, @@ -3549,6 +3677,10 @@ SELECT client_port, client_os_desc, client_geolocation, + client_country, + client_super_administrative_area, + client_administrative_area, + client_sub_administrative_area, client_asn, subscriber_id, imei, @@ -3559,6 +3691,10 @@ SELECT server_port, server_os_desc, server_geolocation, + server_country, + server_super_administrative_area, + server_administrative_area, + server_sub_administrative_area, server_asn, server_fqdn, server_domain, @@ -3781,6 +3917,10 @@ TO tsg_galaxy_v3.monitor_event_local client_port Int32, client_os_desc String, client_geolocation LowCardinality(String), + client_country String, + client_super_administrative_area String, + client_administrative_area String, + client_sub_administrative_area String, client_asn Nullable(Int64), subscriber_id String, imei String, @@ -3791,6 +3931,10 @@ TO tsg_galaxy_v3.monitor_event_local server_port Int32, server_os_desc String, server_geolocation LowCardinality(String), + server_country String, + server_super_administrative_area String, + server_administrative_area String, + server_sub_administrative_area String, server_asn Nullable(Int64), server_fqdn String, server_domain String, @@ -4008,6 +4152,10 @@ SELECT client_port, client_os_desc, client_geolocation, + client_country, + client_super_administrative_area, + client_administrative_area, + client_sub_administrative_area, client_asn, subscriber_id, imei, @@ -4018,6 +4166,10 @@ SELECT server_port, server_os_desc, server_geolocation, + server_country, + server_super_administrative_area, + server_administrative_area, + server_sub_administrative_area, server_asn, server_fqdn, server_domain, diff --git a/Clickhouse最新全量建表语句/Clickhouse_TSG_校验sql.sql b/Clickhouse最新全量建表语句/Clickhouse_TSG_校验sql.sql index fe00711..5ffa6b3 100644 --- a/Clickhouse最新全量建表语句/Clickhouse_TSG_校验sql.sql +++ b/Clickhouse最新全量建表语句/Clickhouse_TSG_校验sql.sql @@ -2,17 +2,17 @@ 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