Merge branch 'feature/v1.0.3-220707' into 'master'

Feature/v1.0.3 220707

See merge request project/proto/dataflow!3

.vscode/setting.json

@@ -0,0 +1,5 @@
+{
+    "protoc": {
+        "options": ["-I proto"]
+    }
+}

ApmBaseDataFlow.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+import "Base.proto" ;
+
 option java_multiple_files = false;
 option java_package = "com.yuandian.dataflow.proto.msgtype";
 option go_package = "../grpc-gen;grpcgen";
@@ -14,8 +16,8 @@ message ApmBaseDataFlow {
     uint32 probe_if = 2;
     uint32 tuple_source = 3;
     uint32 tuple_dest = 4;
-    uint32 tuple_saddr = 5;
-    uint32 tuple_daddr = 6;
+    IPAddress tuple_saddr = 5;
+    IPAddress tuple_daddr = 6;
     string src_mac = 7;
     string dst_mac = 8;
     uint32 vlan_id = 9;

AppFlow.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+import "Base.proto" ;
+
 option java_multiple_files = false;
 option java_package = "com.yuandian.dataflow.proto.msgtype";
 option go_package = "../grpc-gen;grpcgen";
@@ -9,10 +11,10 @@ package dataflow;
 
 message AppFlow { 
     int32 table_id = 1;	//编号17
-    uint32 src_ip = 2
+    IPAddress src_ip = 2;
     uint32 src_port = 3;
-    uint32 dst_ip = 4;
-    uint32 dst_port = 5
+    IPAddress dst_ip = 4;
+    uint32 dst_port = 5;
     uint32 s_tv_sec = 6;
     uint32 s_tv_usec = 7;
     uint32 l_tv_sec = 8;
@@ -26,10 +28,10 @@ message AppFlow {
     string protocol = 16;
     uint32 app_id = 17;
     uint32 app_group_id = 18;
-    uint32 probe_id = 19;
+    uint32 probe_if = 19;
     uint32 app_style = 20;
     uint32 time_flag = 21;
     int32 vlan_id = 22;
     int32 mpls_label = 23;
     int32 tos = 24;
-}
+}

BacktrackingFlow.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+import "Base.proto" ;
+
 option java_multiple_files = false;
 option java_package = "com.yuandian.dataflow.proto.msgtype";
 option go_package = "../grpc-gen;grpcgen";
@@ -10,22 +12,22 @@ package dataflow;
 message BacktrackingFlow {
 
     int32 table_id = 1;	//编号20
-int64 mac_src = 2;
-int64 mac_dst = 3;
-int64 ip_src = 4;
-int64 ip_dst = 5;
-int32 port_src = 6;
-int32 port_dst = 7;
-int32 l3_proto = 8;
-int32 l4_proto = 9;
-int32 tos = 10;
-int32 vlan_id = 11;
-uint64 bytes = 12;
-uint64 packets = 13;
-uint64 tcp_sp = 14;
-uint64 tcp_scpn = 15;
-uint64 tcp_srp = 16;
-uint32 app_id = 17;
-uint32 app_group_id = 18;
-int32 mpls_label = 19;
-}
+	int64 mac_src = 2;
+	int64 mac_dst = 3;
+	IPAddress ip_src = 4;
+	IPAddress ip_dst = 5;
+	int32 port_src = 6;
+	int32 port_dst = 7;
+	int32 l3_proto = 8;
+	int32 l4_proto = 9;
+	int32 tos = 10;
+	int32 vlan_id = 11;
+	uint64 bytes = 12;
+	uint64 packets = 13;
+	uint64 tcp_sp = 14;
+	uint64 tcp_scpn = 15;
+	uint64 tcp_srp = 16;
+	uint32 app_id = 17;
+	uint32 app_group_id = 18;
+	int32 mpls_label = 19;
+}

Base.proto

@@ -5,7 +5,6 @@ import "google/protobuf/any.proto";
 
 option java_multiple_files = false; //不要拆分成多个文件
 option java_package = "com.yuandian.dataflow.proto";
-
 option go_package = "../grpc-gen;grpcgen";
  
 package dataflow;
@@ -22,6 +21,13 @@ message Request {
     repeated google.protobuf.Any param = 3; // 请求的可变参数. 暂不使用
 }
 
+message IPAddress {
+    oneof IP {
+        bytes v4 = 1;
+        bytes v6 = 2;
+    }
+}
+
 service CollectPacketsServer {
     rpc GetPackets (Request) returns (stream Response);
 }

BussFlowDb.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+import "Base.proto" ;
+
 option java_multiple_files = false;
 option java_package = "com.yuandian.dataflow.proto.msgtype";
 option go_package = "../grpc-gen;grpcgen";
@@ -10,7 +12,7 @@ package dataflow;
 
 message BussFlowDb {
 
-    int32    table_id = 1;	//编号24
+int32    table_id = 1;	//编号24
 uint32 msg_type = 2;
 string msg_version = 3;
 uint32 msg_seq = 4;
@@ -32,9 +34,9 @@ uint32 recog_status = 19;
 uint32 probe_if = 20;
 string channel = 21;
 string dbname = 22;
-uint32 request_ip = 23;
+IPAddress request_ip = 23;
 uint32 request_port = 24;
-uint32 response_ip = 25;
+IPAddress response_ip = 25;
 uint32 response_port = 26;
 int64 status = 27;
 int64 server_translate_time = 28;
@@ -61,4 +63,4 @@ string req_data = 48;
 string res_data = 49;
 string reserved = 50;
 
-}
+}

BussFlowExternal.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+import "Base.proto" ;
+
 option java_multiple_files = false;
 option java_package = "com.yuandian.dataflow.proto.msgtype";
 option go_package = "../grpc-gen;grpcgen";
@@ -15,9 +17,9 @@ message BussFlowExternal {
     uint32 msg_len = 5;
     uint64 src_mac = 6;
     uint64 dst_mac = 7;
-    uint32 request_ip = 8;
+    IPAddress request_ip = 8;
     uint32 request_port = 9;
-    uint32 response_ip = 10;
+    IPAddress response_ip = 10;
     uint32 response_port = 11;
     uint32 probeif = 12;
     uint32 protocol = 13;

BussFlowMidd.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+import "Base.proto" ;
+
 option java_multiple_files = false;
 option java_package = "com.yuandian.dataflow.proto.msgtype";
 option go_package = "../grpc-gen;grpcgen";
@@ -9,56 +11,55 @@ package dataflow;
 
 message BussFlowMidd {
     int32 table_id = 1;	//编号23
-    uint32 msg_type = 2;
-    string msg_version = 3;
-    uint32 msg_seq = 4;
-    uint32 msg_len = 5;
-    uint64 src_mac = 6;
-    uint64 dst_mac = 7;
+    uint32 msg_type = 2;	//消息类型
+    string msg_version = 3;	//数据库版本
+    uint32 msg_seq = 4;	//消息的序列号
+    uint32 msg_len = 5;	//消息的长度
+    uint64 src_mac = 6;	//源端口物理地址
+    uint64 dst_mac = 7;	//目的端口物理地址
     uint32 vlan_id = 8;
-    uint32 tos = 9;
-    uint32 retran_count = 10;
-    uint32 reset_count = 11;
-    uint32 zerowin_count = 12;
-    uint32 protocol = 13;
-    uint32 response_bytes = 14;
-    uint32 request_bytes = 15;
-    uint32 response_packets = 16;
-    uint32 request_packets = 17;
-    string seq_ack = 18;
-    uint32 recog_status = 19;
-    uint32 probe_if = 20;
-    string channel = 21;
-    uint32 request_ip = 22;
-    uint32 request_port = 23;
-    uint32 response_ip = 24;
-    uint32 response_port = 25;
-    uint32 start_time_tv_sec = 26;
-    uint32 start_time_tv_usec = 27;
-    uint32 end_time_tv_sec = 28;
-    uint32 end_time_tv_usec = 29;
-    uint32 deal_state = 30;
-    uint32 server_res_code = 31;
-    int64 server_translate_time = 32;
-    uint32 server_response_start_time_tv_sec = 33;
-    uint32 server_response_start_time_tv_usec = 34;
-    uint32 server_response_end_time_tv_sec = 35;
-    uint32 server_response_end_time_tv_usec = 36;
-    int64 server_response_time = 37;
-    int64 client_translate_time = 38;
-    int32 is_uncomplete = 39;
-    uint32 time_flag = 40;
-    uint32 detail_msg_len = 41;
-    uint32 key_msg_len = 42;
-    uint32 api_len = 43;
-    uint32 req_len = 44;
-    uint32 res_len = 45;
+    uint32 tos = 9;	//服务类型
+    uint32 retran_count = 10;	//重传数据量
+    uint32 reset_count = 11;	//重置数据量
+    uint32 zerowin_count = 12;	//零窗数据量
+    uint32 protocol = 13;	//协议类型
+    uint32 response_bytes = 14;	//输入字节数
+    uint32 request_bytes = 15;	//输出字节数
+    uint32 response_packets = 16;	//输入数据报个数
+    uint32 request_packets = 17;		//输出数据报个数
+    string seq_ack = 18;	//序列号和响应序号
+    uint32 recog_status = 19;	
+    uint32 probe_if = 20;	//探针编号
+    string channel = 21;	//通道
+    IPAddress request_ip = 22;	//请求地址
+    uint32 request_port = 23;	//请求端口
+    IPAddress response_ip = 24;	//响应地址
+    uint32 response_port = 25;	//响应端口
+    uint32 start_time_tv_sec = 26;	//开始时间（秒）
+    uint32 start_time_tv_usec = 27;	//开始时间（毫秒）
+    uint32 end_time_tv_sec = 28;		//结束时间（秒）
+    uint32 end_time_tv_usec = 29;	//结束时间（毫秒）
+    uint32 deal_state = 30;	
+    uint32 server_res_code = 31;	//服务器返回状态
+    int64 server_translate_time = 32;	//服务器传输时间
+    uint32 server_response_start_time_tv_sec = 33;	//服务器响应开始时间（秒）
+    uint32 server_response_start_time_tv_usec = 34;	//服务器响应开始时间（毫秒）
+    uint32 server_response_end_time_tv_sec = 35;	//服务器响应结束时间（秒）
+    uint32 server_response_end_time_tv_usec = 36;	//服务器响应结束时间（毫秒）
+    int64 server_response_time = 37;	//服务器响应时长
+    int64 client_translate_time = 38;	//客户传输时间
+    int32 is_uncomplete = 39;	//数据完整标志
+    uint32 time_flag = 40;	//时间戳
+    uint32 detail_msg_len = 41;	//业务纤细信息长度
+    uint32 key_msg_len = 42;	//业务关键字长度
+    uint32 api_len = 43;	//应用名称长度
+    uint32 req_len = 44;	//请求详情报文长度
+    uint32 res_len = 45;	//响应详情报文长度
     uint32 remain_len = 46;
-    string bussiness_detail_mesg = 47;
-    string bussiness_key_mesg = 48;
-    string api = 49;
-    string req_data = 50;
-    string res_data = 51;
+    string bussiness_detail_mesg = 47;	//业务纤细信息
+    string bussiness_key_mesg = 48;	//业务关键字
+    string api = 49;	//应用名称
+    string req_data = 50;	//请求详情报文
+    string res_data = 51;	//响应详情报文
     string remain_data = 52;
-
-}
+}

BussFlowWeb.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+import "Base.proto";
+
 option java_multiple_files = false;
 option java_package = "com.yuandian.dataflow.proto.msgtype";
 option go_package = "../grpc-gen;grpcgen";
@@ -9,69 +11,68 @@ package dataflow;
 
 message BussFlowWeb {
     int32 table_id = 1;	//编号22
-    uint32 msg_type = 2;
-    string msg_version = 3;
-    uint32 msg_seq = 4;
-    uint32 msg_len = 5;
-    uint64 src_mac = 6;
-    uint64 dst_mac = 7;
-    uint32 vlan_id = 8;
-    uint32 tos = 9;
-    uint32 retran_count = 10;
-    uint32 reset_count = 11;
-    uint32 zerowin_count = 12;
-    uint32 protocol = 13;
-    uint32 response_bytes = 14;
-    uint32 request_bytes = 15;
-    uint32 response_packets = 16;
-    uint32 request_packets = 17;
-    string seq_ack = 18;
-    uint32 recog_status = 19;
-    uint32 req_method = 20;
-    string content_type = 21;
-    string accept = 22;
-    uint32 probe_if = 23;
-    string channel = 24;
-    string sessionid = 25;
-    uint32 request_ip = 26;
-    uint32 request_port = 27;
-    uint32 response_ip = 28;
-    uint32 response_port = 29;
-    uint32 start_time_tv_sec = 30;
-    uint32 start_time_tv_usec = 31;
-    uint32 end_time_tv_sec = 32;
-    uint32 end_time_tv_usec = 33;
-    int64 server_translate_time = 34;
-    uint32 server_response_start_time_tv_sec = 35;
-    uint32 server_response_start_time_tv_usec = 36;
-    uint32 server_response_end_time_tv_sec = 37;
-    uint32 server_response_end_time_tv_usec = 38;
-    int64 server_response_time = 39;
-    int64 client_translate_time = 40;
-    int64 locate_server_translate_time = 41;
-    int64 locate_server_response_time = 42;
-    int64 locate_client_translate_time = 43;
+    uint32 msg_type = 2;	//消息类型
+    string msg_version = 3;	//数据库版本
+    uint32 msg_seq = 4;	//消息的序列号
+    uint32 msg_len = 5;	//消息长度
+    uint64 src_mac = 6;	//源端口物理地址
+    uint64 dst_mac = 7;	//目的端口物理地址
+    uint32 vlan_id = 8;	
+    uint32 tos = 9;	//服务类型	
+    uint32 retran_count = 10;	//重传数据量
+    uint32 reset_count = 11;	//重置数据量
+    uint32 zerowin_count = 12;	//零窗数据量
+    uint32 protocol = 13;	//协议类型
+    uint32 response_bytes = 14;	//输入字节数
+    uint32 request_bytes = 15;	//输出字节数
+    uint32 response_packets = 16;	//输入数据报个数
+    uint32 request_packets = 17;		//输出数据报个数
+    string seq_ack = 18;	//序列号和响应序号
+    uint32 recog_status = 19;	
+    uint32 req_method = 20;	//请求方法
+    string content_type = 21;	//请求内容
+    string accept = 22;	//接受
+    uint32 probe_if = 23;	//探针编号
+    string channel = 24;	//业务类型
+    string sessionid = 25;	//会话id
+    IPAddress request_ip = 26;	//请求ip地址
+    uint32 request_port = 27;	//请求端口
+    IPAddress response_ip = 28;	//响应ip地址
+    uint32 response_port = 29;	//响应端口
+    uint32 start_time_tv_sec = 30;	//开始时间（秒）
+    uint32 start_time_tv_usec = 31;	//开始时间（毫秒）
+    uint32 end_time_tv_sec = 32;		//结束时间（秒）
+    uint32 end_time_tv_usec = 33;	//结束时间（毫秒）
+    int64 server_translate_time = 34;	//服务器传输时间
+    uint32 server_response_start_time_tv_sec = 35;	//服务器响应开始时间（秒）
+    uint32 server_response_start_time_tv_usec = 36;	//服务器响应开始时间（毫秒）
+    uint32 server_response_end_time_tv_sec = 37;	//服务器响应结束时间（秒）
+    uint32 server_response_end_time_tv_usec = 38;	//服务器响应结束时间（毫秒）
+    int64 server_response_time = 39;	//服务器响应时长
+    int64 client_translate_time = 40;	//客户端响应时长
+    int64 locate_server_translate_time = 41;	//本地服务传输时长
+    int64 locate_server_response_time = 42;	//本地服务响应时长
+    int64 locate_client_translate_time = 43;	//本地客户传输时长
     string x_requested_with = 44;
-    string operating_sytem = 45;
-    uint32 server_res_code = 46;
-    string browser = 47;
-    int32 is_uncomplete = 48;
-    uint32 time_flag = 49;
-    uint32 detail_msg_len = 50;
-    uint32 key_msg_len = 51;
-    uint32 req_len = 52;
-    uint32 res_len = 53;
-    uint32 cookie_len = 54;
-    uint32 begin_url_len = 55;
-    uint32 refer_url_len = 56;
+    string operating_sytem = 45;	//操作系统
+    uint32 server_res_code = 46;	//服务器返回状态
+    string browser = 47;	//浏览器名称
+    int32 is_uncomplete = 48;	//数据完整性
+    uint32 time_flag = 49;	//时间戳
+    uint32 detail_msg_len = 50;	//业务纤细信息长度
+    uint32 key_msg_len = 51;	//业务关键字长度
+    uint32 req_len = 52;	//请求数据长度
+    uint32 res_len = 53;	//响应数据报长度
+    uint32 cookie_len = 54;	//cookie长度
+    uint32 begin_url_len = 55;	//主URL长度
+    uint32 refer_url_len = 56;	//引用URL长度
     uint32 remain_len = 57;
-    string bussiness_detail_mesg = 58;
-    string bussiness_key_mesg = 59;
-    string req_data = 60;
-    string res_data = 61;
-    string cookie_data = 62;
-    string begin_url = 63;
-    string refer_url = 64;
+    string bussiness_detail_mesg = 58;	//业务纤细信息
+    string bussiness_key_mesg = 59;	//业务关键字
+    string req_data = 60;	//请求详情报文
+    string res_data = 61;	//响应详情报文
+    string cookie_data = 62;	//cookie详情报文
+    string begin_url = 63;	//主url详情
+    string refer_url = 64;	//引用url详情
     string remain_data = 65;
-
-}
+}

QoeFlow.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+import "Base.proto";
+
 option java_multiple_files = false;
 option java_package = "com.yuandian.dataflow.proto.msgtype";
 option go_package = "../grpc-gen;grpcgen";
@@ -9,8 +11,8 @@ package dataflow;
 
 message QoeFlow {
    int32 table_id = 1;	//编号18
-   uint32 src_ip = 2;
-   uint32 dst_ip  = 3;
+   IPAddress src_ip = 2;
+   IPAddress dst_ip  = 3;
    uint32 s_tv_sec = 4;
    uint32 s_tv_usec = 5;
    uint32 l_tv_sec = 6;

UsrFlow.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+import "Base.proto";
+
 option java_multiple_files = false;
 option java_package = "com.yuandian.dataflow.proto.msgtype";
 option go_package = "../grpc-gen;grpcgen";
@@ -11,8 +13,8 @@ message UsrFlow {
 
     int32 table_id = 1;	//编号19
     uint32 probe_if = 2;
-    uint32 server_ip = 3;
-    uint32 client_ip = 4;
+    IPAddress server_ip = 3;
+    IPAddress client_ip = 4;
     uint32 client_port = 5;
     uint32 client_rtt = 6;
     uint32 server_rtt = 7;