更新sapp版本: sapp-4.2.37.ead1db6, 更新sapp.toml配置文件模板;

更新tcpdump_mesa版本: tcpdump_mesa-1.0.5.793bb53;
删除maat_redis_tool工具;

ansible/install_config/group_vars/rpm_version.yml

@@ -53,8 +53,8 @@ mrzcpd_rpm_version:
   mrzcpd: mrzcpd-4.4.5.cebe25a
 
 sapp_rpm_version:
-  sapp: sapp-4.2.35.b0d7518
+  sapp: sapp-4.2.37.ead1db6
-  tcpdump_mesa: tcpdump_mesa-1.0.4.4ef2936
+  tcpdump_mesa: tcpdump_mesa-1.0.5.793bb53
 
 tfe_rpm_version:
   tfe: tfe-4.5.01.91facad

ansible/roles/sapp/tasks/main.yml

@@ -4,12 +4,6 @@
     src: "{{ role_path }}/files/"
     dest: /tmp/ansible_deploy/
 
-- name: "copy maat_redis_tool to destination server"
-  copy:
-    src: "{{ role_path }}/files/maat_redis_tool"
-    dest: /usr/local/bin
-    mode: 0755
-
 - name: "install sapp and tcpdump_mesa rpms from localhost"
   yum:
     name: "{{ item.value }}"

ansible/roles/sapp/templates/sapp.toml.j2.j2

@@ -27,12 +27,7 @@ dictator_enable=1
     l2_l3_tunnel_support=1
 
 ### note, optional value is [none, vxlan]
-        overlay_mode=vxlan
+    overlay_mode=vxlan
-    stream_compare_layer_cfg_file="etc/stream_compare_layer.conf"
-    vlan_flipping_cfg_file="etc/vlan_flipping_map.conf"
-    asymmetric_presence_layer_cfg_file="etc/asymmetric_presence_layer.conf"
-    asymmetric_addr_layer_cfg_file="etc/asymmetric_addr_layer.conf"
-    prune_inject_layer_cfg_file="etc/prune_inject_layer.conf"
 
     [packet_io.feature]
 	
@@ -89,18 +84,25 @@ dictator_enable=1
     tcp_drop_pure_ack_pkt=0
     tcp_syn_option_parse_enabled=1 
     skip_not_ip_layer_over_eth=0
-    treat_vlan_as_mac_in_mac=0
-    reverse_ethernet_addr=1
 
 [DUPLICATE_PKT]
-    duplicate_pkt_distinguish=1
+[dup_pkt.traffic.original]
-    bloom_capacity=1000000
+	original_ipv4_tcp_enabled=1
-    bloom_error_rate=0.00001
+	original_ipv4_udp_enabled=0
-    bloom_timeout=10
+### note, can't distinguish between duplicate traffic and application retransmit traffic for IPv6 packets,
+###       so not support IPv6 original duplicate traffic check.
+
+[dup_pkt.traffic.inject]
+	inject_all_enabled=1
+
+[dup_pkt.parameters]
+	bloom_capacity=1000000
+	bloom_error_rate=0.00001
+	bloom_timeout=10
 	
 [STREAM]
 ### note, stream_id_base_time format is "%Y-%m-%d %H:%M:%S" 
-    stream_id_base_time="2018-08-08 08:00:00"
+    stream_id_base_time="2021-01-01 00:00:00"
     [stream.tcp]
     max=100000
     timeout=30
@@ -148,8 +150,8 @@ dictator_enable=1
         enabled=1
 ### note, if "file_truncate_open_enabled=1", file will be truncated, otherwise open the file for appending.	 
         file_truncate_enabled = 1
-        log_file_name = "fs2_sysinfo.log"
+        #log_file_name = "fs2_sysinfo.log"
-        log_conf_name = "etc/sapp_log.conf"
+        #log_conf_name = "etc/sapp_log.conf"
         [profiling.log.remote]
         enabled=1
         server_ip=127.0.0.1
@@ -183,6 +185,7 @@ dictator_enable=1
    
         [tools.pkt_dump.udp]
         command_port=9345
+		pkt_dump_ratio=30
 
         [tools.pkt_dump.storage]
 ### note, file path must be double quotation mark extension, for example,  path="/dev/shm/pkt_dump"
@@ -190,15 +193,6 @@ dictator_enable=1
 ### note, file size unit: MB
         file_size_max_per_thread=10000 
 
-### note:
-### These configurations format is complex and difficult to describe with toml grammar,
-### so, create a Independent config file to description specific information.
-[SPECIAL_CONFIG_LINK]	 
-    project_list_path="./etc/project_list.conf"
-    plugin_path="./etc/plugin.conf"
-    entrylist_path="./etc/entrylist.conf"
-    send_raw_pkt_path="./etc/send_raw_pkt.conf"
-    vxlan_sport_service_map_path="./etc/vxlan_sport_service_map.conf"
 
 [breakpad]
     disable_coredump=1
@@ -207,4 +201,26 @@ dictator_enable=1
     enable_breakpad_upload=1
 {% raw %}
     breakpad_upload_url="{{ breakpad_upload_url }}"
-{% endraw %}
+{% endraw %}
+
+### note:
+### These configurations format is complex and difficult to describe with toml grammar,
+### so, create a independent secondary config file to description specific information.
+
+[SECONDARY_CONFIG_LINK]
+    cfg_file_sapp_log="etc/sapp_log.conf"
+    cfg_file_plug_list="plug/conflist.inf"
+    cfg_file_project_list="etc/project_list.conf"
+    cfg_file_entrylist="etc/entrylist.conf"
+    cfg_file_send_raw_pkt="etc/send_raw_pkt.conf"
+    cfg_file_vxlan_sport_map="etc/vxlan_sport_service_map.conf"
+    cfg_file_inline_device="etc/gdev.conf"
+    cfg_file_necessary_plug_list="etc/necessary_plug_list.conf"
+    cfg_file_stream_compare_layer="etc/stream_compare_layer.conf"
+    cfg_file_vlan_flipping="etc/vlan_flipping_map.conf"
+    cfg_file_asymmetric_addr_layer="etc/asymmetric_addr_layer.conf"
+
+[SECONDARY_DATA_LINK]
+    data_file_sysinfo_log="sysinfo.log"
+    data_file_field_stat_log="fs2_sysinfo.log"
+    data_file_inline_keepalive_log="gdev_keeplive_status.log"