Merge branch 'feature/v1.0.3-220802' into 'develop'

补全数据流注释,部分流的字段的注释后续补充

See merge request project/proto/dataflow!7
This commit is contained in:
黄思敏 2022-08-05 02:17:22 +00:00
commit c65aeb88bb
9 changed files with 340 additions and 340 deletions

View File

@ -13,42 +13,42 @@ package dataflow;
message ApmBaseDataFlow { message ApmBaseDataFlow {
int32 table_id = 1; //28 int32 table_id = 1; //28
uint32 probe_if = 2; uint32 probe_if = 2; //
uint32 tuple_source = 3; uint32 tuple_source = 3; //-
uint32 tuple_dest = 4; uint32 tuple_dest = 4; //-
IPAddress tuple_saddr = 5; IPAddress tuple_saddr = 5; //-ip地址
IPAddress tuple_daddr = 6; IPAddress tuple_daddr = 6; //-ip地址
string src_mac = 7; string src_mac = 7; //mac地址
string dst_mac = 8; string dst_mac = 8; //mac地址
uint32 vlan_id = 9; uint32 vlan_id = 9; //
uint32 start_tm_tv_sec = 10; uint32 start_tm_tv_sec = 10; //()
uint32 start_tm_tv_usec = 11; uint32 start_tm_tv_usec = 11; //()
uint32 total_bytes = 12; uint32 total_bytes = 12; //
uint32 total_packets = 13; uint32 total_packets = 13; //
uint32 total_drop_packets = 14; uint32 total_drop_packets = 14; //
uint32 retran_time_delay = 15; uint32 retran_time_delay = 15; //
uint32 client_rtt = 16; uint32 client_rtt = 16; //rtt
uint32 server_rtt = 17; uint32 server_rtt = 17; //rtt
uint32 user_response_time = 18; uint32 user_response_time = 18; //
uint32 server_response_time = 19; uint32 server_response_time = 19; //
uint32 con_fail = 20; uint32 con_fail = 20; //tcp会话连接失败数
uint32 bytes_in = 21; uint32 bytes_in = 21; //
uint32 bytes_out = 22; uint32 bytes_out = 22; //
uint32 time_flag = 23; uint32 time_flag = 23; //
uint32 end_tm_tv_sec = 24; uint32 end_tm_tv_sec = 24; //()
uint32 end_tm_tv_usec = 25; uint32 end_tm_tv_usec = 25; //()
uint32 respon_num = 26; // uint32 respon_num = 26; //
uint32 cs_window = 27; uint32 cs_window = 27; //
uint32 sc_window = 28; uint32 sc_window = 28; //
uint32 cs_reset = 29; uint32 cs_reset = 29; //
uint32 sc_reset = 30; uint32 sc_reset = 30; //
uint32 cs_retran = 31; uint32 cs_retran = 31; //
uint32 sc_retran = 32; uint32 sc_retran = 32; //
uint32 conn_setup_tm = 33; // uint32 conn_setup_tm = 33; //
uint32 new_session = 34; uint32 new_session = 34; //
uint32 cs_alert = 35; uint32 cs_alert = 35; //
uint32 sc_alert = 36; uint32 sc_alert = 36; //
bytes protocol = 37; bytes protocol = 37; //
} }

View File

@ -11,27 +11,27 @@ package dataflow;
message AppFlow { message AppFlow {
int32 table_id = 1; //17 int32 table_id = 1; //17
IPAddress src_ip = 2; IPAddress src_ip = 2; //< source ip
uint32 src_port = 3; uint32 src_port = 3; //< source port
IPAddress dst_ip = 4; IPAddress dst_ip = 4; //< destination ip
uint32 dst_port = 5; uint32 dst_port = 5; //< destination port
uint32 s_tv_sec = 6; uint32 s_tv_sec = 6; //< start time
uint32 s_tv_usec = 7; uint32 s_tv_usec = 7; //< start time
uint32 l_tv_sec = 8; uint32 l_tv_sec = 8; //< last update time
uint32 l_tv_usec = 9; uint32 l_tv_usec = 9; //< last update time
uint32 e_tv_sec = 10; uint32 e_tv_sec = 10; //< end time
uint32 e_tv_usec = 11; uint32 e_tv_usec = 11; //< end time
uint32 input_packets = 12; //< input packets (dst->src) uint32 input_packets = 12; //< input packets (dst->src)
uint32 output_packets = 13 //< output packets (src->dst) uint32 output_packets = 13; //< output packets (src->dst)
uint32 input_bytes = 14; //< input bytes (dst->src) uint32 input_bytes = 14; //< input bytes (dst->src)
uint32 output_bytes = 15; uint32 output_bytes = 15; //< output bytes (src->dst)
bytes protocol = 16; //< protocol bytes protocol = 16; //< protocol
uint32 app_id = 17; uint32 app_id = 17; //< application idectification
uint32 app_group_id = 18; uint32 app_group_id = 18; //< application group idectification
uint32 probe_if = 19; uint32 probe_if = 19; //
uint32 app_style = 20; uint32 app_style = 20; //< application style
uint32 time_flag = 21; uint32 time_flag = 21; // <time flag
int32 vlan_id = 22; int32 vlan_id = 22; //
int32 mpls_label = 23; int32 mpls_label = 23; //
int32 tos = 24; int32 tos = 24; //
} }

View File

@ -27,7 +27,7 @@ message BacktrackingFlow {
uint64 tcp_sp = 14; //TCP同步包数 uint64 tcp_sp = 14; //TCP同步包数
uint64 tcp_scpn = 15; //TCP同步确认包数 uint64 tcp_scpn = 15; //TCP同步确认包数
uint64 tcp_srp = 16; //TCP同步重置包数 uint64 tcp_srp = 16; //TCP同步重置包数
uint32 app_id = 17; uint32 app_id = 17; //< application idectification
uint32 app_group_id = 18; uint32 app_group_id = 18; //< application group idectification
int32 mpls_label = 19; int32 mpls_label = 19; //
} }

View File

@ -13,54 +13,54 @@ package dataflow;
message BussFlowDb { message BussFlowDb {
int32 table_id = 1; //24 int32 table_id = 1; //24
uint32 msg_type = 2; uint32 msg_type = 2; //
bytes msg_version = 3; bytes msg_version = 3; //
uint32 msg_seq = 4; uint32 msg_seq = 4; //
uint32 msg_len = 5; uint32 msg_len = 5; //
uint64 src_mac = 6; uint64 src_mac = 6; //
uint64 dst_mac = 7; uint64 dst_mac = 7; //
uint32 vlan_id = 8; uint32 vlan_id = 8; //
uint32 tos = 9; uint32 tos = 9; //
uint32 retran_count = 10; uint32 retran_count = 10 //
uint32 reset_count = 11; uint32 reset_count = 11; //
uint32 zerowin_count = 12; uint32 zerowin_count = 12; //
uint32 protocol = 13; uint32 protocol = 13; //
uint32 response_bytes = 14; uint32 response_bytes = 14; //
uint32 request_bytes = 15; uint32 request_bytes = 15; //
uint32 response_packets = 16; uint32 response_packets = 16; //
uint32 request_packets = 17; uint32 request_packets = 17; //
bytes seq_ack = 18; bytes seq_ack = 18; //
uint32 recog_status = 19; uint32 recog_status = 19; //
uint32 probe_if = 20; uint32 probe_if = 20; //
string channel = 21; string channel = 21; //
string dbname = 22; string dbname = 22; //
IPAddress request_ip = 23; IPAddress request_ip = 23; //ip地址
uint32 request_port = 24; uint32 request_port = 24; //
IPAddress response_ip = 25; IPAddress response_ip = 25; //ip地址
uint32 response_port = 26; uint32 response_port = 26; //
int64 status = 27; int64 status = 27; //
int64 server_translate_time = 28; int64 server_translate_time = 28; //
int64 client_translate_time = 29; int64 client_translate_time = 29; //
int64 server_response_time = 30; int64 server_response_time = 30; //
uint32 server_response_start_time_tv_sec = 31; uint32 server_response_start_time_tv_sec = 31; //()
uint32 server_response_start_time_tv_usec = 32; uint32 server_response_start_time_tv_usec = 32; //()
uint32 server_response_end_time_tv_sec = 33; uint32 server_response_end_time_tv_sec = 33; //()
uint32 server_response_end_time_tv_usec = 34; uint32 server_response_end_time_tv_usec = 34; //()
uint32 start_time_tv_sec = 35; uint32 start_time_tv_sec = 35; //()
uint32 start_time_tv_usec = 36; uint32 start_time_tv_usec = 36; //()
uint32 end_time_tv_sec = 37; uint32 end_time_tv_sec = 37; //()
uint32 end_time_tv_usec = 38; uint32 end_time_tv_usec = 38; //()
int32 is_uncomplete = 39; int32 is_uncomplete = 39; //
uint32 time_flag = 40; uint32 time_flag = 40; //
uint32 sql_len = 41; uint32 sql_len = 41; //sql字段的长度值
uint32 detail_msg_len = 42; uint32 detail_msg_len = 42; //
uint32 req_len = 43; uint32 req_len = 43; //
uint32 res_len = 44; uint32 res_len = 44; //
uint32 reserved_len = 45; uint32 reserved_len = 45; //
bytes sql = 46; bytes sql = 46; //sql语句
bytes bussiness_detail_mesg = 47; bytes bussiness_detail_mesg = 47; //
bytes req_data = 48; bytes req_data = 48; //
bytes res_data = 49; bytes res_data = 49; //
bytes reserved = 50; bytes reserved = 50; //
} }

View File

@ -11,34 +11,34 @@ package dataflow;
message BussFlowExternal { message BussFlowExternal {
int32 table_id = 1; //25 int32 table_id = 1; //25
uint32 msg_type = 2; uint32 msg_type = 2; //
uint32 msg_version = 3; uint32 msg_version = 3; //
uint32 msg_seq = 4; uint32 msg_seq = 4; //
uint32 msg_len = 5; uint32 msg_len = 5; //
uint64 src_mac = 6; uint64 src_mac = 6; //
uint64 dst_mac = 7; uint64 dst_mac = 7; //
IPAddress request_ip = 8; IPAddress request_ip = 8; //ip地址
uint32 request_port = 9; uint32 request_port = 9; //
IPAddress response_ip = 10; IPAddress response_ip = 10; //ip地址
uint32 response_port = 11; uint32 response_port = 11; //
uint32 probeif = 12; uint32 probeif = 12; //
uint32 protocol = 13; uint32 protocol = 13; //
uint32 start_time_tv_sec = 14; uint32 start_time_tv_sec = 14; //
uint32 start_time_tv_usec = 15; uint32 start_time_tv_usec = 15; //
uint32 end_time_tv_sec = 16; uint32 end_time_tv_sec = 16; //
uint32 end_time_tv_usec = 17; uint32 end_time_tv_usec = 17; //
uint32 req_len = 18; uint32 req_len = 18; //
uint32 res_len = 19; uint32 res_len = 19; //
uint32 busi_msg_len = 20; //bussiness resouce data length uint32 busi_msg_len = 20; //bussiness resouce data length
uint32 key_msg_len = 21; //sub bussiness resouce data length uint32 key_msg_len = 21; //sub bussiness resouce data length
uint32 detail_msg_len = 22; //parents bussiness data length uint32 detail_msg_len = 22; //parents bussiness data length
uint32 remain_len = 23; //reserve data length uint32 remain_len = 23; //reserve data length
bytes busi_code = 24; bytes busi_code = 24; //
bytes sessionid = 25; bytes sessionid = 25; //
bytes req_data = 26; bytes req_data = 26; //
bytes res_data = 27; bytes res_data = 27; //
bytes busi_msg = 28; bytes busi_msg = 28; //
bytes busi_key_msg = 29; bytes busi_key_msg = 29; //
bytes busi_detail_msg = 30; bytes busi_detail_msg = 30; //
bytes remain_data = 31; bytes remain_data = 31; //
} }

View File

@ -17,7 +17,7 @@ message BussFlowMidd {
uint32 msg_len = 5; // uint32 msg_len = 5; //
uint64 src_mac = 6; // uint64 src_mac = 6; //
uint64 dst_mac = 7; // uint64 dst_mac = 7; //
uint32 vlan_id = 8; uint32 vlan_id = 8; //
uint32 tos = 9; // uint32 tos = 9; //
uint32 retran_count = 10; // uint32 retran_count = 10; //
uint32 reset_count = 11; // uint32 reset_count = 11; //
@ -28,38 +28,38 @@ message BussFlowMidd {
uint32 response_packets = 16; // uint32 response_packets = 16; //
uint32 request_packets = 17; // uint32 request_packets = 17; //
bytes seq_ack = 18; // bytes seq_ack = 18; //
uint32 recog_status = 19; uint32 recog_status = 19; //
uint32 probe_if = 20; // uint32 probe_if = 20; //
bytes channel = 21; // bytes channel = 21; //
IPAddress request_ip = 22; // IPAddress request_ip = 22; //ip地
uint32 request_port = 23; // uint32 request_port = 23; //
IPAddress response_ip = 24; // IPAddress response_ip = 24; //ip地
uint32 response_port = 25; // uint32 response_port = 25; //
uint32 start_time_tv_sec = 26; // uint32 start_time_tv_sec = 26; //
uint32 start_time_tv_usec = 27; // uint32 start_time_tv_usec = 27; //
uint32 end_time_tv_sec = 28; // uint32 end_time_tv_sec = 28; //
uint32 end_time_tv_usec = 29; // uint32 end_time_tv_usec = 29; //
uint32 deal_state = 30; uint32 deal_state = 30; //
uint32 server_res_code = 31; // uint32 server_res_code = 31; //
int64 server_translate_time = 32; // int64 server_translate_time = 32; //
uint32 server_response_start_time_tv_sec = 33; // uint32 server_response_start_time_tv_sec = 33; //
uint32 server_response_start_time_tv_usec = 34; // uint32 server_response_start_time_tv_usec = 34; //
uint32 server_response_end_time_tv_sec = 35; // uint32 server_response_end_time_tv_sec = 35; //
uint32 server_response_end_time_tv_usec = 36; // uint32 server_response_end_time_tv_usec = 36; //
int64 server_response_time = 37; // int64 server_response_time = 37; //
int64 client_translate_time = 38; // int64 client_translate_time = 38; //
int32 is_uncomplete = 39; // int32 is_uncomplete = 39; //
uint32 time_flag = 40; // uint32 time_flag = 40; //
uint32 detail_msg_len = 41; // uint32 detail_msg_len = 41; //
uint32 key_msg_len = 42; // uint32 key_msg_len = 42; //
uint32 api_len = 43; // uint32 api_len = 43; //
uint32 req_len = 44; // uint32 req_len = 44; //
uint32 res_len = 45; // uint32 res_len = 45; //
uint32 remain_len = 46; uint32 remain_len = 46; //
bytes bussiness_detail_mesg = 47; // bytes bussiness_detail_mesg = 47; //
bytes bussiness_key_mesg = 48; // bytes bussiness_key_mesg = 48; //
bytes api = 49; // bytes api = 49; //
bytes req_data = 50; // bytes req_data = 50; //
bytes res_data = 51; // bytes res_data = 51; //
bytes remain_data = 52; bytes remain_data = 52; //
} }

View File

@ -17,7 +17,7 @@ message BussFlowWeb {
uint32 msg_len = 5; // uint32 msg_len = 5; //
uint64 src_mac = 6; // uint64 src_mac = 6; //
uint64 dst_mac = 7; // uint64 dst_mac = 7; //
uint32 vlan_id = 8; uint32 vlan_id = 8; //
uint32 tos = 9; // uint32 tos = 9; //
uint32 retran_count = 10; // uint32 retran_count = 10; //
uint32 reset_count = 11; // uint32 reset_count = 11; //
@ -28,51 +28,51 @@ message BussFlowWeb {
uint32 response_packets = 16; // uint32 response_packets = 16; //
uint32 request_packets = 17; // uint32 request_packets = 17; //
bytes seq_ack = 18; // bytes seq_ack = 18; //
uint32 recog_status = 19; uint32 recog_status = 19; //
uint32 req_method = 20; // uint32 req_method = 20; //
bytes content_type = 21; // bytes content_type = 21; //
bytes accept = 22; // bytes accept = 22; //
uint32 probe_if = 23; // uint32 probe_if = 23; //
bytes channel = 24; // bytes channel = 24; //
bytes sessionid = 25; //id bytes sessionid = 25; //id
IPAddress request_ip = 26; //ip地址 IPAddress request_ip = 26; //ip地址
uint32 request_port = 27; // uint32 request_port = 27; //
IPAddress response_ip = 28; //ip地址 IPAddress response_ip = 28; //ip地址
uint32 response_port = 29; // uint32 response_port = 29; //
uint32 start_time_tv_sec = 30; // uint32 start_time_tv_sec = 30; //
uint32 start_time_tv_usec = 31; // uint32 start_time_tv_usec = 31; //
uint32 end_time_tv_sec = 32; // uint32 end_time_tv_sec = 32; //
uint32 end_time_tv_usec = 33; // uint32 end_time_tv_usec = 33; //
int64 server_translate_time = 34; // int64 server_translate_time = 34; //
uint32 server_response_start_time_tv_sec = 35; // uint32 server_response_start_time_tv_sec = 35; //
uint32 server_response_start_time_tv_usec = 36; // uint32 server_response_start_time_tv_usec = 36; //
uint32 server_response_end_time_tv_sec = 37; // uint32 server_response_end_time_tv_sec = 37; //
uint32 server_response_end_time_tv_usec = 38; // uint32 server_response_end_time_tv_usec = 38; //
int64 server_response_time = 39; // int64 server_response_time = 39; //
int64 client_translate_time = 40; // int64 client_translate_time = 40; //
int64 locate_server_translate_time = 41; // int64 locate_server_translate_time = 41; //
int64 locate_server_response_time = 42; // int64 locate_server_response_time = 42; //
int64 locate_client_translate_time = 43; // int64 locate_client_translate_time = 43; //
bytes x_requested_with = 44; bytes x_requested_with = 44; //
bytes operating_sytem = 45; // bytes operating_sytem = 45; //
uint32 server_res_code = 46; // uint32 server_res_code = 46; //
bytes browser = 47; // bytes browser = 47; //
int32 is_uncomplete = 48; // int32 is_uncomplete = 48; //
uint32 time_flag = 49; // uint32 time_flag = 49; //
uint32 detail_msg_len = 50; // uint32 detail_msg_len = 50; //
uint32 key_msg_len = 51; // uint32 key_msg_len = 51; //
uint32 req_len = 52; // uint32 req_len = 52; //
uint32 res_len = 53; // uint32 res_len = 53; //
uint32 cookie_len = 54; //cookie长度 uint32 cookie_len = 54; //cookie长度
uint32 begin_url_len = 55; //URL长度 uint32 begin_url_len = 55; //URL长度
uint32 refer_url_len = 56; //URL长度 uint32 refer_url_len = 56; //URL长度
uint32 remain_len = 57; uint32 remain_len = 57; //
bytes bussiness_detail_mesg = 58; // bytes bussiness_detail_mesg = 58; //
bytes bussiness_key_mesg = 59; // bytes bussiness_key_mesg = 59; //
bytes req_data = 60; // bytes req_data = 60; //
bytes res_data = 61; // bytes res_data = 61; //
bytes cookie_data = 62; //cookie详情报文 bytes cookie_data = 62; //cookie详情报文
bytes begin_url = 63; //url详情 bytes begin_url = 63; //url详情
bytes refer_url = 64; //url详情 bytes refer_url = 64; //url详情
bytes remain_data = 65; bytes remain_data = 65; //
} }

View File

@ -11,12 +11,12 @@ package dataflow;
message QoeFlow { message QoeFlow {
int32 table_id = 1; //18 int32 table_id = 1; //18
IPAddress src_ip = 2; IPAddress src_ip = 2; //< source ip
IPAddress dst_ip = 3; IPAddress dst_ip = 3; //< destination ip
uint32 s_tv_sec = 4; uint32 s_tv_sec = 4; //< start time
uint32 s_tv_usec = 5; uint32 s_tv_usec = 5; //< start time
uint32 l_tv_sec = 6; uint32 l_tv_sec = 6; //< last update time
uint32 l_tv_usec = 7; uint32 l_tv_usec = 7; //< last update time
uint32 dst2_respon_num = 8; //< response number (dst->src) uint32 dst2_respon_num = 8; //< response number (dst->src)
uint32 dst2_fast = 9; //< fast response (dst->src) uint32 dst2_fast = 9; //< fast response (dst->src)
uint32 dst2_fast_expected = 10; //< fast expected (dst->src) uint32 dst2_fast_expected = 10; //< fast expected (dst->src)
@ -34,11 +34,11 @@ message QoeFlow {
uint32 sc_reset = 22; //< sc reset uint32 sc_reset = 22; //< sc reset
uint32 cs_retran = 23; //< cs retran uint32 cs_retran = 23; //< cs retran
uint32 sc_retran = 24; //< sc retran uint32 sc_retran = 24; //< sc retran
uint32 app_id = 25; uint32 app_id = 25; //< application idectification
uint32 app_group_id = 26; //< application id uint32 app_group_id = 26; //< application group idectification
uint32 probe_if = 27; uint32 probe_if = 27; //
uint32 app_style = 28; uint32 app_style = 28; //< application style
uint32 time_flag = 29; uint32 time_flag = 29; // <time flag
uint32 conn_setup_tm = 30; // uint32 conn_setup_tm = 30; //
uint32 data_transfer_tm = 31; // uint32 data_transfer_tm = 31; //
uint32 retrans_delay_tm = 32; // uint32 retrans_delay_tm = 32; //
@ -48,6 +48,6 @@ message QoeFlow {
uint32 user_events = 36; // uint32 user_events = 36; //
uint32 server_events = 37; // uint32 server_events = 37; //
uint32 conn_setup_peek = 38; // uint32 conn_setup_peek = 38; //
int32 vlan_id = 39; int32 vlan_id = 39; //
} }

View File

@ -12,34 +12,34 @@ package dataflow;
message UsrFlow { message UsrFlow {
int32 table_id = 1; //19 int32 table_id = 1; //19
uint32 probe_if = 2; uint32 probe_if = 2; //
IPAddress server_ip = 3; IPAddress server_ip = 3; //ip地址
IPAddress client_ip = 4; IPAddress client_ip = 4; //ip地址
uint32 client_port = 5; uint32 client_port = 5; //
uint32 client_rtt = 6; uint32 client_rtt = 6; //rtt
uint32 server_rtt = 7; uint32 server_rtt = 7; //rtt
uint32 s_tv_sec = 8; uint32 s_tv_sec = 8; //< start time
uint32 s_tv_usec = 9; uint32 s_tv_usec = 9; //< start time
uint32 e_tv_sec = 10; uint32 e_tv_sec = 10; //< end time
uint32 e_tv_usec = 11; uint32 e_tv_usec = 11; //< end time
uint32 server_think = 12; uint32 server_think = 12; //
uint32 page_size = 13; uint32 page_size = 13; //
uint32 app_id = 14; uint32 app_id = 14; //< application idectification
uint32 app_group_id = 15; uint32 app_group_id = 15; //< application group idectification
bytes request_url = 16; bytes request_url = 16; //
bytes referer_url = 17; bytes referer_url = 17; //
uint32 return_code = 18; uint32 return_code = 18; //
uint32 err_tv_sec = 19; uint32 err_tv_sec = 19; //
uint32 err_tv_usec = 20; uint32 err_tv_usec = 20; //
uint32 client_loss_pkt = 21; uint32 client_loss_pkt = 21; //
uint32 server_loss_pkt = 22; uint32 server_loss_pkt = 22; //
uint32 client_bytes = 23; uint32 client_bytes = 23; //
uint32 server_bytes = 24; uint32 server_bytes = 24; //
uint32 client_packets = 25; uint32 client_packets = 25; //
uint32 server_packets = 26; uint32 server_packets = 26; //
bytes user_agent = 27; bytes user_agent = 27; //
bytes content_type = 28; bytes content_type = 28; //
uint32 request_transfer_tm = 29; uint32 request_transfer_tm = 29; //
uint32 time_flag = 30; uint32 time_flag = 30; // <time flag
} }