diff --git a/roles/app_global/files/app-sketch-global-1.0.2.20200907.81a5ea4-1.el7.x86_64.rpm b/roles/app_global/files/app-sketch-global-1.0.2.20200907.81a5ea4-1.el7.x86_64.rpm deleted file mode 100644 index 391b51f..0000000 Binary files a/roles/app_global/files/app-sketch-global-1.0.2.20200907.81a5ea4-1.el7.x86_64.rpm and /dev/null differ diff --git a/roles/app_global/files/app-sketch-global-1.0.2.20200918.c702d02-1.el7.x86_64.rpm b/roles/app_global/files/app-sketch-global-1.0.2.20200918.c702d02-1.el7.x86_64.rpm new file mode 100755 index 0000000..eaf7714 Binary files /dev/null and b/roles/app_global/files/app-sketch-global-1.0.2.20200918.c702d02-1.el7.x86_64.rpm differ diff --git a/roles/app_global/tasks/main.yml b/roles/app_global/tasks/main.yml index a265197..484c740 100644 --- a/roles/app_global/tasks/main.yml +++ b/roles/app_global/tasks/main.yml @@ -7,7 +7,7 @@ yum: name: - /tmp/ansible_deploy/emqx-centos7-v4.1.2.x86_64.rpm - - /tmp/ansible_deploy/app-sketch-global-1.0.2.20200907.81a5ea4-1.el7.x86_64.rpm + - /tmp/ansible_deploy/app-sketch-global-1.0.2.20200918.c702d02-1.el7.x86_64.rpm state: present - name: "template the app_sketch_global.conf" diff --git a/roles/firewall/files/capture_packet_plug-3.0.2.09f193c-2.el7.x86_64.rpm b/roles/firewall/files/capture_packet_plug-3.0.2.09f193c-2.el7.x86_64.rpm index 71e7a48..10f84bc 100644 Binary files a/roles/firewall/files/capture_packet_plug-3.0.2.09f193c-2.el7.x86_64.rpm and b/roles/firewall/files/capture_packet_plug-3.0.2.09f193c-2.el7.x86_64.rpm differ diff --git a/roles/firewall/files/clotho-debug-1.0.0.-1.el7.x86_64.rpm b/roles/firewall/files/clotho-debug-1.0.0.-1.el7.x86_64.rpm deleted file mode 100644 index 6601627..0000000 Binary files a/roles/firewall/files/clotho-debug-1.0.0.-1.el7.x86_64.rpm and /dev/null differ diff --git a/roles/firewall/files/dns-2.0.8.beb1d09-2.el7.x86_64.rpm b/roles/firewall/files/dns-2.0.8.beb1d09-2.el7.x86_64.rpm index fb616e0..51d6427 100644 Binary files a/roles/firewall/files/dns-2.0.8.beb1d09-2.el7.x86_64.rpm and b/roles/firewall/files/dns-2.0.8.beb1d09-2.el7.x86_64.rpm differ diff --git a/roles/firewall/files/ftp-1.0.6.2710506-2.el7.x86_64.rpm b/roles/firewall/files/ftp-1.0.6.2710506-2.el7.x86_64.rpm index 01cd8a8..8b54dc6 100644 Binary files a/roles/firewall/files/ftp-1.0.6.2710506-2.el7.x86_64.rpm and b/roles/firewall/files/ftp-1.0.6.2710506-2.el7.x86_64.rpm differ diff --git a/roles/firewall/files/fw_ftp_plug-3.0.0.7a867ea-2.el7.x86_64.rpm b/roles/firewall/files/fw_ftp_plug-3.0.0.7a867ea-2.el7.x86_64.rpm index cc78802..2d12a5a 100644 Binary files a/roles/firewall/files/fw_ftp_plug-3.0.0.7a867ea-2.el7.x86_64.rpm and b/roles/firewall/files/fw_ftp_plug-3.0.0.7a867ea-2.el7.x86_64.rpm differ diff --git a/roles/firewall/files/fw_http_plug-3.0.0.1ca1c65-2.el7.x86_64.rpm b/roles/firewall/files/fw_http_plug-3.0.0.1ca1c65-2.el7.x86_64.rpm index 73e73d7..b0feb9f 100644 Binary files a/roles/firewall/files/fw_http_plug-3.0.0.1ca1c65-2.el7.x86_64.rpm and b/roles/firewall/files/fw_http_plug-3.0.0.1ca1c65-2.el7.x86_64.rpm differ diff --git a/roles/firewall/files/fw_mail_plug-3.0.0.3b4e481-2.el7.x86_64.rpm b/roles/firewall/files/fw_mail_plug-3.0.0.3b4e481-2.el7.x86_64.rpm index 2e11d37..93f29da 100644 Binary files a/roles/firewall/files/fw_mail_plug-3.0.0.3b4e481-2.el7.x86_64.rpm and b/roles/firewall/files/fw_mail_plug-3.0.0.3b4e481-2.el7.x86_64.rpm differ diff --git a/roles/firewall/files/fw_ssl_plug-3.0.1.7ea9976-2.el7.x86_64.rpm b/roles/firewall/files/fw_ssl_plug-3.0.1.7ea9976-2.el7.x86_64.rpm index 79c9258..7cd27ed 100644 Binary files a/roles/firewall/files/fw_ssl_plug-3.0.1.7ea9976-2.el7.x86_64.rpm and b/roles/firewall/files/fw_ssl_plug-3.0.1.7ea9976-2.el7.x86_64.rpm differ diff --git a/roles/firewall/files/http-2.0.3.9218b4b-2.el7.x86_64.rpm b/roles/firewall/files/http-2.0.3.9218b4b-2.el7.x86_64.rpm index 231a672..baaa80b 100644 Binary files a/roles/firewall/files/http-2.0.3.9218b4b-2.el7.x86_64.rpm and b/roles/firewall/files/http-2.0.3.9218b4b-2.el7.x86_64.rpm differ diff --git a/roles/firewall/files/mail-1.0.7.9e3be05-2.el7.x86_64.rpm b/roles/firewall/files/mail-1.0.7.9e3be05-2.el7.x86_64.rpm index 1ec20c3..527fcce 100644 Binary files a/roles/firewall/files/mail-1.0.7.9e3be05-2.el7.x86_64.rpm and b/roles/firewall/files/mail-1.0.7.9e3be05-2.el7.x86_64.rpm differ diff --git a/roles/firewall/files/ssl-1.0.8.0068bd9-2.el7.x86_64.rpm b/roles/firewall/files/ssl-1.0.8.0068bd9-2.el7.x86_64.rpm index 066fede..15d1d22 100644 Binary files a/roles/firewall/files/ssl-1.0.8.0068bd9-2.el7.x86_64.rpm and b/roles/firewall/files/ssl-1.0.8.0068bd9-2.el7.x86_64.rpm differ diff --git a/roles/firewall/files/tsg_conn_record-1.0.2.2afb19a-2.el7.x86_64.rpm b/roles/firewall/files/tsg_conn_record-1.0.2.2afb19a-2.el7.x86_64.rpm deleted file mode 100644 index 1251601..0000000 Binary files a/roles/firewall/files/tsg_conn_record-1.0.2.2afb19a-2.el7.x86_64.rpm and /dev/null differ diff --git a/roles/firewall/tasks/main.yml b/roles/firewall/tasks/main.yml index 908acb1..842494a 100644 --- a/roles/firewall/tasks/main.yml +++ b/roles/firewall/tasks/main.yml @@ -12,7 +12,6 @@ vars: fw_packages: - /tmp/ansible_deploy/capture_packet_plug-3.0.2.09f193c-2.el7.x86_64.rpm - - /tmp/ansible_deploy/clotho-debug-1.0.0.-1.el7.x86_64.rpm - /tmp/ansible_deploy/dns-2.0.8.beb1d09-2.el7.x86_64.rpm - /tmp/ansible_deploy/ftp-1.0.6.2710506-2.el7.x86_64.rpm - /tmp/ansible_deploy/fw_dns_plug-3.0.1.453c533-2.el7.x86_64.rpm diff --git a/roles/framework/files/libMESA_handle_logger-1.0.9.304259e-2.el7.x86_64.rpm b/roles/framework/files/libMESA_handle_logger-1.0.9.304259e-2.el7.x86_64.rpm deleted file mode 100644 index 3b6cdff..0000000 Binary files a/roles/framework/files/libMESA_handle_logger-1.0.9.304259e-2.el7.x86_64.rpm and /dev/null differ diff --git a/roles/framework/files/libMESA_handle_logger-2.0.4.1502550-2.el7.x86_64.rpm b/roles/framework/files/libMESA_handle_logger-2.0.4.1502550-2.el7.x86_64.rpm new file mode 100644 index 0000000..440f181 Binary files /dev/null and b/roles/framework/files/libMESA_handle_logger-2.0.4.1502550-2.el7.x86_64.rpm differ diff --git a/roles/framework/files/libmaatframe-3.0.7.34de556-2.el7.x86_64.rpm b/roles/framework/files/libmaatframe-3.0.7.34de556-2.el7.x86_64.rpm index 6b5dc73..11dea6e 100644 Binary files a/roles/framework/files/libmaatframe-3.0.7.34de556-2.el7.x86_64.rpm and b/roles/framework/files/libmaatframe-3.0.7.34de556-2.el7.x86_64.rpm differ diff --git a/roles/framework/tasks/main.yml b/roles/framework/tasks/main.yml index feb4eef..27e690e 100644 --- a/roles/framework/tasks/main.yml +++ b/roles/framework/tasks/main.yml @@ -12,7 +12,7 @@ packages: - /tmp/ansible_deploy/libMESA_field_stat-1.0.1.852c2df-1.el7.x86_64.rpm - /tmp/ansible_deploy/libMESA_field_stat2-2.9.1.d80b5fb-2.el7.x86_64.rpm - - /tmp/ansible_deploy/libMESA_handle_logger-1.0.9.304259e-2.el7.x86_64.rpm + - /tmp/ansible_deploy/libMESA_handle_logger-2.0.4.1502550-2.el7.x86_64.rpm - /tmp/ansible_deploy/libMESA_htable-3.10.11.6275308-1.el7.x86_64.rpm - /tmp/ansible_deploy/libMESA_prof_load-1.0.5.bf755de-1.el7.x86_64.rpm - /tmp/ansible_deploy/libWiredLB-2.0.3.c7d131b-1.el7.x86_64.rpm diff --git a/roles/sapp/templates/project_list.conf.j2 b/roles/sapp/templates/project_list.conf.j2 index e7b42ff..ce5e9a3 100644 --- a/roles/sapp/templates/project_list.conf.j2 +++ b/roles/sapp/templates/project_list.conf.j2 @@ -4,4 +4,17 @@ tcp_deduce_flow_stat struct POLICY_PRIORITY struct ESTABLISH_LATENCY long MAIL_IDENTIFY int - +TSG_MASTER_INTERNAL_LABEL struct +APP_ID_LABEL struct +BASIC_PROTO_LABEL struct +USER_DEFINED_ATTRIBUTE struct +SKETCH_TRANS_LAYER_CTX_LABEL struct +SKETCH_PROTO_CTX_LABEL struct +common_link_info_c2s struct +common_link_info_s2c struct +common_link_info struct +JA3_FINGERPRINT_LABEL struct +DKPT_PRO_V2 struct +DPKT_PROJECT_V2 struct +PPROJECT_PRO_V2 struct +DPKT_BHSTAT_PROJECT struct diff --git a/roles/tsg_app/tasks/main.yml b/roles/tsg_app/tasks/main.yml index 2855b53..72ae845 100644 --- a/roles/tsg_app/tasks/main.yml +++ b/roles/tsg_app/tasks/main.yml @@ -17,6 +17,12 @@ - /tmp/ansible_deploy/app_sketch_local-1.0.4.0edaf58-2.el7.x86_64.rpm when: tsg_app_enable == 1 +- name: "mkdir appconf" + file: + path: /home/mesasoft/sapp_run/appconf + state: directory + when: tsg_app_enable == 1 + - name: "Template the appconf/main.conf" template: src: "{{ role_path }}/templates/main.conf.j2" diff --git a/uninstall/roles/package_list/20.09.yml b/uninstall/roles/package_list/20.09.yml index 40a8d4e..7a9f351 100644 --- a/uninstall/roles/package_list/20.09.yml +++ b/uninstall/roles/package_list/20.09.yml @@ -21,7 +21,7 @@ libdocument: libdocumentanalyze-2.0.4.efdfc29-1.x86_64 libmaatframe: libmaatframe-3.0.7.34de556-1.x86_64 libMESA_field_stat: libMESA_field_stat-1.0.1.852c2df-1.x86_64 libMESA_field_stat2: libMESA_field_stat2-2.9.1.d80b5fb-1.x86_64 -libMESA_handle_logger: libMESA_handle_logger-1.0.9.304259e-1.x86_64 +libMESA_handle_logger: libMESA_handle_logger-2.0.4.1502550-1.x86_64 libMESA_htable: libMESA_htable-3.10.11.6275308-1.x86_64 libMESA_prof_load: libMESA_prof_load-1.0.5.bf755de-1.x86_64 librdkafka: librdkafka-0.11.4-1.el7.x86_64 diff --git a/uninstall/roles/uninstall_server/tasks/main.yml b/uninstall/roles/uninstall_server/tasks/main.yml index 46dc14d..7251a08 100644 --- a/uninstall/roles/uninstall_server/tasks/main.yml +++ b/uninstall/roles/uninstall_server/tasks/main.yml @@ -256,7 +256,6 @@ - "{{ fw_http }}" - "{{ fw_ssl }}" - "{{ fw_mail }}" - - "{{ tsg_conn_record }}" state: absent when: uninstall.firewall == 1 @@ -264,6 +263,7 @@ yum: name: - "{{ fw_quic }}" + - "{{ tsg_conn_record }}" - "{{ tsg_conn_sketch }}" state: absent when: uninstall.firewall == 1