From 3980d5b7c77c2900343c8809b5a37caaef738f4d Mon Sep 17 00:00:00 2001
From: houjinchuan <houjinchuan@iie.ac.cn>
Date: Tue, 11 Jul 2023 15:37:13 +0800
Subject: [PATCH] =?UTF-8?q?cn=2023.07=20ck=20session=5Frecord=5Fcn?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9Ecommon=5Fserver=5Ffqdn=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CN-23.07/clickhouse/update-23.07-ck.sql   | 32 +++++++++++++++++++
 .../Clickhouse_CN_建表语句.sql                |  5 ++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 CN发布版本更新记录/CN-23.07/clickhouse/update-23.07-ck.sql

diff --git a/CN发布版本更新记录/CN-23.07/clickhouse/update-23.07-ck.sql b/CN发布版本更新记录/CN-23.07/clickhouse/update-23.07-ck.sql
new file mode 100644
index 0000000..59b240f
--- /dev/null
+++ b/CN发布版本更新记录/CN-23.07/clickhouse/update-23.07-ck.sql
@@ -0,0 +1,32 @@
+ALTER table cyber_narrator_galaxy.session_record_cn_local on cluster ck_cluster add column IF NOT EXISTS common_server_fqdn  String after common_server_port;
+ALTER table cyber_narrator_galaxy.session_record_cn on cluster ck_cluster add column IF NOT EXISTS common_server_fqdn  String after common_server_port;
+ALTER table cyber_narrator_galaxy.session_record_cn on cluster ck_query add column IF NOT EXISTS common_server_fqdn  String after common_server_port;
+
+
+drop view IF EXISTS cyber_narrator_galaxy.cn_entity_relation_view ON CLUSTER ck_cluster;
+
+create MATERIALIZED VIEW if not exists cyber_narrator_galaxy.cn_entity_relation_view on cluster ck_cluster TO cyber_narrator_galaxy.cn_entity_relation_local
+(
+    app_name String,
+    fqdn String,
+    ip String,
+    country String,
+    province String,
+    region String,
+    asn String,
+    create_time Int64,
+    update_time Int64
+) AS
+SELECT
+    common_app_label AS app_name,
+    common_server_fqdn AS fqdn,
+    common_server_ip AS ip,
+    anyLast(server_country) AS country,
+    anyLast(server_province) AS province,
+    anyLast(server_region) AS region,
+    anyLast(server_asn) AS asn,
+    min(c1.common_recv_time) AS create_time,
+    max(c1.common_recv_time) AS update_time
+FROM cyber_narrator_galaxy.session_record_cn_local c1
+where common_l4_protocol ='IPv4_TCP' OR common_server_port in(53,443)
+GROUP BY ip,app_name,fqdn;  
\ No newline at end of file
diff --git a/Clickhouse最新全量建表语句/Clickhouse_CN_建表语句.sql b/Clickhouse最新全量建表语句/Clickhouse_CN_建表语句.sql
index cc4191e..0349280 100644
--- a/Clickhouse最新全量建表语句/Clickhouse_CN_建表语句.sql
+++ b/Clickhouse最新全量建表语句/Clickhouse_CN_建表语句.sql
@@ -14,6 +14,7 @@ CREATE TABLE IF NOT EXISTS cyber_narrator_galaxy.session_record_cn_local ON CLUS
   common_server_ip  String,
   common_client_port  Int64,
   common_server_port  Int64,
+  common_server_fqdn  String,
   common_app_label  String,
   common_app_id  String,
   common_l4_protocol  String,
@@ -138,6 +139,7 @@ CREATE TABLE IF NOT EXISTS cyber_narrator_galaxy.session_record_cn ON CLUSTER ck
   common_server_ip  String,
   common_client_port  Int64,
   common_server_port  Int64,
+  common_server_fqdn  String,
   common_app_label  String,
   common_app_id  String,
   common_l4_protocol  String,
@@ -262,6 +264,7 @@ CREATE TABLE IF NOT EXISTS cyber_narrator_galaxy.session_record_cn ON CLUSTER ck
   common_server_ip  String,
   common_client_port  Int64,
   common_server_port  Int64,
+  common_server_fqdn  String,
   common_app_label  String,
   common_app_id  String,
   common_l4_protocol  String,
@@ -1825,7 +1828,7 @@ ENGINE = Distributed('ck_cluster',
 ) AS
 SELECT
     common_app_label AS app_name,
-    ssl_sni AS fqdn,
+    common_server_fqdn AS fqdn,
     common_server_ip AS ip,
     anyLast(server_country) AS country,
     anyLast(server_province) AS province,