diff --git a/.idea/.gitignore b/.idea/.gitignore
index 5aea0bb..28d386d 100644
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -6,3 +6,6 @@
/dataSources.local.xml
# Editor-based HTTP Client requests
/httpRequests/
+../yb_http_avro_sink_file/target/
+../yb_http_avro_sink_file/src/test/
+./libraries/
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
deleted file mode 100644
index 84881a3..0000000
--- a/.idea/jarRepositories.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_101tec_zkclient_0_10.xml b/.idea/libraries/Maven__com_101tec_zkclient_0_10.xml
deleted file mode 100644
index a2b08a2..0000000
--- a/.idea/libraries/Maven__com_101tec_zkclient_0_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_alibaba_fastjson_1_2_47.xml b/.idea/libraries/Maven__com_alibaba_fastjson_1_2_47.xml
deleted file mode 100644
index dcd6ee5..0000000
--- a/.idea/libraries/Maven__com_alibaba_fastjson_1_2_47.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_5.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_5.xml
deleted file mode 100644
index 89adb44..0000000
--- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_5.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_5.xml
deleted file mode 100644
index 1205e0d..0000000
--- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_1.xml
deleted file mode 100644
index c197771..0000000
--- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_2_2.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_2_2.xml
deleted file mode 100644
index b6113ec..0000000
--- a/.idea/libraries/Maven__com_google_code_gson_gson_2_2_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_guava_guava_18_0.xml b/.idea/libraries/Maven__com_google_guava_guava_18_0.xml
deleted file mode 100644
index bbd71d7..0000000
--- a/.idea/libraries/Maven__com_google_guava_guava_18_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_maxmind_db_maxmind_db_1_2_2.xml b/.idea/libraries/Maven__com_maxmind_db_maxmind_db_1_2_2.xml
deleted file mode 100644
index 1342872..0000000
--- a/.idea/libraries/Maven__com_maxmind_db_maxmind_db_1_2_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_maxmind_geoip2_geoip2_2_12_0.xml b/.idea/libraries/Maven__com_maxmind_geoip2_geoip2_2_12_0.xml
deleted file mode 100644
index 1471229..0000000
--- a/.idea/libraries/Maven__com_maxmind_geoip2_geoip2_2_12_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_maxmind_geoip_geoip_api_1_3_1.xml b/.idea/libraries/Maven__com_maxmind_geoip_geoip_api_1_3_1.xml
deleted file mode 100644
index bd438ab..0000000
--- a/.idea/libraries/Maven__com_maxmind_geoip_geoip_api_1_3_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_9_0.xml b/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_9_0.xml
deleted file mode 100644
index 90e2b81..0000000
--- a/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_9_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_squareup_okhttp_okhttp_2_4_0.xml b/.idea/libraries/Maven__com_squareup_okhttp_okhttp_2_4_0.xml
deleted file mode 100644
index be09ac3..0000000
--- a/.idea/libraries/Maven__com_squareup_okhttp_okhttp_2_4_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_squareup_okio_okio_1_13_0.xml b/.idea/libraries/Maven__com_squareup_okio_okio_1_13_0.xml
deleted file mode 100644
index cb99e2f..0000000
--- a/.idea/libraries/Maven__com_squareup_okio_okio_1_13_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_squareup_retrofit_retrofit_1_9_0.xml b/.idea/libraries/Maven__com_squareup_retrofit_retrofit_1_9_0.xml
deleted file mode 100644
index 86047ed..0000000
--- a/.idea/libraries/Maven__com_squareup_retrofit_retrofit_1_9_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml
deleted file mode 100644
index 3807eb2..0000000
--- a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_yammer_metrics_metrics_core_2_2_0.xml b/.idea/libraries/Maven__com_yammer_metrics_metrics_core_2_2_0.xml
deleted file mode 100644
index fc159c5..0000000
--- a/.idea/libraries/Maven__com_yammer_metrics_metrics_core_2_2_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_zdjizhi_galaxy_1_0_1.xml b/.idea/libraries/Maven__com_zdjizhi_galaxy_1_0_1.xml
deleted file mode 100644
index 5ec91ab..0000000
--- a/.idea/libraries/Maven__com_zdjizhi_galaxy_1_0_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_cli_commons_cli_1_2.xml b/.idea/libraries/Maven__commons_cli_commons_cli_1_2.xml
deleted file mode 100644
index cec2493..0000000
--- a/.idea/libraries/Maven__commons_cli_commons_cli_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_8.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_8.xml
deleted file mode 100644
index a63c271..0000000
--- a/.idea/libraries/Maven__commons_codec_commons_codec_1_8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml
deleted file mode 100644
index 3caee7e..0000000
--- a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml
deleted file mode 100644
index bc2aad0..0000000
--- a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml
deleted file mode 100644
index 2ec8376..0000000
--- a/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml
deleted file mode 100644
index eab40b3..0000000
--- a/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_3_10_6_Final.xml b/.idea/libraries/Maven__io_netty_netty_3_10_6_Final.xml
deleted file mode 100644
index 1bf9986..0000000
--- a/.idea/libraries/Maven__io_netty_netty_3_10_6_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml
deleted file mode 100644
index c24f7e3..0000000
--- a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__joda_time_joda_time_2_9_9.xml b/.idea/libraries/Maven__joda_time_joda_time_2_9_9.xml
deleted file mode 100644
index a468f58..0000000
--- a/.idea/libraries/Maven__joda_time_joda_time_2_9_9.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__junit_junit_3_8_1.xml b/.idea/libraries/Maven__junit_junit_3_8_1.xml
deleted file mode 100644
index 71b2993..0000000
--- a/.idea/libraries/Maven__junit_junit_3_8_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__log4j_log4j_1_2_14.xml b/.idea/libraries/Maven__log4j_log4j_1_2_14.xml
deleted file mode 100644
index 2825a67..0000000
--- a/.idea/libraries/Maven__log4j_log4j_1_2_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_sf_jopt_simple_jopt_simple_5_0_4.xml b/.idea/libraries/Maven__net_sf_jopt_simple_jopt_simple_5_0_4.xml
deleted file mode 100644
index 1ef5173..0000000
--- a/.idea/libraries/Maven__net_sf_jopt_simple_jopt_simple_5_0_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_avro_avro_1_7_4.xml b/.idea/libraries/Maven__org_apache_avro_avro_1_7_4.xml
deleted file mode 100644
index cc03056..0000000
--- a/.idea/libraries/Maven__org_apache_avro_avro_1_7_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_avro_avro_ipc_1_7_4.xml b/.idea/libraries/Maven__org_apache_avro_avro_ipc_1_7_4.xml
deleted file mode 100644
index 05fdc11..0000000
--- a/.idea/libraries/Maven__org_apache_avro_avro_ipc_1_7_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_avro_avro_tools_1_7_4.xml b/.idea/libraries/Maven__org_apache_avro_avro_tools_1_7_4.xml
deleted file mode 100644
index 3173eee..0000000
--- a/.idea/libraries/Maven__org_apache_avro_avro_tools_1_7_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_compress_1_4_1.xml b/.idea/libraries/Maven__org_apache_commons_commons_compress_1_4_1.xml
deleted file mode 100644
index 190209e..0000000
--- a/.idea/libraries/Maven__org_apache_commons_commons_compress_1_4_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml
deleted file mode 100644
index 78cfcd3..0000000
--- a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_flume_flume_ng_auth_1_9_0.xml b/.idea/libraries/Maven__org_apache_flume_flume_ng_auth_1_9_0.xml
deleted file mode 100644
index 0a0a25b..0000000
--- a/.idea/libraries/Maven__org_apache_flume_flume_ng_auth_1_9_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_flume_flume_ng_configfilters_flume_ng_config_filter_api_1_9_0.xml b/.idea/libraries/Maven__org_apache_flume_flume_ng_configfilters_flume_ng_config_filter_api_1_9_0.xml
deleted file mode 100644
index d10ad63..0000000
--- a/.idea/libraries/Maven__org_apache_flume_flume_ng_configfilters_flume_ng_config_filter_api_1_9_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_flume_flume_ng_configuration_1_9_0.xml b/.idea/libraries/Maven__org_apache_flume_flume_ng_configuration_1_9_0.xml
deleted file mode 100644
index 0c84574..0000000
--- a/.idea/libraries/Maven__org_apache_flume_flume_ng_configuration_1_9_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_flume_flume_ng_core_1_9_0.xml b/.idea/libraries/Maven__org_apache_flume_flume_ng_core_1_9_0.xml
deleted file mode 100644
index 8482bfd..0000000
--- a/.idea/libraries/Maven__org_apache_flume_flume_ng_core_1_9_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_flume_flume_ng_sdk_1_9_0.xml b/.idea/libraries/Maven__org_apache_flume_flume_ng_sdk_1_9_0.xml
deleted file mode 100644
index ae04833..0000000
--- a/.idea/libraries/Maven__org_apache_flume_flume_ng_sdk_1_9_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpasyncclient_4_1_3.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpasyncclient_4_1_3.xml
deleted file mode 100644
index d5da2b5..0000000
--- a/.idea/libraries/Maven__org_apache_httpcomponents_httpasyncclient_4_1_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_2.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_2.xml
deleted file mode 100644
index fdb7ead..0000000
--- a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_6.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_6.xml
deleted file mode 100644
index a9f6e19..0000000
--- a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_nio_4_4_6.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_nio_4_4_6.xml
deleted file mode 100644
index 3613e21..0000000
--- a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_nio_4_4_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_3_1.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_3_1.xml
deleted file mode 100644
index ff08d3d..0000000
--- a/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_3_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_kafka_kafka_2_11_1_0_0.xml b/.idea/libraries/Maven__org_apache_kafka_kafka_2_11_1_0_0.xml
deleted file mode 100644
index cad83b3..0000000
--- a/.idea/libraries/Maven__org_apache_kafka_kafka_2_11_1_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_kafka_kafka_clients_1_0_0.xml b/.idea/libraries/Maven__org_apache_kafka_kafka_clients_1_0_0.xml
deleted file mode 100644
index 25e3efc..0000000
--- a/.idea/libraries/Maven__org_apache_kafka_kafka_clients_1_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_mina_mina_core_2_0_4.xml b/.idea/libraries/Maven__org_apache_mina_mina_core_2_0_4.xml
deleted file mode 100644
index 3a77804..0000000
--- a/.idea/libraries/Maven__org_apache_mina_mina_core_2_0_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_thrift_libthrift_0_9_3.xml b/.idea/libraries/Maven__org_apache_thrift_libthrift_0_9_3.xml
deleted file mode 100644
index 0ff6c53..0000000
--- a/.idea/libraries/Maven__org_apache_thrift_libthrift_0_9_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_velocity_velocity_1_7.xml b/.idea/libraries/Maven__org_apache_velocity_velocity_1_7.xml
deleted file mode 100644
index 7a2914a..0000000
--- a/.idea/libraries/Maven__org_apache_velocity_velocity_1_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_zookeeper_zookeeper_3_4_10.xml b/.idea/libraries/Maven__org_apache_zookeeper_zookeeper_3_4_10.xml
deleted file mode 100644
index c595d79..0000000
--- a/.idea/libraries/Maven__org_apache_zookeeper_zookeeper_3_4_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_codehaus_jackson_jackson_core_asl_1_8_8.xml b/.idea/libraries/Maven__org_codehaus_jackson_jackson_core_asl_1_8_8.xml
deleted file mode 100644
index d649056..0000000
--- a/.idea/libraries/Maven__org_codehaus_jackson_jackson_core_asl_1_8_8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_asl_1_8_8.xml b/.idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_asl_1_8_8.xml
deleted file mode 100644
index 148cdfd..0000000
--- a/.idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_asl_1_8_8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_http_9_4_6_v20170531.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_http_9_4_6_v20170531.xml
deleted file mode 100644
index 348cfac..0000000
--- a/.idea/libraries/Maven__org_eclipse_jetty_jetty_http_9_4_6_v20170531.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_4_6_v20170531.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_4_6_v20170531.xml
deleted file mode 100644
index 537e5e4..0000000
--- a/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_4_6_v20170531.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_jmx_9_4_6_v20170531.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_jmx_9_4_6_v20170531.xml
deleted file mode 100644
index b8f3918..0000000
--- a/.idea/libraries/Maven__org_eclipse_jetty_jetty_jmx_9_4_6_v20170531.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_security_9_4_6_v20170531.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_security_9_4_6_v20170531.xml
deleted file mode 100644
index 43e5889..0000000
--- a/.idea/libraries/Maven__org_eclipse_jetty_jetty_security_9_4_6_v20170531.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_server_9_4_6_v20170531.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_server_9_4_6_v20170531.xml
deleted file mode 100644
index 9a5d606..0000000
--- a/.idea/libraries/Maven__org_eclipse_jetty_jetty_server_9_4_6_v20170531.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlet_9_4_6_v20170531.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlet_9_4_6_v20170531.xml
deleted file mode 100644
index 937f9fb..0000000
--- a/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlet_9_4_6_v20170531.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_4_6_v20170531.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_4_6_v20170531.xml
deleted file mode 100644
index 94631d2..0000000
--- a/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_4_6_v20170531.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_influxdb_influxdb_java_2_1.xml b/.idea/libraries/Maven__org_influxdb_influxdb_java_2_1.xml
deleted file mode 100644
index a6c5b54..0000000
--- a/.idea/libraries/Maven__org_influxdb_influxdb_java_2_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_lz4_lz4_java_1_4.xml b/.idea/libraries/Maven__org_lz4_lz4_java_1_4.xml
deleted file mode 100644
index 8cf9aff..0000000
--- a/.idea/libraries/Maven__org_lz4_lz4_java_1_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mockito_mockito_all_1_10_19.xml b/.idea/libraries/Maven__org_mockito_mockito_all_1_10_19.xml
deleted file mode 100644
index c87b108..0000000
--- a/.idea/libraries/Maven__org_mockito_mockito_all_1_10_19.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mortbay_jetty_jetty_6_1_26.xml b/.idea/libraries/Maven__org_mortbay_jetty_jetty_6_1_26.xml
deleted file mode 100644
index 0f5d0b8..0000000
--- a/.idea/libraries/Maven__org_mortbay_jetty_jetty_6_1_26.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mortbay_jetty_jetty_util_6_1_26.xml b/.idea/libraries/Maven__org_mortbay_jetty_jetty_util_6_1_26.xml
deleted file mode 100644
index f6ec2b9..0000000
--- a/.idea/libraries/Maven__org_mortbay_jetty_jetty_util_6_1_26.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_scala_lang_scala_library_2_11_11.xml b/.idea/libraries/Maven__org_scala_lang_scala_library_2_11_11.xml
deleted file mode 100644
index 1553078..0000000
--- a/.idea/libraries/Maven__org_scala_lang_scala_library_2_11_11.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml
deleted file mode 100644
index 20e8163..0000000
--- a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_tukaani_xz_1_0.xml b/.idea/libraries/Maven__org_tukaani_xz_1_0.xml
deleted file mode 100644
index 8b8042f..0000000
--- a/.idea/libraries/Maven__org_tukaani_xz_1_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_xerial_snappy_snappy_java_1_1_4.xml b/.idea/libraries/Maven__org_xerial_snappy_snappy_java_1_1_4.xml
deleted file mode 100644
index 33526ab..0000000
--- a/.idea/libraries/Maven__org_xerial_snappy_snappy_java_1_1_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__tech_allegro_schema_json2avro_converter_0_2_5.xml b/.idea/libraries/Maven__tech_allegro_schema_json2avro_converter_0_2_5.xml
deleted file mode 100644
index 5ad65a6..0000000
--- a/.idea/libraries/Maven__tech_allegro_schema_json2avro_converter_0_2_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/yb_http_avro_sink_file/pom.xml b/yb_http_avro_sink_file/pom.xml
index a10fc25..0a1f49a 100644
--- a/yb_http_avro_sink_file/pom.xml
+++ b/yb_http_avro_sink_file/pom.xml
@@ -204,12 +204,6 @@
-
- junit
- junit
- 3.8.1
- test
-
@@ -343,6 +337,12 @@
guava
18.0
+
+ junit
+ junit
+ 4.12
+ test
+
diff --git a/yb_http_avro_sink_file/src/main/java/cn/ac/iie/cusflume/sink/bean/dataBean/CommonLog.java b/yb_http_avro_sink_file/src/main/java/cn/ac/iie/cusflume/sink/bean/dataBean/CommonLog.java
index 6da257e..2280815 100644
--- a/yb_http_avro_sink_file/src/main/java/cn/ac/iie/cusflume/sink/bean/dataBean/CommonLog.java
+++ b/yb_http_avro_sink_file/src/main/java/cn/ac/iie/cusflume/sink/bean/dataBean/CommonLog.java
@@ -7,8 +7,8 @@ public class CommonLog {
private int cfg_id;
- private int found_time;
- private int recv_time;
+ private String found_time;
+ private String recv_time;
private String trans_proto;
private int addr_type;
private String d_ip;
@@ -32,6 +32,8 @@ public class CommonLog {
private String user_region;
private String scene_file;
private String scene_file_id;
+ private String s_mac;
+ private String d_mac;
public String getDevice_id() {
return device_id;
@@ -49,19 +51,19 @@ public class CommonLog {
this.cfg_id = cfg_id;
}
- public int getFound_time() {
+ public String getFound_time() {
return found_time;
}
- public void setFound_time(int found_time) {
+ public void setFound_time(String found_time) {
this.found_time = found_time;
}
- public int getRecv_time() {
+ public String getRecv_time() {
return recv_time;
}
- public void setRecv_time(int recv_time) {
+ public void setRecv_time(String recv_time) {
this.recv_time = recv_time;
}
@@ -249,6 +251,18 @@ public class CommonLog {
this.scene_file_id = scene_file_id;
}
+ public String getS_mac() {
+ return s_mac;
+ }
+
+ public void setS_mac(String s_mac) {
+ this.s_mac = s_mac;
+ }
+
+ public String getD_mac() { return d_mac; }
+
+ public void setD_mac(String d_mac) { this.d_mac = d_mac; }
+
@Override
public String toString() {
return
@@ -278,7 +292,9 @@ public class CommonLog {
d_subscribe_id + "#" +
user_region + "#" +
scene_file + "#" +
- scene_file_id + "#";
+ scene_file_id + "#" +
+ s_mac + "#" +
+ d_mac + "#" ;
}
public String field() {
@@ -309,6 +325,8 @@ public class CommonLog {
d_subscribe_id + "#" +
user_region + "#" +
scene_file + "#" +
- scene_file_id + "#";
+ scene_file_id + "#" +
+ s_mac + "#" +
+ d_mac + "#" ;
}
}
diff --git a/yb_http_avro_sink_file/src/main/java/cn/ac/iie/cusflume/sink/bean/dataBean/NTC_COLLECT_SSL_LOG.java b/yb_http_avro_sink_file/src/main/java/cn/ac/iie/cusflume/sink/bean/dataBean/NTC_COLLECT_SSL_LOG.java
index 396f7d4..f7f28ed 100644
--- a/yb_http_avro_sink_file/src/main/java/cn/ac/iie/cusflume/sink/bean/dataBean/NTC_COLLECT_SSL_LOG.java
+++ b/yb_http_avro_sink_file/src/main/java/cn/ac/iie/cusflume/sink/bean/dataBean/NTC_COLLECT_SSL_LOG.java
@@ -10,17 +10,17 @@ public class NTC_COLLECT_SSL_LOG extends CommonLog {
private String s2c_byte_num;
-// private String SNI;//旧-废弃-20200507
+ // private String SNI;//旧-废弃-20200507
private String sni;//新-修改-20200507
private long create_time;
-// private long lastmtime;//旧-废弃-20200507
+ // private long lastmtime;//旧-废弃-20200507
private long last_time;//新-修改-20200507
private String server_ciphersuits;
private String client_ciphersuits;
-// private Collect_SSL_field_server_cert server_cert;//旧-废弃-20200507
+ // private Collect_SSL_field_server_cert server_cert;//旧-废弃-20200507
private String server_cert;//新-修改-压成字符串-20200507
// private String version;//旧-server_cert内部字段-废弃-20200507
@@ -31,6 +31,10 @@ public class NTC_COLLECT_SSL_LOG extends CommonLog {
private LOG_D_TAG_BEAN d_tag;//json版本-20200509
private String x_tag;//json字符串版本,就算前端传入的为json也会强转为字符串
+ //20210131新增
+ private String cert_finger;
+ private String pub_key;
+
public String getC2s_pkt_num() {
return c2s_pkt_num;
}
@@ -135,6 +139,13 @@ public class NTC_COLLECT_SSL_LOG extends CommonLog {
this.x_tag = x_tag;
}
+ public String getCert_finger() { return cert_finger; }
+
+ public void setCert_finger(String cert_finger) { this.cert_finger = cert_finger; }
+
+ public String getPub_key() { return pub_key; }
+
+ public void setPub_key(String pub_key) { this.pub_key = pub_key; }
// @Override
// public String toString() {
// return field() +
@@ -154,6 +165,24 @@ public class NTC_COLLECT_SSL_LOG extends CommonLog {
// }
+ // @Override
+// public String toString() {
+// return "NTC_COLLECT_SSL_LOG{" +
+// "c2s_pkt_num='" + c2s_pkt_num + '\'' +
+// ", s2c_pkt_num='" + s2c_pkt_num + '\'' +
+// ", c2s_byte_num='" + c2s_byte_num + '\'' +
+// ", s2c_byte_num='" + s2c_byte_num + '\'' +
+// ", sni='" + sni + '\'' +
+// ", create_time=" + create_time +
+// ", last_time=" + last_time +
+// ", server_ciphersuits='" + server_ciphersuits + '\'' +
+// ", client_ciphersuits='" + client_ciphersuits + '\'' +
+// ", server_cert='" + server_cert + '\'' +
+// ", client_cert='" + client_cert + '\'' +
+// ", d_tag=" + d_tag +
+// ", x_tag='" + x_tag + '\'' +
+// '}';
+// }
@Override
public String toString() {
return "NTC_COLLECT_SSL_LOG{" +
@@ -170,6 +199,8 @@ public class NTC_COLLECT_SSL_LOG extends CommonLog {
", client_cert='" + client_cert + '\'' +
", d_tag=" + d_tag +
", x_tag='" + x_tag + '\'' +
+ ", cert_finger='" + cert_finger + '\'' +
+ ", pub_key='" + pub_key + '\'' +
'}';
}
}
diff --git a/yb_http_avro_sink_file/src/main/java/cn/ac/iie/cusflume/sink/bean/dataBean/NTC_CONN_RECORD_LOG.java b/yb_http_avro_sink_file/src/main/java/cn/ac/iie/cusflume/sink/bean/dataBean/NTC_CONN_RECORD_LOG.java
index d0704e2..ba8542c 100644
--- a/yb_http_avro_sink_file/src/main/java/cn/ac/iie/cusflume/sink/bean/dataBean/NTC_CONN_RECORD_LOG.java
+++ b/yb_http_avro_sink_file/src/main/java/cn/ac/iie/cusflume/sink/bean/dataBean/NTC_CONN_RECORD_LOG.java
@@ -15,6 +15,9 @@ public class NTC_CONN_RECORD_LOG extends CommonLog {
private String x_tag;//json字符串版本,就算前端传入的为json也会强转为字符串
//20191216新增
+ private String s2c_data_head;
+ private String c2s_data_head;
+
public String getApp_label() {
return app_label;
}
@@ -71,6 +74,15 @@ public class NTC_CONN_RECORD_LOG extends CommonLog {
this.x_tag = x_tag;
}
+ public String getS2c_data_head() { return s2c_data_head; }
+
+ public void setS2c_data_head(String s2c_data_head) { this.s2c_data_head = s2c_data_head; }
+
+ public String getC2s_data_head() { return c2s_data_head; }
+
+ public void setC2s_data_head(String c2s_data_head) { this.c2s_data_head = c2s_data_head; }
+
+
@Override
public String toString() {
return "NTC_CONN_RECORD_LOG{" +
@@ -81,6 +93,8 @@ public class NTC_CONN_RECORD_LOG extends CommonLog {
", s2c_byte_num='" + s2c_byte_num + '\'' +
", d_tag=" + d_tag +
", x_tag='" + x_tag + '\'' +
+ ", s2c_data_head='" + s2c_data_head + '\'' +
+ ", c2s_data_head='" + c2s_data_head + '\'' +
'}';
}
}
diff --git a/yb_http_avro_sink_file/src/main/java/cn/ac/iie/cusflume/sink/bean/fileBean/CommonLog_File.java b/yb_http_avro_sink_file/src/main/java/cn/ac/iie/cusflume/sink/bean/fileBean/CommonLog_File.java
index dbd3f69..7a390e8 100644
--- a/yb_http_avro_sink_file/src/main/java/cn/ac/iie/cusflume/sink/bean/fileBean/CommonLog_File.java
+++ b/yb_http_avro_sink_file/src/main/java/cn/ac/iie/cusflume/sink/bean/fileBean/CommonLog_File.java
@@ -6,8 +6,8 @@ public class CommonLog_File {
//后期特别新增的字段,加到前面
private int cfg_id;
- private int found_time;
- private int recv_time;
+ private String found_time;
+ private String recv_time;
private String trans_proto;
private int addr_type;
private String d_ip;
@@ -15,7 +15,7 @@ public class CommonLog_File {
private int d_port;
private int s_port;
private int entrance_id;
- // private int encap_type;
+// private int encap_type;
// private int direction;
// private String inner_smac;
// private String inner_dmac;
@@ -26,12 +26,15 @@ public class CommonLog_File {
private String client_locate;
private String s_asn;
private String d_asn;
- // private String s_subscribe_id;
+// private String s_subscribe_id;
// private String d_subscribe_id;
private String user_region;
private int service;
private String scene_file;
private String scene_file_id;
+ private String s_mac;
+ private String d_mac;
+
public String getDevice_id() {
return device_id;
@@ -49,19 +52,19 @@ public class CommonLog_File {
this.cfg_id = cfg_id;
}
- public int getFound_time() {
+ public String getFound_time() {
return found_time;
}
- public void setFound_time(int found_time) {
+ public void setFound_time(String found_time) {
this.found_time = found_time;
}
- public int getRecv_time() {
+ public String getRecv_time() {
return recv_time;
}
- public void setRecv_time(int recv_time) {
+ public void setRecv_time(String recv_time) {
this.recv_time = recv_time;
}
@@ -209,6 +212,18 @@ public class CommonLog_File {
this.scene_file_id = scene_file_id;
}
+ public String getS_mac() {
+ return s_mac;
+ }
+
+ public void setS_mac(String s_mac) {
+ this.s_mac = s_mac;
+ }
+
+ public String getD_mac() { return d_mac; }
+
+ public void setD_mac(String d_mac) { this.d_mac = d_mac; }
+
@Override
public String toString() {
return
@@ -239,7 +254,9 @@ public class CommonLog_File {
user_region + "#" +
service + "#" +
scene_file + "#" +
- scene_file_id + "#";
+ scene_file_id + "#" +
+ s_mac + "#" +
+ d_mac + "#" ;
}
public String field() {
@@ -271,6 +288,8 @@ public class CommonLog_File {
user_region + "#" +
service + "#" +
scene_file + "#" +
- scene_file_id + "#";
+ scene_file_id + "#" +
+ s_mac + "#" +
+ d_mac + "#" ;
}
}
diff --git a/yb_http_avro_sink_file/src/main/java/cn/ac/iie/cusflume/sink/bean/fileBean/NTC_COLLECT_MAIL_LOG.java b/yb_http_avro_sink_file/src/main/java/cn/ac/iie/cusflume/sink/bean/fileBean/NTC_COLLECT_MAIL_LOG.java
index d80f67a..56f969b 100644
--- a/yb_http_avro_sink_file/src/main/java/cn/ac/iie/cusflume/sink/bean/fileBean/NTC_COLLECT_MAIL_LOG.java
+++ b/yb_http_avro_sink_file/src/main/java/cn/ac/iie/cusflume/sink/bean/fileBean/NTC_COLLECT_MAIL_LOG.java
@@ -4,7 +4,7 @@ import cn.ac.iie.cusflume.sink.bean.tagBean.LOG_D_TAG_BEAN;
import java.util.Arrays;
-public class NTC_COLLECT_MAIL_LOG extends CommonLog_File{
+public class NTC_COLLECT_MAIL_LOG extends CommonLog_File {
private String mail_proto;
private String mail_from;
@@ -29,7 +29,17 @@ public class NTC_COLLECT_MAIL_LOG extends CommonLog_File{
private String[] attachments;//目前未使用-20191216
private String attachments_id;//目前未使用-20191216
-
+ //20210131新增
+ private String bcc;
+ private String received;
+ private String return_path;
+ private String reply_to;
+ private String mail_from_cmd;
+ private String rcpt_to_cmd;
+ private String resent_from;
+ private String resent_to;
+ private String resent_date;
+ private String message_id;
public String getMail_proto() {
@@ -152,6 +162,85 @@ public class NTC_COLLECT_MAIL_LOG extends CommonLog_File{
this.mail_date = mail_date;
}
+ public String getBcc() {
+ return bcc;
+ }
+
+ public void setBcc(String bcc) {
+ this.bcc = bcc;
+ }
+
+ public String getReceived() {
+ return received;
+ }
+
+ public void setRecevied(String received) {
+ this.received = received;
+ }
+
+ public String getReturn_path() {
+ return return_path;
+ }
+
+ public void setReturn_path(String return_path) {
+ this.return_path = return_path;
+ }
+
+ public String getReply_to() {
+ return reply_to;
+ }
+
+ public void setReply_to(String reply_to) {
+ this.reply_to = reply_to;
+ }
+
+ public String getMail_from_cmd() {
+ return mail_from_cmd;
+ }
+
+ public void setMail_from_cmd(String mail_from_cmd) {
+ this.mail_from_cmd = mail_from_cmd;
+ }
+
+ public String getRcpt_to_cmd() {
+ return rcpt_to_cmd;
+ }
+
+ public void setRcpt_to_cmd(String rcpt_to_cmd) {
+ this.rcpt_to_cmd = rcpt_to_cmd;
+ }
+
+ public String getResent_from() {
+ return resent_from;
+ }
+
+ public void setResent_from(String resent_from) {
+ this.resent_from = resent_from;
+ }
+
+ public String getResent_to() {
+ return resent_to;
+ }
+
+ public void setResent_to(String resent_to) {
+ this.resent_to = resent_to;
+ }
+
+ public String getResent_date() {
+ return resent_date;
+ }
+
+ public void setResent_date(String resent_date) {
+ this.resent_date = resent_date;
+ }
+
+ public String getMessage_id() {
+ return message_id;
+ }
+
+ public void setMessage_id(String message_id) {
+ this.message_id = message_id;
+ }
// @Override
// public String toString() {
// return "NTC_COLLECT_MAIL_LOG{" +
@@ -168,6 +257,26 @@ public class NTC_COLLECT_MAIL_LOG extends CommonLog_File{
// }
+ // @Override
+// public String toString() {
+// return "NTC_COLLECT_MAIL_LOG{" +
+// "mail_proto='" + mail_proto + '\'' +
+// ", mail_from='" + mail_from + '\'' +
+// ", mail_to='" + mail_to + '\'' +
+// ", mail_cc='" + mail_cc + '\'' +
+// ", mail_date='" + mail_date + '\'' +
+// ", subject='" + subject + '\'' +
+// ", eml_file_path='" + eml_file_path + '\'' +
+// ", attachments_path='" + attachments_path + '\'' +
+// ", subject_charset='" + subject_charset + '\'' +
+// ", d_tag=" + d_tag +
+// ", x_tag='" + x_tag + '\'' +
+// ", eml_file='" + eml_file + '\'' +
+// ", eml_file_id='" + eml_file_id + '\'' +
+// ", attachments=" + Arrays.toString(attachments) +
+// ", attachments_id='" + attachments_id + '\'' +
+// '}';
+// }
@Override
public String toString() {
return "NTC_COLLECT_MAIL_LOG{" +
@@ -186,6 +295,16 @@ public class NTC_COLLECT_MAIL_LOG extends CommonLog_File{
", eml_file_id='" + eml_file_id + '\'' +
", attachments=" + Arrays.toString(attachments) +
", attachments_id='" + attachments_id + '\'' +
+ ", bcc='" + bcc + '\'' +
+ ", received='" + received + '\'' +
+ ", return_path='" + return_path + '\'' +
+ ", reply_to='" + reply_to + '\'' +
+ ", mail_from_cmd='" + mail_from_cmd + '\'' +
+ ", rcpt_to_cmd='" + rcpt_to_cmd + '\'' +
+ ", resent_from='" + resent_from + '\'' +
+ ", resent_to='" + resent_to + '\'' +
+ ", resent_date='" + resent_date + '\'' +
+ ", message_id='" + message_id + '\'' +
'}';
}
}
diff --git a/yb_http_avro_sink_file/src/main/resources/flume_config.properties b/yb_http_avro_sink_file/src/main/resources/flume_config.properties
index 4530cc2..4548a52 100644
--- a/yb_http_avro_sink_file/src/main/resources/flume_config.properties
+++ b/yb_http_avro_sink_file/src/main/resources/flume_config.properties
@@ -19,15 +19,15 @@ http.async.connectionRequestTimeout=30000
#Schema配置信息
#纯消息-和前端定义相关联
-schema.ntc-conn-record-log={"type":"record","name":"connrecord","fields":[{"name":"cfg_id","type":"int","doc":"label:配置ID","default":0},{"name":"found_time","type":"int","doc":"label:发现时间","default":0},{"name":"recv_time","type":"int","doc":"label:接收时间","default":0},{"name":"trans_proto","type":"string","doc":"label:传输层协议","default":""},{"name":"addr_type","type":"int","doc":"label:地址类型","default":0},{"name":"d_ip","type":"string","doc":"label:目的IP","default":""},{"name":"s_ip","type":"string","doc":"label:源IP","default":""},{"name":"d_port","type":"int","doc":"label:目的端口","default":0},{"name":"s_port","type":"int","doc":"label:源端口","default":0},{"name":"device_id","type":"string","doc":"label:设备ID","default":""},{"name":"stream_dir","type":"int","doc":"label:流类型","default":0},{"name":"cap_ip","type":"string","doc":"label:捕包机IP","default":""},{"name":"addr_list","type":"string","doc":"label:嵌套地址列表","default":""},{"name":"server_locate","type":"string","doc":"label:服务端地址定位信息","default":""},{"name":"client_locate","type":"string","doc":"label:客户端地址定位信息","default":""},{"name":"s_asn","type":"string","doc":"label:客户端ASN","default":""},{"name":"d_asn","type":"string","doc":"label:服务端ASN","default":""},{"name":"user_region","type":"string","doc":"label:用户自定义","default":""},{"name":"scene_file_id","type":"string","doc":"label:现场日志转储地址","default":""},{"name":"app_label","type":"string","doc":"label:应用识别标签","default":""},{"name":"c2s_pkt_num","type":"string","doc":"label:c2s包数","default":""},{"name":"s2c_pkt_num","type":"string","doc":"label:s2c包数","default":""},{"name":"c2s_byte_num","type":"string","doc":"label:c2s字节数","default":""},{"name":"s2c_byte_num","type":"string","doc":"label:s2c字节数","default":""}]}
-schema.ntc-collect-ssl-log={"type":"record","name":"collssl","fields":[{"name":"cfg_id","type":"int","doc":"label:配置ID","default":0},{"name":"found_time","type":"int","doc":"label:发现时间","default":0},{"name":"recv_time","type":"int","doc":"label:接收时间","default":0},{"name":"trans_proto","type":"string","doc":"label:传输层协议","default":""},{"name":"addr_type","type":"int","doc":"label:地址类型","default":0},{"name":"d_ip","type":"string","doc":"label:目的IP","default":""},{"name":"s_ip","type":"string","doc":"label:源IP","default":""},{"name":"d_port","type":"int","doc":"label:目的端口","default":0},{"name":"s_port","type":"int","doc":"label:源端口","default":0},{"name":"device_id","type":"string","doc":"label:设备ID","default":""},{"name":"stream_dir","type":"int","doc":"label:流类型","default":0},{"name":"cap_ip","type":"string","doc":"label:捕包机IP","default":""},{"name":"addr_list","type":"string","doc":"label:嵌套地址列表","default":""},{"name":"server_locate","type":"string","doc":"label:服务端地址定位信息","default":""},{"name":"client_locate","type":"string","doc":"label:客户端地址定位信息","default":""},{"name":"s_asn","type":"string","doc":"label:客户端ASN","default":""},{"name":"d_asn","type":"string","doc":"label:服务端ASN","default":""},{"name":"user_region","type":"string","doc":"label:用户自定义","default":""},{"name":"scene_file_id","type":"string","doc":"label:现场日志转储地址","default":""},{"name":"c2s_pkt_num","type":"string","doc":"label:c2s包数","default":""},{"name":"s2c_pkt_num","type":"string","doc":"label:s2c包数","default":""},{"name":"c2s_byte_num","type":"string","doc":"label:c2s字节数","default":""},{"name":"s2c_byte_num","type":"string","doc":"label:s2c字节数","default":""},{"name":"sni","type":"string","doc":"label:SSLservernameindication","default":""},{"name":"create_time","type":"long","doc":"label:会话创建时间unixtimestamp","default":0},{"name":"last_time","type":"long","doc":"label:会话最后修改时间unixtimestamp","default":0},{"name":"server_ciphersuits","type":"string","doc":"label:服务端ciphersuits","default":""},{"name":"client_ciphersuits","type":"string","doc":"label:客户端ciphersuits","default":""},{"name":"server_cert","type":"string","doc":"label:服务端证书信息","default":""},{"name":"client_cert","type":"string","doc":"label:客户端证书信息","default":""}]}
-schema.ntc-collect-dns-log={"type":"record","name":"colldns","fields":[{"name":"cfg_id","type":"int","doc":"label:配置ID","default":0},{"name":"found_time","type":"int","doc":"label:发现时间","default":0},{"name":"recv_time","type":"int","doc":"label:接收时间","default":0},{"name":"trans_proto","type":"string","doc":"label:传输层协议","default":""},{"name":"addr_type","type":"int","doc":"label:地址类型","default":0},{"name":"d_ip","type":"string","doc":"label:目的IP","default":""},{"name":"s_ip","type":"string","doc":"label:源IP","default":""},{"name":"d_port","type":"int","doc":"label:目的端口","default":0},{"name":"s_port","type":"int","doc":"label:源端口","default":0},{"name":"device_id","type":"string","doc":"label:设备ID","default":""},{"name":"stream_dir","type":"int","doc":"label:流类型","default":0},{"name":"cap_ip","type":"string","doc":"label:捕包机IP","default":""},{"name":"addr_list","type":"string","doc":"label:嵌套地址列表","default":""},{"name":"server_locate","type":"string","doc":"label:服务端地址定位信息","default":""},{"name":"client_locate","type":"string","doc":"label:客户端地址定位信息","default":""},{"name":"s_asn","type":"string","doc":"label:客户端ASN","default":""},{"name":"d_asn","type":"string","doc":"label:服务端ASN","default":""},{"name":"user_region","type":"string","doc":"label:用户自定义","default":""},{"name":"scene_file_id","type":"string","doc":"label:现场日志转储地址","default":""},{"name":"dns_sub","type":"long","doc":"label:DNS种类","default":0},{"name":"hdr","type":"string","doc":"label:hdr信息","default":""},{"name":"flags","type":"string","doc":"label:标志","default":""},{"name":"question","type":"string","doc":"label:问题计数","default":""},{"name":"rr","type":"string","doc":"label:资源记录","default":""}]}
+schema.ntc-conn-record-log={"type":"record","name":"connrecord","fields":[{"name":"cfg_id","type":"int","doc":"label:配置ID","default":0},{"name":"found_time","type":"string","doc":"label:发现时间","default":0},{"name":"recv_time","type":"string","doc":"label:接收时间","default":0},{"name":"trans_proto","type":"string","doc":"label:传输层协议","default":""},{"name":"addr_type","type":"int","doc":"label:地址类型","default":0},{"name":"d_ip","type":"string","doc":"label:目的IP","default":""},{"name":"s_ip","type":"string","doc":"label:源IP","default":""},{"name":"d_port","type":"int","doc":"label:目的端口","default":0},{"name":"s_port","type":"int","doc":"label:源端口","default":0},{"name":"device_id","type":"string","doc":"label:设备ID","default":""},{"name":"stream_dir","type":"int","doc":"label:流类型","default":0},{"name":"cap_ip","type":"string","doc":"label:捕包机IP","default":""},{"name":"addr_list","type":"string","doc":"label:嵌套地址列表","default":""},{"name":"server_locate","type":"string","doc":"label:服务端地址定位信息","default":""},{"name":"client_locate","type":"string","doc":"label:客户端地址定位信息","default":""},{"name":"s_asn","type":"string","doc":"label:客户端ASN","default":""},{"name":"d_asn","type":"string","doc":"label:服务端ASN","default":""},{"name":"user_region","type":"string","doc":"label:用户自定义","default":""},{"name":"scene_file_id","type":"string","doc":"label:现场日志转储地址","default":""},{"name":"s_mac","type":"string","doc":"label:源MAC","default":""},{"name":"d_mac","type":"string","doc":"label:目的MAC","default":""},{"name":"app_label","type":"string","doc":"label:应用识别标签","default":""},{"name":"c2s_pkt_num","type":"string","doc":"label:c2s包数","default":""},{"name":"s2c_pkt_num","type":"string","doc":"label:s2c包数","default":""},{"name":"c2s_byte_num","type":"string","doc":"label:c2s字节数","default":""},{"name":"s2c_byte_num","type":"string","doc":"label:s2c字节数","default":""},{"name":"s2c_data_head","type":"string","doc":"服务端到客户端负载前100字节","default":""},{"name":"c2s_data_head","type":"string","doc":"客户端到服务端负载前100字节","default":""}]}
+schema.ntc-collect-ssl-log={"type":"record","name":"collssl","fields":[{"name":"cfg_id","type":"int","doc":"label:配置ID","default":0},{"name":"found_time","type":"string","doc":"label:发现时间","default":0},{"name":"recv_time","type":"string","doc":"label:接收时间","default":0},{"name":"trans_proto","type":"string","doc":"label:传输层协议","default":""},{"name":"addr_type","type":"int","doc":"label:地址类型","default":0},{"name":"d_ip","type":"string","doc":"label:目的IP","default":""},{"name":"s_ip","type":"string","doc":"label:源IP","default":""},{"name":"d_port","type":"int","doc":"label:目的端口","default":0},{"name":"s_port","type":"int","doc":"label:源端口","default":0},{"name":"device_id","type":"string","doc":"label:设备ID","default":""},{"name":"stream_dir","type":"int","doc":"label:流类型","default":0},{"name":"cap_ip","type":"string","doc":"label:捕包机IP","default":""},{"name":"addr_list","type":"string","doc":"label:嵌套地址列表","default":""},{"name":"server_locate","type":"string","doc":"label:服务端地址定位信息","default":""},{"name":"client_locate","type":"string","doc":"label:客户端地址定位信息","default":""},{"name":"s_asn","type":"string","doc":"label:客户端ASN","default":""},{"name":"d_asn","type":"string","doc":"label:服务端ASN","default":""},{"name":"user_region","type":"string","doc":"label:用户自定义","default":""},{"name":"scene_file_id","type":"string","doc":"label:现场日志转储地址","default":""},{"name":"s_mac","type":"string","doc":"label:源MAC","default":""},{"name":"d_mac","type":"string","doc":"label:目的MAC","default":""},{"name":"c2s_pkt_num","type":"string","doc":"label:c2s包数","default":""},{"name":"s2c_pkt_num","type":"string","doc":"label:s2c包数","default":""},{"name":"c2s_byte_num","type":"string","doc":"label:c2s字节数","default":""},{"name":"s2c_byte_num","type":"string","doc":"label:s2c字节数","default":""},{"name":"sni","type":"string","doc":"label:SSLservernameindication","default":""},{"name":"create_time","type":"long","doc":"label:会话创建时间unixtimestamp","default":0},{"name":"last_time","type":"long","doc":"label:会话最后修改时间unixtimestamp","default":0},{"name":"server_ciphersuits","type":"string","doc":"label:服务端ciphersuits","default":""},{"name":"client_ciphersuits","type":"string","doc":"label:客户端ciphersuits","default":""},{"name":"server_cert","type":"string","doc":"label:服务端证书信息","default":""},{"name":"client_cert","type":"string","doc":"label:客户端证书信息","default":""},{"name":"cert_finger","type":"string","doc":"label:证书指纹","default":""},{"name":"pub_key","type":"string","doc":"label:公钥","default":""}]}
+schema.ntc-collect-dns-log={"type":"record","name":"colldns","fields":[{"name":"cfg_id","type":"int","doc":"label:配置ID","default":0},{"name":"found_time","type":"string","doc":"label:发现时间","default":0},{"name":"recv_time","type":"string","doc":"label:接收时间","default":0},{"name":"trans_proto","type":"string","doc":"label:传输层协议","default":""},{"name":"addr_type","type":"int","doc":"label:地址类型","default":0},{"name":"d_ip","type":"string","doc":"label:目的IP","default":""},{"name":"s_ip","type":"string","doc":"label:源IP","default":""},{"name":"d_port","type":"int","doc":"label:目的端口","default":0},{"name":"s_port","type":"int","doc":"label:源端口","default":0},{"name":"device_id","type":"string","doc":"label:设备ID","default":""},{"name":"stream_dir","type":"int","doc":"label:流类型","default":0},{"name":"cap_ip","type":"string","doc":"label:捕包机IP","default":""},{"name":"addr_list","type":"string","doc":"label:嵌套地址列表","default":""},{"name":"server_locate","type":"string","doc":"label:服务端地址定位信息","default":""},{"name":"client_locate","type":"string","doc":"label:客户端地址定位信息","default":""},{"name":"s_asn","type":"string","doc":"label:客户端ASN","default":""},{"name":"d_asn","type":"string","doc":"label:服务端ASN","default":""},{"name":"user_region","type":"string","doc":"label:用户自定义","default":""},{"name":"scene_file_id","type":"string","doc":"label:现场日志转储地址","default":""},{"name":"s_mac","type":"string","doc":"label:源MAC","default":""},{"name":"d_mac","type":"string","doc":"label:目的MAC","default":""},{"name":"dns_sub","type":"long","doc":"label:DNS种类","default":0},{"name":"hdr","type":"string","doc":"label:hdr信息","default":""},{"name":"flags","type":"string","doc":"label:标志","default":""},{"name":"question","type":"string","doc":"label:问题计数","default":""},{"name":"rr","type":"string","doc":"label:资源记录","default":""}]}
#文件消息-和前端定义相关联
-schema.ntc-collect-mail-log={"type":"record","name":"collmail","fields":[{"name":"cfg_id","type":"int","doc":"label:配置ID","default":0},{"name":"found_time","type":"int","doc":"label:发现时间","default":0},{"name":"recv_time","type":"int","doc":"label:接收时间","default":0},{"name":"trans_proto","type":"string","doc":"label:传输层协议","default":""},{"name":"addr_type","type":"int","doc":"label:地址类型","default":0},{"name":"d_ip","type":"string","doc":"label:目的IP","default":""},{"name":"s_ip","type":"string","doc":"label:源IP","default":""},{"name":"d_port","type":"int","doc":"label:目的端口","default":0},{"name":"s_port","type":"int","doc":"label:源端口","default":0},{"name":"device_id","type":"string","doc":"label:设备ID","default":""},{"name":"stream_dir","type":"int","doc":"label:流类型","default":0},{"name":"cap_ip","type":"string","doc":"label:捕包机IP","default":""},{"name":"addr_list","type":"string","doc":"label:嵌套地址列表","default":""},{"name":"server_locate","type":"string","doc":"label:服务端地址定位信息","default":""},{"name":"client_locate","type":"string","doc":"label:客户端地址定位信息","default":""},{"name":"s_asn","type":"string","doc":"label:客户端ASN","default":""},{"name":"d_asn","type":"string","doc":"label:服务端ASN","default":""},{"name":"user_region","type":"string","doc":"label:用户自定义","default":""},{"name":"scene_file_id","type":"string","doc":"label:现场日志转储地址","default":""},{"name":"mail_proto","type":"string","doc":"label:邮件协议","default":""},{"name":"mail_from","type":"string","doc":"label:邮件发件人","default":""},{"name":"mail_to","type":"string","doc":"label:邮件收件人","default":""},{"name":"mail_cc","type":"string","doc":"label:邮件抄送人","default":""},{"name":"mail_date","type":"string","doc":"label:邮件日期","default":""},{"name":"subject","type":"string","doc":"label:邮件主题","default":""},{"name":"eml_file_path","type":"string","doc":"label:邮件EML文件转储地址","default":""},{"name":"attachments_path","type":"string","doc":"label:附件转储地址列表","default":""}]}
-schema.ntc-collect-http-doc-log={"type":"record","name":"collhttpdoc","fields":[{"name":"cfg_id","type":"int","doc":"label:配置ID","default":0},{"name":"found_time","type":"int","doc":"label:发现时间","default":0},{"name":"recv_time","type":"int","doc":"label:接收时间","default":0},{"name":"trans_proto","type":"string","doc":"label:传输层协议","default":""},{"name":"addr_type","type":"int","doc":"label:地址类型","default":0},{"name":"d_ip","type":"string","doc":"label:目的IP","default":""},{"name":"s_ip","type":"string","doc":"label:源IP","default":""},{"name":"d_port","type":"int","doc":"label:目的端口","default":0},{"name":"s_port","type":"int","doc":"label:源端口","default":0},{"name":"device_id","type":"string","doc":"label:设备ID","default":""},{"name":"stream_dir","type":"int","doc":"label:流类型","default":0},{"name":"cap_ip","type":"string","doc":"label:捕包机IP","default":""},{"name":"addr_list","type":"string","doc":"label:嵌套地址列表","default":""},{"name":"server_locate","type":"string","doc":"label:服务端地址定位信息","default":""},{"name":"client_locate","type":"string","doc":"label:客户端地址定位信息","default":""},{"name":"s_asn","type":"string","doc":"label:客户端ASN","default":""},{"name":"d_asn","type":"string","doc":"label:服务端ASN","default":""},{"name":"user_region","type":"string","doc":"label:用户自定义","default":""},{"name":"scene_file_id","type":"string","doc":"label:现场日志转储地址","default":""},{"name":"url","type":"string","doc":"label:HTTP_url地址","default":""},{"name":"referer","type":"string","doc":"label:HTTP访问referer","default":""},{"name":"user_agent","type":"string","doc":"label:HTTP访问user_agent","default":""},{"name":"http_seq","type":"int","doc":"label:HTTP请求会话序列号","default":0},{"name":"req_line","type":"string","doc":"label:请求行","default":""},{"name":"res_line","type":"string","doc":"label:应答行","default":""},{"name":"cookie","type":"string","doc":"label:cookie值","default":""},{"name":"content_type","type":"string","doc":"label:content_type值","default":""},{"name":"content_len","type":"long","doc":"label:content_len值","default":0},{"name":"doc_type","type":"string","doc":"label:文件类型","default":""},{"name":"req_body_file_path","type":"string","doc":"label:请求体转储文件地址","default":""},{"name":"res_body_file_path","type":"string","doc":"label:应答体转储文件地址","default":""}]}
-schema.ntc-collect-http-av-log={"type":"record","name":"collhttpav","fields":[{"name":"cfg_id","type":"int","doc":"label:配置ID","default":0},{"name":"found_time","type":"int","doc":"label:发现时间","default":0},{"name":"recv_time","type":"int","doc":"label:接收时间","default":0},{"name":"trans_proto","type":"string","doc":"label:传输层协议","default":""},{"name":"addr_type","type":"int","doc":"label:地址类型","default":0},{"name":"d_ip","type":"string","doc":"label:目的IP","default":""},{"name":"s_ip","type":"string","doc":"label:源IP","default":""},{"name":"d_port","type":"int","doc":"label:目的端口","default":0},{"name":"s_port","type":"int","doc":"label:源端口","default":0},{"name":"device_id","type":"string","doc":"label:设备ID","default":""},{"name":"stream_dir","type":"int","doc":"label:流类型","default":0},{"name":"cap_ip","type":"string","doc":"label:捕包机IP","default":""},{"name":"addr_list","type":"string","doc":"label:嵌套地址列表","default":""},{"name":"server_locate","type":"string","doc":"label:服务端地址定位信息","default":""},{"name":"client_locate","type":"string","doc":"label:客户端地址定位信息","default":""},{"name":"s_asn","type":"string","doc":"label:客户端ASN","default":""},{"name":"d_asn","type":"string","doc":"label:服务端ASN","default":""},{"name":"user_region","type":"string","doc":"label:用户自定义","default":""},{"name":"scene_file_id","type":"string","doc":"label:现场日志转储地址","default":""},{"name":"url","type":"string","doc":"label:HTTP_url地址","default":""},{"name":"referer","type":"string","doc":"label:HTTP访问referer","default":""},{"name":"user_agent","type":"string","doc":"label:HTTP访问user_agent","default":""},{"name":"http_seq","type":"int","doc":"label:HTTP请求会话序列号","default":0},{"name":"req_line","type":"string","doc":"label:请求行","default":""},{"name":"res_line","type":"string","doc":"label:应答行","default":""},{"name":"cookie","type":"string","doc":"label:cookie值","default":""},{"name":"content_type","type":"string","doc":"label:content_type值","default":""},{"name":"content_len","type":"long","doc":"label:content_len值","default":0},{"name":"doc_type","type":"string","doc":"label:文件类型","default":""},{"name":"req_body_file_path","type":"string","doc":"label:请求体转储文件地址","default":""},{"name":"res_body_file_path","type":"string","doc":"label:应答体转储文件地址","default":""}]}
-schema.ntc-collect-ftp-doc-log={"type":"record","name":"collftpdoc","fields":[{"name":"cfg_id","type":"int","doc":"label:配置ID","default":0},{"name":"found_time","type":"int","doc":"label:发现时间","default":0},{"name":"recv_time","type":"int","doc":"label:接收时间","default":0},{"name":"trans_proto","type":"string","doc":"label:传输层协议","default":""},{"name":"addr_type","type":"int","doc":"label:地址类型","default":0},{"name":"d_ip","type":"string","doc":"label:目的IP","default":""},{"name":"s_ip","type":"string","doc":"label:源IP","default":""},{"name":"d_port","type":"int","doc":"label:目的端口","default":0},{"name":"s_port","type":"int","doc":"label:源端口","default":0},{"name":"device_id","type":"string","doc":"label:设备ID","default":""},{"name":"stream_dir","type":"int","doc":"label:流类型","default":0},{"name":"cap_ip","type":"string","doc":"label:捕包机IP","default":""},{"name":"addr_list","type":"string","doc":"label:嵌套地址列表","default":""},{"name":"server_locate","type":"string","doc":"label:服务端地址定位信息","default":""},{"name":"client_locate","type":"string","doc":"label:客户端地址定位信息","default":""},{"name":"s_asn","type":"string","doc":"label:客户端ASN","default":""},{"name":"d_asn","type":"string","doc":"label:服务端ASN","default":""},{"name":"user_region","type":"string","doc":"label:用户自定义","default":""},{"name":"scene_file_id","type":"string","doc":"label:现场日志转储地址","default":""},{"name":"ftp_url","type":"string","doc":"label:ftp_url地址","default":""},{"name":"content_path","type":"string","doc":"label:FTP文件转储文件地址","default":""}]}
-schema.ntc-collect-telnet-log={"type":"record","name":"colltelnet","fields":[{"name":"cfg_id","type":"int","doc":"label:配置ID","default":0},{"name":"found_time","type":"int","doc":"label:发现时间","default":0},{"name":"recv_time","type":"int","doc":"label:接收时间","default":0},{"name":"trans_proto","type":"string","doc":"label:传输层协议","default":""},{"name":"addr_type","type":"int","doc":"label:地址类型","default":0},{"name":"d_ip","type":"string","doc":"label:目的IP","default":""},{"name":"s_ip","type":"string","doc":"label:源IP","default":""},{"name":"d_port","type":"int","doc":"label:目的端口","default":0},{"name":"s_port","type":"int","doc":"label:源端口","default":0},{"name":"device_id","type":"string","doc":"label:设备ID","default":""},{"name":"stream_dir","type":"int","doc":"label:流类型","default":0},{"name":"cap_ip","type":"string","doc":"label:捕包机IP","default":""},{"name":"addr_list","type":"string","doc":"label:嵌套地址列表","default":""},{"name":"server_locate","type":"string","doc":"label:服务端地址定位信息","default":""},{"name":"client_locate","type":"string","doc":"label:客户端地址定位信息","default":""},{"name":"s_asn","type":"string","doc":"label:客户端ASN","default":""},{"name":"d_asn","type":"string","doc":"label:服务端ASN","default":""},{"name":"user_region","type":"string","doc":"label:用户自定义","default":""},{"name":"scene_file_id","type":"string","doc":"label:现场日志转储地址","default":""},{"name":"username","type":"string","doc":"label:用户名","default":""},{"name":"password","type":"string","doc":"label:密码","default":""},{"name":"content_path","type":"string","doc":"label:telnet内容转储文件地址","default":""}]}
+schema.ntc-collect-mail-log={"type":"record","name":"collmail","fields":[{"name":"cfg_id","type":"int","doc":"label:配置ID","default":0},{"name":"found_time","type":"string","doc":"label:发现时间","default":0},{"name":"recv_time","type":"string","doc":"label:接收时间","default":0},{"name":"trans_proto","type":"string","doc":"label:传输层协议","default":""},{"name":"addr_type","type":"int","doc":"label:地址类型","default":0},{"name":"d_ip","type":"string","doc":"label:目的IP","default":""},{"name":"s_ip","type":"string","doc":"label:源IP","default":""},{"name":"d_port","type":"int","doc":"label:目的端口","default":0},{"name":"s_port","type":"int","doc":"label:源端口","default":0},{"name":"device_id","type":"string","doc":"label:设备ID","default":""},{"name":"stream_dir","type":"int","doc":"label:流类型","default":0},{"name":"cap_ip","type":"string","doc":"label:捕包机IP","default":""},{"name":"addr_list","type":"string","doc":"label:嵌套地址列表","default":""},{"name":"server_locate","type":"string","doc":"label:服务端地址定位信息","default":""},{"name":"client_locate","type":"string","doc":"label:客户端地址定位信息","default":""},{"name":"s_asn","type":"string","doc":"label:客户端ASN","default":""},{"name":"d_asn","type":"string","doc":"label:服务端ASN","default":""},{"name":"user_region","type":"string","doc":"label:用户自定义","default":""},{"name":"scene_file_id","type":"string","doc":"label:现场日志转储地址","default":""},{"name":"s_mac","type":"string","doc":"label:源MAC","default":""},{"name":"d_mac","type":"string","doc":"label:目的MAC","default":""},{"name":"mail_proto","type":"string","doc":"label:邮件协议","default":""},{"name":"mail_from","type":"string","doc":"label:邮件发件人","default":""},{"name":"mail_to","type":"string","doc":"label:邮件收件人","default":""},{"name":"mail_cc","type":"string","doc":"label:邮件抄送人","default":""},{"name":"mail_date","type":"string","doc":"label:邮件日期","default":""},{"name":"subject","type":"string","doc":"label:邮件主题","default":""},{"name":"eml_file_path","type":"string","doc":"label:邮件EML文件转储地址","default":""},{"name":"attachments_path","type":"string","doc":"label:附件转储地址列表","default":""},{"name":"bcc","type":"string","doc":"label:暗抄送","default":""},{"name":"received","type":"string","doc":"label:系统添加部分","default":""},{"name":"return_path","type":"string","doc":"label:电子邮件地址","default":""},{"name":"reply_to","type":"string","doc":"label:回复","default":""},{"name":"mail_from_cmd","type":"string","doc":"label:mail_from_cc","default":""},{"name":"rcpt_to_cmd","type":"string","doc":"label:mail_to_cc","default":""},{"name":"resent_from","type":"string","doc":"label:转发邮件发件人","default":""},{"name":"resent_to","type":"string","doc":"label:转发邮件收件人","default":""},{"name":"resent_date","type":"string","doc":"label:转发时间","default":""},{"name":"message_id","type":"string","doc":"label:","default":""}]}
+schema.ntc-collect-http-doc-log={"type":"record","name":"collhttpdoc","fields":[{"name":"cfg_id","type":"int","doc":"label:配置ID","default":0},{"name":"found_time","type":"string","doc":"label:发现时间","default":0},{"name":"recv_time","type":"string","doc":"label:接收时间","default":0},{"name":"trans_proto","type":"string","doc":"label:传输层协议","default":""},{"name":"addr_type","type":"int","doc":"label:地址类型","default":0},{"name":"d_ip","type":"string","doc":"label:目的IP","default":""},{"name":"s_ip","type":"string","doc":"label:源IP","default":""},{"name":"d_port","type":"int","doc":"label:目的端口","default":0},{"name":"s_port","type":"int","doc":"label:源端口","default":0},{"name":"device_id","type":"string","doc":"label:设备ID","default":""},{"name":"stream_dir","type":"int","doc":"label:流类型","default":0},{"name":"cap_ip","type":"string","doc":"label:捕包机IP","default":""},{"name":"addr_list","type":"string","doc":"label:嵌套地址列表","default":""},{"name":"server_locate","type":"string","doc":"label:服务端地址定位信息","default":""},{"name":"client_locate","type":"string","doc":"label:客户端地址定位信息","default":""},{"name":"s_asn","type":"string","doc":"label:客户端ASN","default":""},{"name":"d_asn","type":"string","doc":"label:服务端ASN","default":""},{"name":"user_region","type":"string","doc":"label:用户自定义","default":""},{"name":"scene_file_id","type":"string","doc":"label:现场日志转储地址","default":""},{"name":"s_mac","type":"string","doc":"label:源MAC","default":""},{"name":"d_mac","type":"string","doc":"label:目的MAC","default":""},{"name":"url","type":"string","doc":"label:HTTP_url地址","default":""},{"name":"referer","type":"string","doc":"label:HTTP访问referer","default":""},{"name":"user_agent","type":"string","doc":"label:HTTP访问user_agent","default":""},{"name":"http_seq","type":"int","doc":"label:HTTP请求会话序列号","default":0},{"name":"req_line","type":"string","doc":"label:请求行","default":""},{"name":"res_line","type":"string","doc":"label:应答行","default":""},{"name":"cookie","type":"string","doc":"label:cookie值","default":""},{"name":"content_type","type":"string","doc":"label:content_type值","default":""},{"name":"content_len","type":"long","doc":"label:content_len值","default":0},{"name":"doc_type","type":"string","doc":"label:文件类型","default":""},{"name":"req_body_file_path","type":"string","doc":"label:请求体转储文件地址","default":""},{"name":"res_body_file_path","type":"string","doc":"label:应答体转储文件地址","default":""}]}
+schema.ntc-collect-http-av-log={"type":"record","name":"collhttpav","fields":[{"name":"cfg_id","type":"int","doc":"label:配置ID","default":0},{"name":"found_time","type":"string","doc":"label:发现时间","default":0},{"name":"recv_time","type":"string","doc":"label:接收时间","default":0},{"name":"trans_proto","type":"string","doc":"label:传输层协议","default":""},{"name":"addr_type","type":"int","doc":"label:地址类型","default":0},{"name":"d_ip","type":"string","doc":"label:目的IP","default":""},{"name":"s_ip","type":"string","doc":"label:源IP","default":""},{"name":"d_port","type":"int","doc":"label:目的端口","default":0},{"name":"s_port","type":"int","doc":"label:源端口","default":0},{"name":"device_id","type":"string","doc":"label:设备ID","default":""},{"name":"stream_dir","type":"int","doc":"label:流类型","default":0},{"name":"cap_ip","type":"string","doc":"label:捕包机IP","default":""},{"name":"addr_list","type":"string","doc":"label:嵌套地址列表","default":""},{"name":"server_locate","type":"string","doc":"label:服务端地址定位信息","default":""},{"name":"client_locate","type":"string","doc":"label:客户端地址定位信息","default":""},{"name":"s_asn","type":"string","doc":"label:客户端ASN","default":""},{"name":"d_asn","type":"string","doc":"label:服务端ASN","default":""},{"name":"user_region","type":"string","doc":"label:用户自定义","default":""},{"name":"scene_file_id","type":"string","doc":"label:现场日志转储地址","default":""},{"name":"s_mac","type":"string","doc":"label:源MAC","default":""},{"name":"d_mac","type":"string","doc":"label:目的MAC","default":""},{"name":"url","type":"string","doc":"label:HTTP_url地址","default":""},{"name":"referer","type":"string","doc":"label:HTTP访问referer","default":""},{"name":"user_agent","type":"string","doc":"label:HTTP访问user_agent","default":""},{"name":"http_seq","type":"int","doc":"label:HTTP请求会话序列号","default":0},{"name":"req_line","type":"string","doc":"label:请求行","default":""},{"name":"res_line","type":"string","doc":"label:应答行","default":""},{"name":"cookie","type":"string","doc":"label:cookie值","default":""},{"name":"content_type","type":"string","doc":"label:content_type值","default":""},{"name":"content_len","type":"long","doc":"label:content_len值","default":0},{"name":"doc_type","type":"string","doc":"label:文件类型","default":""},{"name":"req_body_file_path","type":"string","doc":"label:请求体转储文件地址","default":""},{"name":"res_body_file_path","type":"string","doc":"label:应答体转储文件地址","default":""}]}
+schema.ntc-collect-ftp-doc-log={"type":"record","name":"collftpdoc","fields":[{"name":"cfg_id","type":"int","doc":"label:配置ID","default":0},{"name":"found_time","type":"string","doc":"label:发现时间","default":0},{"name":"recv_time","type":"string","doc":"label:接收时间","default":0},{"name":"trans_proto","type":"string","doc":"label:传输层协议","default":""},{"name":"addr_type","type":"int","doc":"label:地址类型","default":0},{"name":"d_ip","type":"string","doc":"label:目的IP","default":""},{"name":"s_ip","type":"string","doc":"label:源IP","default":""},{"name":"d_port","type":"int","doc":"label:目的端口","default":0},{"name":"s_port","type":"int","doc":"label:源端口","default":0},{"name":"device_id","type":"string","doc":"label:设备ID","default":""},{"name":"stream_dir","type":"int","doc":"label:流类型","default":0},{"name":"cap_ip","type":"string","doc":"label:捕包机IP","default":""},{"name":"addr_list","type":"string","doc":"label:嵌套地址列表","default":""},{"name":"server_locate","type":"string","doc":"label:服务端地址定位信息","default":""},{"name":"client_locate","type":"string","doc":"label:客户端地址定位信息","default":""},{"name":"s_asn","type":"string","doc":"label:客户端ASN","default":""},{"name":"d_asn","type":"string","doc":"label:服务端ASN","default":""},{"name":"user_region","type":"string","doc":"label:用户自定义","default":""},{"name":"scene_file_id","type":"string","doc":"label:现场日志转储地址","default":""},{"name":"s_mac","type":"string","doc":"label:源MAC","default":""},{"name":"d_mac","type":"string","doc":"label:目的MAC","default":""},{"name":"ftp_url","type":"string","doc":"label:ftp_url地址","default":""},{"name":"content_path","type":"string","doc":"label:FTP文件转储文件地址","default":""}]}
+schema.ntc-collect-telnet-log={"type":"record","name":"colltelnet","fields":[{"name":"cfg_id","type":"int","doc":"label:配置ID","default":0},{"name":"found_time","type":"string","doc":"label:发现时间","default":0},{"name":"recv_time","type":"string","doc":"label:接收时间","default":0},{"name":"trans_proto","type":"string","doc":"label:传输层协议","default":""},{"name":"addr_type","type":"int","doc":"label:地址类型","default":0},{"name":"d_ip","type":"string","doc":"label:目的IP","default":""},{"name":"s_ip","type":"string","doc":"label:源IP","default":""},{"name":"d_port","type":"int","doc":"label:目的端口","default":0},{"name":"s_port","type":"int","doc":"label:源端口","default":0},{"name":"device_id","type":"string","doc":"label:设备ID","default":""},{"name":"stream_dir","type":"int","doc":"label:流类型","default":0},{"name":"cap_ip","type":"string","doc":"label:捕包机IP","default":""},{"name":"addr_list","type":"string","doc":"label:嵌套地址列表","default":""},{"name":"server_locate","type":"string","doc":"label:服务端地址定位信息","default":""},{"name":"client_locate","type":"string","doc":"label:客户端地址定位信息","default":""},{"name":"s_asn","type":"string","doc":"label:客户端ASN","default":""},{"name":"d_asn","type":"string","doc":"label:服务端ASN","default":""},{"name":"user_region","type":"string","doc":"label:用户自定义","default":""},{"name":"scene_file_id","type":"string","doc":"label:现场日志转储地址","default":""},{"name":"s_mac","type":"string","doc":"label:源MAC","default":""},{"name":"d_mac","type":"string","doc":"label:目的MAC","default":""},{"name":"username","type":"string","doc":"label:用户名","default":""},{"name":"password","type":"string","doc":"label:密码","default":""},{"name":"content_path","type":"string","doc":"label:telnet内容转储文件地址","default":""}]}
#特殊-和前端定义相关联
schema.ntc-collect-file-log={"type":"record","name":"file_tag","fields":[{"type":"string","name":"tag_version","default":""},{"type":"int","name":"data_type","default":0},{"type":"int","name":"data_subtype","default":0},{"type":"int","name":"producer_id","default":0},{"type":"int","name":"data_source","default":0},{"type":{"type":"array","items":"int"},"name":"task_id","default":[]},{"type":"long","name":"file_id","default":0},{"type":"string","name":"file_path","default":""},{"type":"string","name":"file_name","default":""},{"type":"float","name":"file_size","default":0.0},{"type":"string","name":"md5","default":""},{"type":"string","name":"encrypted","default":""},{"type":"string","name":"timestamp","default":""},{"type":"long","name":"parent_id","default":0},{"type":"long","name":"flow_id","default":0}]}
schema.log-tag={"type":"record","name":"log_tag","fields":[{"type":"string","name":"tag_version","default":""},{"type":"int","name":"data_type","default":0},{"type":"int","name":"data_subtype","default":0},{"type":"int","name":"producer_id","default":0},{"type":"int","name":"data_source","default":0},{"type":{"type":"array","items":"int"},"name":"task_id","default":[]},{"type":"long","name":"data_id","default":0},{"type":"long","name":"flow_id","default":0},{"type":{"type":"array","items":"long"},"name":"file_id_list","default":[]},{"type":{"type":"array","items":"string"},"name":"file_path_list","default":[]}]}