Merge branch 'develop' into 'master'

v1.0.3

See merge request project/proto/dataflow!6
This commit is contained in:
黄思敏 2022-07-28 07:32:44 +00:00
commit ea72f9036e
9 changed files with 98 additions and 98 deletions

View File

@ -37,18 +37,18 @@ message ApmBaseDataFlow {
uint32 time_flag = 23;
uint32 end_tm_tv_sec = 24;
uint32 end_tm_tv_usec = 25;
uint32 respon_num = 26;
uint32 respon_num = 26; //
uint32 cs_window = 27;
uint32 sc_window = 28;
uint32 cs_reset = 29;
uint32 sc_reset = 30;
uint32 cs_retran = 31;
uint32 sc_retran = 32;
uint32 conn_setup_tm = 33;
uint32 conn_setup_tm = 33; //
uint32 new_session = 34;
uint32 cs_alert = 35;
uint32 sc_alert = 36;
string protocol = 37;
bytes protocol = 37;
}

View File

@ -21,11 +21,11 @@ message AppFlow {
uint32 l_tv_usec = 9;
uint32 e_tv_sec = 10;
uint32 e_tv_usec = 11;
uint32 input_packets = 12;
uint32 output_packets = 13;
uint32 input_bytes = 14;
uint32 input_packets = 12; //< input packets (dst->src)
uint32 output_packets = 13 //< output packets (src->dst)
uint32 input_bytes = 14; //< input bytes (dst->src)
uint32 output_bytes = 15;
string protocol = 16;
bytes protocol = 16; //< protocol
uint32 app_id = 17;
uint32 app_group_id = 18;
uint32 probe_if = 19;

View File

@ -12,21 +12,21 @@ package dataflow;
message BacktrackingFlow {
int32 table_id = 1; //20
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;
int64 mac_src = 2; //MAC
int64 mac_dst = 3; //MAC
IPAddress ip_src = 4; //IP
IPAddress ip_dst = 5; //IP
int32 port_src = 6; //-1
int32 port_dst = 7; //-1
int32 l3_proto = 8; //ID-1
int32 l4_proto = 9; //ID-1
int32 tos = 10; //Tos-1
int32 vlan_id = 11; //vlan ID-1
uint64 bytes = 12; //
uint64 packets = 13; //
uint64 tcp_sp = 14; //TCP同步包数
uint64 tcp_scpn = 15; //TCP同步确认包数
uint64 tcp_srp = 16; //TCP同步重置包数
uint32 app_id = 17;
uint32 app_group_id = 18;
int32 mpls_label = 19;

View File

@ -14,7 +14,7 @@ message BussFlowDb {
int32 table_id = 1; //24
uint32 msg_type = 2;
string msg_version = 3;
bytes msg_version = 3;
uint32 msg_seq = 4;
uint32 msg_len = 5;
uint64 src_mac = 6;
@ -29,7 +29,7 @@ uint32 response_bytes = 14;
uint32 request_bytes = 15;
uint32 response_packets = 16;
uint32 request_packets = 17;
string seq_ack = 18;
bytes seq_ack = 18;
uint32 recog_status = 19;
uint32 probe_if = 20;
string channel = 21;
@ -57,10 +57,10 @@ uint32 detail_msg_len = 42;
uint32 req_len = 43;
uint32 res_len = 44;
uint32 reserved_len = 45;
string sql = 46;
string bussiness_detail_mesg = 47;
string req_data = 48;
string res_data = 49;
string reserved = 50;
bytes sql = 46;
bytes bussiness_detail_mesg = 47;
bytes req_data = 48;
bytes res_data = 49;
bytes reserved = 50;
}

View File

@ -29,16 +29,16 @@ message BussFlowExternal {
uint32 end_time_tv_usec = 17;
uint32 req_len = 18;
uint32 res_len = 19;
uint32 busi_msg_len = 20;
uint32 key_msg_len = 21;
uint32 detail_msg_len = 22;
uint32 remain_len = 23;
string busi_code = 24;
string sessionid = 25;
string req_data = 26;
string res_data = 27;
string busi_msg = 28;
string busi_key_msg = 29;
string busi_detail_msg = 30;
string remain_data = 31;
uint32 busi_msg_len = 20; //bussiness resouce data length
uint32 key_msg_len = 21; // sub bussiness resouce data length
uint32 detail_msg_len = 22; //parents bussiness data length
uint32 remain_len = 23; //reserve data length
bytes busi_code = 24;
bytes sessionid = 25;
bytes req_data = 26;
bytes res_data = 27;
bytes busi_msg = 28;
bytes busi_key_msg = 29;
bytes busi_detail_msg = 30;
bytes remain_data = 31;
}

View File

@ -12,7 +12,7 @@ package dataflow;
message BussFlowMidd {
int32 table_id = 1; //23
uint32 msg_type = 2; //
string msg_version = 3; //
bytes msg_version = 3; //
uint32 msg_seq = 4; //
uint32 msg_len = 5; //
uint64 src_mac = 6; //
@ -27,10 +27,10 @@ message BussFlowMidd {
uint32 request_bytes = 15; //
uint32 response_packets = 16; //
uint32 request_packets = 17; //
string seq_ack = 18; //
bytes seq_ack = 18; //
uint32 recog_status = 19;
uint32 probe_if = 20; //
string channel = 21; //
bytes channel = 21; //
IPAddress request_ip = 22; //
uint32 request_port = 23; //
IPAddress response_ip = 24; //
@ -56,10 +56,10 @@ message BussFlowMidd {
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 remain_data = 52;
bytes bussiness_detail_mesg = 47; //
bytes bussiness_key_mesg = 48; //
bytes api = 49; //
bytes req_data = 50; //
bytes res_data = 51; //
bytes remain_data = 52;
}

View File

@ -12,7 +12,7 @@ package dataflow;
message BussFlowWeb {
int32 table_id = 1; //22
uint32 msg_type = 2; //
string msg_version = 3; //
bytes msg_version = 3; //
uint32 msg_seq = 4; //
uint32 msg_len = 5; //
uint64 src_mac = 6; //
@ -27,14 +27,14 @@ message BussFlowWeb {
uint32 request_bytes = 15; //
uint32 response_packets = 16; //
uint32 request_packets = 17; //
string seq_ack = 18; //
bytes seq_ack = 18; //
uint32 recog_status = 19;
uint32 req_method = 20; //
string content_type = 21; //
string accept = 22; //
bytes content_type = 21; //
bytes accept = 22; //
uint32 probe_if = 23; //
string channel = 24; //
string sessionid = 25; //id
bytes channel = 24; //
bytes sessionid = 25; //id
IPAddress request_ip = 26; //ip地址
uint32 request_port = 27; //
IPAddress response_ip = 28; //ip地址
@ -53,10 +53,10 @@ message BussFlowWeb {
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; //
bytes x_requested_with = 44;
bytes operating_sytem = 45; //
uint32 server_res_code = 46; //
string browser = 47; //
bytes browser = 47; //
int32 is_uncomplete = 48; //
uint32 time_flag = 49; //
uint32 detail_msg_len = 50; //
@ -67,12 +67,12 @@ message BussFlowWeb {
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; //cookie详情报文
string begin_url = 63; //url详情
string refer_url = 64; //url详情
string remain_data = 65;
bytes bussiness_detail_mesg = 58; //
bytes bussiness_key_mesg = 59; //
bytes req_data = 60; //
bytes res_data = 61; //
bytes cookie_data = 62; //cookie详情报文
bytes begin_url = 63; //url详情
bytes refer_url = 64; //url详情
bytes remain_data = 65;
}

View File

@ -17,37 +17,37 @@ message QoeFlow {
uint32 s_tv_usec = 5;
uint32 l_tv_sec = 6;
uint32 l_tv_usec = 7;
uint32 dst2_respon_num = 8;
uint32 dst2_fast = 9;
uint32 dst2_fast_expected = 10;
uint32 dst2_expected_degrated = 11;
uint32 dst2_degrated_service = 12;
uint32 dst2_service_availability = 13;
uint32 dst2_respon_timeout = 14;
uint32 dst2_respon_success = 15;
uint32 dst2_respon_fail = 16;
uint32 dst2_respin_peek = 17;
uint32 dst2_respon_average = 18;
uint32 cs_window = 19;
uint32 sc_window = 20;
uint32 cs_reset = 21;
uint32 sc_reset = 22;
uint32 cs_retran = 23;
uint32 sc_retran = 24;
uint32 dst2_respon_num = 8; //< response number (dst->src)
uint32 dst2_fast = 9; //< fast response (dst->src)
uint32 dst2_fast_expected = 10; //< fast expected (dst->src)
uint32 dst2_expected_degrated = 11; //< expected degrated (dst->src)
uint32 dst2_degrated_service = 12; //< degrated service (dst->src)
uint32 dst2_service_availability = 13; //< service availability (dst->src)
uint32 dst2_respon_timeout = 14; //< response timeout (dst->src)
uint32 dst2_respon_success = 15; //< response success (dst->src)
uint32 dst2_respon_fail = 16; //< response fail (dst->src)
uint32 dst2_respin_peek = 17; //< response peek time (dst->src) ms
uint32 dst2_respon_average = 18; //< response average time(dst->src) ms
uint32 cs_window = 19; //< cs window event
uint32 sc_window = 20; //< sc window event;
uint32 cs_reset = 21; //< cs reset
uint32 sc_reset = 22; //< sc reset
uint32 cs_retran = 23; //< cs retran
uint32 sc_retran = 24; //< sc retran
uint32 app_id = 25;
uint32 app_group_id = 26;
uint32 app_group_id = 26; //< application id
uint32 probe_if = 27;
uint32 app_style = 28;
uint32 time_flag = 29;
uint32 conn_setup_tm = 30;
uint32 data_transfer_tm = 31;
uint32 retrans_delay_tm = 32;
uint32 network_inbound = 33;
uint32 network_outbound = 34;
uint32 new_session = 35;
uint32 user_events = 36;
uint32 server_events = 37;
uint32 conn_setup_peek = 38;
uint32 conn_setup_tm = 30; //
uint32 data_transfer_tm = 31; //
uint32 retrans_delay_tm = 32; //
uint32 network_inbound = 33; //(->)
uint32 network_outbound = 34; //(->)
uint32 new_session = 35; //
uint32 user_events = 36; //
uint32 server_events = 37; //
uint32 conn_setup_peek = 38; //
int32 vlan_id = 39;
}

View File

@ -26,8 +26,8 @@ message UsrFlow {
uint32 page_size = 13;
uint32 app_id = 14;
uint32 app_group_id = 15;
string request_url = 16;
string referer_url = 17;
bytes request_url = 16;
bytes referer_url = 17;
uint32 return_code = 18;
uint32 err_tv_sec = 19;
uint32 err_tv_usec = 20;
@ -37,8 +37,8 @@ message UsrFlow {
uint32 server_bytes = 24;
uint32 client_packets = 25;
uint32 server_packets = 26;
string user_agent = 27;
string content_type = 28;
bytes user_agent = 27;
bytes content_type = 28;
uint32 request_transfer_tm = 29;
uint32 time_flag = 30;