feature:新增部署packet_dump的操作

bugfix:修改部署过程出现配置文件路径错误和变量缺失问题
同步tsg-os配置文件
2021-07-22 17:31:28 +08:00 · 2021-07-22 17:17:28 +08:00 · 2021-07-21 11:40:30 +08:00 · 2021-07-21 10:21:07 +08:00 · 2021-07-06 15:09:02 +08:00 · 2021-07-06 14:48:40 +08:00
193 changed files with 985 additions and 3248 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +0,0 @@
-.vscode
-*.retry
--- a/adc_inline_device_access/group_vars/all.yml
+++ b/adc_inline_device_access/group_vars/all.yml
@@ -1,74 +0,0 @@
-maat_redis_server:
-    address: "192.168.41.206"
-    port: 7002
-    db: 0
-
-dynamic_maat_redis_server:
-    address: "192.168.41.206"
-    port: 7002
-    db: 1
-
-cert_store_server:
-    address: "192.168.100.1"
-    port: 9991
-
-log_kafkabrokers:
-    address: "192.168.41.204:9092"
-
-log_minio:
-    address: "192.168.41.206"
-    port: 9090
-
-fs_remote:
-    switch: 1
-    address: "192.168.100.1"
-    port: 58125
-
-nic_transparent_mode:
-    enable: 0
-
-run_as_tun_mode: 0
-package_source: "local"
-
-install_dns_debug: "yes"
-install_ftp_debug: "yes"
-install_http_debug: "yes"
-install_mail_debug: "yes"
-install_ssl_debug: "yes"
-install_fw_dns_plug_debug: "yes"
-install_fw_ftp_plug_debug: "yes"
-install_fw_http_plug_debug: "yes"
-install_fw_mail_plug_debug: "yes"
-install_tsg_master: "yes"
-
-kni:
-    global:
-        log_level: 10
-        tfe_node_count: 3
-    watch_dog:
-        switch: 1
-    maat:
-        readconf_mode: 2
-    send_logger:
-        switch: 1
-    tfe_nodes:
-        - tfe0:
-              enabled: 1
-        - tfe1:
-              enabled: 1
-        - tfe2:
-              enabled: 1
-tfe:
-    nr_threads: 16
-    mc_cache_eth: ens1.100
-    keykeeper:
-        mode: "normal"
-        no_cache: 0
-
-mrzcpd:
-    iocore: 47
-
-mrtunnat:
-    lcore_id: 46
-
-
--- a/adc_inline_device_access/group_vars/blade-00.yml
+++ b/adc_inline_device_access/group_vars/blade-00.yml
@@ -1,15 +0,0 @@
-nic_mgr:
-    name: enp6s0
-nic_data_incoming:
-    name: ens1f4
-    ip: 192.168.1.30
-    mask: 255.255.255.252
-nic_inner_ctrl:
-    name: ens1.100
-nic_to_tfe:
-    tfe0:
-        name: ens1f5
-    tfe1:
-        name: ens1f6
-    tfe2:
-        name: ens1f7
--- a/adc_inline_device_access/group_vars/blade-01.yml
+++ b/adc_inline_device_access/group_vars/blade-01.yml
@@ -1,11 +0,0 @@
-nic_mgr:
-    name: enp6s0
-nic_data_incoming:
-    name: ens1f1
-    mac: AA:BB:CC:DD:EE:FF
-    address: 127.0.0.1
-nic_inner_ctrl:
-    name: ens1.100
-nic_traffic_mirror:
-    name: ens1f2
-    use_mrzcpd: 1
--- a/adc_inline_device_access/group_vars/blade-02.yml
+++ b/adc_inline_device_access/group_vars/blade-02.yml
@@ -1,10 +0,0 @@
-nic_mgr:
-    name: enp6s0
-nic_data_incoming:
-    name: ens8f1
-    mac: AA:BB:CC:DD:EE:FF
-nic_inner_ctrl:
-    name: ens8.100
-nic_traffic_mirror:
-    name: ens8f2
-    use_mrzcpd: 1
--- a/adc_inline_device_access/group_vars/blade-03.yml
+++ b/adc_inline_device_access/group_vars/blade-03.yml
@@ -1,10 +0,0 @@
-nic_mgr:
-    name: enp6s0
-nic_data_incoming:
-    name: ens8f1
-    mac: AA:BB:CC:DD:EE:FF
-nic_inner_ctrl:
-    name: ens8.100
-nic_traffic_mirror:
-    name: ens8f2
-    use_mrzcpd: 1
--- a/adc_inline_device_access/hosts
+++ b/adc_inline_device_access/hosts
@@ -1,24 +0,0 @@
-[all:vars]
-ansible_user=root
-package_source=local
-
-[blade-mxn]
-192.168.40.170
-
-[blade-00]
-192.168.40.166
-
-[blade-01]
-192.168.40.167
-
-[blade-02]
-192.168.40.168
-
-[blade-03]
-192.168.40.169
-
-[Functional_Host:children]
-blade-00
-blade-01
-blade-02
-blade-03
--- a/adc_tera_access/group_vars/all.yml
+++ b/adc_tera_access/group_vars/all.yml
@@ -1,73 +0,0 @@
-maat_redis_server:
-    address: "192.168.41.206"
-    port: 7002
-    db: 0
-
-dynamic_maat_redis_server:
-    address: "192.168.41.206"
-    port: 7002
-    db: 1
-
-cert_store_server:
-    address: "192.168.100.1"
-    port: 9991
-
-log_kafkabrokers:
-    address: "192.168.41.204:9092"
-
-log_minio:
-    address: "192.168.41.206"
-    port: 9090
-
-fs_remote:
-    switch: 1
-    address: "192.168.100.1"
-    port: 58125
-
-nic_transparent_mode:
-    enable: 0
-
-run_as_tun_mode: 0
-package_source: "local"
-
-install_dns_debug: "yes"
-install_ftp_debug: "yes"
-install_http_debug: "yes"
-install_mail_debug: "yes"
-install_ssl_debug: "yes"
-install_fw_dns_plug_debug: "yes"
-install_fw_ftp_plug_debug: "yes"
-install_fw_http_plug_debug: "yes"
-install_fw_mail_plug_debug: "yes"
-install_tsg_master: "yes"
-
-kni:
-    global:
-        log_level: 10
-        tfe_node_count: 3
-    watch_dog:
-        switch: 1
-    maat:
-        readconf_mode: 2
-    send_logger:
-        switch: 1
-    tfe_nodes:
-        - tfe0:
-              enabled: 1
-        - tfe1:
-              enabled: 1
-        - tfe2:
-              enabled: 1
-tfe:
-    nr_threads: 16
-    keykeeper:
-        mode: "normal"
-        no_cache: 0
-
-mrzcpd:
-    iocore: 47
-
-mrtunnat:
-    lcore_id: 46
-
-
--- a/adc_tera_access/group_vars/blade-00.yml
+++ b/adc_tera_access/group_vars/blade-00.yml
@@ -1,14 +0,0 @@
-nic_mgr:
-    name: enp6s0
-nic_data_incoming:
-    name: ens1f4
-    address: 127.0.0.1
-nic_inner_ctrl:
-    name: ens1.100
-nic_to_tfe:
-    tfe0:
-        name: ens1f5
-    tfe1:
-        name: ens1f6
-    tfe2:
-        name: ens1f7
--- a/adc_tera_access/group_vars/blade-01.yml
+++ b/adc_tera_access/group_vars/blade-01.yml
@@ -1,11 +0,0 @@
-nic_mgr:
-    name: enp6s0
-nic_data_incoming:
-    name: ens1f1
-    mac: AA:BB:CC:DD:EE:FF
-    address: 127.0.0.1
-nic_inner_ctrl:
-    name: ens1.100
-nic_traffic_mirror:
-    name: ens1f2
-    use_mrzcpd: 1
--- a/adc_tera_access/group_vars/blade-02.yml
+++ b/adc_tera_access/group_vars/blade-02.yml
@@ -1,10 +0,0 @@
-nic_mgr:
-    name: enp6s0
-nic_data_incoming:
-    name: ens8f1
-    mac: AA:BB:CC:DD:EE:FF
-nic_inner_ctrl:
-    name: ens8.100
-nic_traffic_mirror:
-    name: ens8f2
-    use_mrzcpd: 1
--- a/adc_tera_access/group_vars/blade-03.yml
+++ b/adc_tera_access/group_vars/blade-03.yml
@@ -1,10 +0,0 @@
-nic_mgr:
-    name: enp6s0
-nic_data_incoming:
-    name: ens8f1
-    mac: AA:BB:CC:DD:EE:FF
-nic_inner_ctrl:
-    name: ens8.100
-nic_traffic_mirror:
-    name: ens8f2
-    use_mrzcpd: 1
--- a/adc_tera_access/hosts
+++ b/adc_tera_access/hosts
@@ -1,30 +0,0 @@
-[all:vars]
-ansible_user=root
-package_source=local
-
-[blade-mxn]
-192.168.40.170
-
-[blade-00]
-192.168.40.166
-
-[blade-01]
-192.168.40.167
-
-[blade-02]
-192.168.40.168
-
-[blade-03]
-192.168.40.169
-
-
-[Functional_Host:children]
-blade-00
-blade-01
-blade-02
-blade-03
-
-[Slave_Host:children]
-blade-01
-blade-02
-blade-03
--- a/clear_redis_cache.yml
+++ b/clear_redis_cache.yml
@@ -1,6 +0,0 @@
- hosts: blade-00
-  tasks:
-  - name: "killall certstore"
-    command: "killall certstore"
-  - name: "clear redis cache"
-    command: "redis-cli flushdb"
--- a/deploy.yml
+++ b/deploy.yml
@@ -1,49 +0,0 @@
- hosts: Functional_Host
-  roles:
-    - framework
-    - kernel-ml
-
- hosts: blade-00
-  roles:
-    - tsg-env-mcn0
-    - mrzcpd
-    - sapp
-    - kni
-    - firewall
-    - certstore
-    - cert-redis
-
- hosts: blade-01
-  roles:
-    - tsg-env-mcn1
-    - mrzcpd
-    - tfe
-
- hosts: blade-02
-  roles:
-    - tsg-env-mcn2
-    - mrzcpd
-    - tfe
-
- hosts: blade-03
-  roles:
-    - tsg-env-mcn3
-    - mrzcpd
-    - tfe
-
- hosts: blade-mxn
-  roles:
-    - tsg-env-mxn
-
- hosts: pc-as-tun-mode
-  roles:
-    - kernel-ml
-    - framework
-    - mrzcpd
-    - tsg-env-tun-mode
-    - sapp
-    - kni
-    - firewall
-    - certstore
-    - cert-redis
-    - tfe
--- a/install_config/group_vars/mirror_traffic.yml
+++ b/install_config/group_vars/mirror_traffic.yml
@@ -0,0 +1,93 @@
+########################################
+#Server Basic Config
+nic_mgr:
+  name: eth0
+
+#########################################
+#IP Config
+maat_redis_server:
+  address: "#Bifang IP#"
+  port: 7002
+  port_num: 1
+  db: 0
+
+dynamic_maat_redis_server:
+  address: "#Bifang IP#"
+  port: 7002
+  port_num: 1
+  db: 1
+
+
+log_kafkabrokers:
+  address: ['1.1.1.1:9092','2.2.2.2:9092']
+
+
+#log_minio:
+#  address: "10.9.62.253"
+#  port: 9090
+
+#########################################
+#Log Level Config
+#日志等级 10:DEBUG 20:INFO 30:FATAL
+fw_voip_log_level: 10
+fw_ftp_log_level: 10
+fw_mail_log_level: 10
+fw_http_log_level: 10
+fw_dns_log_level: 10
+fw_quic_log_level: 10
+app_control_log_level: 10
+capture_packet_log_level: 10
+tsg_log_level: 10
+tsg_master_log_level: 10
+kni_log_level: 10
+
+#日志等级 DEBUG INFO FATAL
+tfe_log_level: FATAL
+tfe_http_log_level: FATAL
+pangu_log_level: FATAL
+doh_log_level: FATAL
+
+certstore_log_level: 10
+packet_dump_log_level: 10
+
+#########################################
+#Sapp Performance Config
+#如果tsg_access_type=0，sapp跑在pcap模式，则以下配置可忽略
+sapp:
+  worker_threads: 23
+  send_only_threads_max: 1
+  bind_mask: 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24
+  inbound_route_dir: 1
+  prometheus_enable: 1
+  prometheus_port: 9273
+  prometheus_url_path: "/metrics"
+
+#########################################
+#Marsio Config
+mrzcpd:
+  iocore: 39
+
+
+#########################################
+#新增配置项,均为默认值不用改
+breakpad_upload_url: http://127.0.0.1:9000/api/2/minidump/?sentry_key=3556bac347c74585a994eb6823faf5c6
+
+data_center: Beijing
+tsg_master_entrance_id: 0
+
+
+firewall:
+  hos_serverip: "192.168.40.223"
+  hos_serverport: 9098
+  hos_accesskeyid: "default"
+  hos_secretkey: "default"
+  hos_poolsize: 100
+  hos_thread_sum: 32
+  hos_cache_size: 102400
+  hos_fs2_serverip: "127.0.0.1"
+  hos_fs2_serverport: 10086
+  APP_SKETCH_BROKER_IP: "192.168.40.161"
+  APP_SKETCH_BROKER_PORT: 1883
+
+
+data_incoming_nic_list: ['eth0', 'eth1']
--- a/install_config/group_vars/packet_dump_server.yml
+++ b/install_config/group_vars/packet_dump_server.yml
@@ -0,0 +1,22 @@
+nic_mgr:
+  name: eth0
+
+log_kafkabrokers:
+  address: ['1.1.1.1:9092','2.2.2.2:9092']
+
+packet_dump_log_level: 10
+
+breakpad_upload_url: http://127.0.0.1:9000/api/2/minidump/?sentry_key=3556bac347c74585a994eb6823faf5c6
+
+dump_rtp_pcap:
+  aws_access_key_id: "default"
+  aws_secret_access_key: "default"
+  aws_session_token: "c21f969b5f03d33d43e04f8f136e7682"
+  consume_bootstrap_servers: ['192.168.44.14:9092']
+  endpoint_url: "http://192.168.44.67:9098/hos/"
+  produce_bootstrap_servers: "192.168.44.14:9092"
+  queue_size: 5000000
+  coroutine_max_num: 200
+  coroutine_num: 100
+  qfull_mode: 0
+  qfull_interval: 5
--- a/install_config/hosts
+++ b/install_config/hosts
@@ -0,0 +1,3 @@
+[mirror_traffic]
+[packet_dump_server]
+
--- a/mirror_traffic.yml
+++ b/mirror_traffic.yml
@@ -0,0 +1,12 @@
+- hosts: mirror_traffic
+  remote_user: root
+  vars_files:
+    - install_config/group_vars/mirror_traffic.yml
+  roles:
+    - {role: framework, tags: framework}
+    - {role: kernel-ml, tags: kernel-ml}
+    - {role: mrzcpd, tags: mrzcpd}
+    - {role: sapp, tags: sapp}
+    - {role: tsg_master, tags: tsg_master}
+    - {role: firewall, tags: firewall}
+    - {role: telegraf_statistic, tags: telegraf_statistic}
--- a/packet_dump_server.yml
+++ b/packet_dump_server.yml
@@ -0,0 +1,8 @@
+- hosts: packet_dump_server
+  remote_user: root
+  vars_files:
+    - install_config/group_vars/packet_dump_server.yml
+  roles:
+    - {role: framework, tags: framework}
+    - {role: packet_dump, tags: packet_dump}
+    - {role: dump_rtp_pcap, tags: dump_rtp_pcap}
--- a/pc_double_arm_access/group_vars/all.yml
+++ b/pc_double_arm_access/group_vars/all.yml
@@ -1,88 +0,0 @@
-maat_redis_server:
-  address: "192.168.40.168"
-  port: 7002
-  db: 0
-
-dynamic_maat_redis_server:
-  address: "192.168.40.168"
-  port: 7002
-  db: 0
-
-cert_store_server:
-  address: "127.0.0.1"
-  port: 9991
-
-log_kafkabrokers:
-  address: "192.168.40.169:9092"
-
-log_minio:
-  address: "192.168.40.168;"
-  port: 9090
-
-fs_remote:
-  switch: 1
-  address: "127.0.0.1"
-  port: 8125
-  
-install_dns_debug: "yes"
-install_ftp_debug: "yes"
-install_http_debug: "yes"
-install_mail_debug: "yes"
-install_ssl_debug: "yes"
-install_fw_dns_plug_debug: "yes"
-install_fw_ftp_plug_debug: "yes"
-install_fw_http_plug_debug: "yes"
-install_fw_mail_plug_debug: "yes"
-install_tsg_master: "yes"
-
-sapp:
-  worker_threads: 16
-
-kni:
-  global:
-    log_level: 30
-    tfe_node_count: 3
-  watch_dog:
-    switch: 1
-  maat:
-    readconf_mode: 2
-  send_logger:
-    switch: 1
-  tfe_nodes:
-    - tfe0:
-        enabled: 1
-    - tfe1:
-        enabled: 1
-    - tfe2:
-        enabled: 1
-tfe:
-  nr_threads: 32
-  mc_cache_eth: lo 
-  keykeeper:
-    mode: "normal"
-    no_cache: 0
-
-mrzcpd:
-  iocore: 39
-
-mrtunnat:
-  lcore_id: 38
-
-nic_mgr:
-  name: eth0
-nic_data_incoming:
-  name: tun_kni
-  address: 127.0.0.1
-nic_inner_ctrl:
-  name: eth0.100
-nic_traffic_mirror:
-  name: lo
-  use_mrzcpd: 0
-
-nic_transparent_mode:
-  enable: 1
-  mode: pcap
-  internel_interface: "eth2"
-  external_interface: "eth3"
-
-run_as_tun_mode: 1
--- a/pc_double_arm_access/hosts
+++ b/pc_double_arm_access/hosts
@@ -1,6 +0,0 @@
-[all:vars]
-ansible_user=root
-package_source=local
-
-[pc-as-tun-mode]
-192.168.40.138
--- a/pulp-install.yml
+++ b/pulp-install.yml
@@ -1,3 +0,0 @@
- hosts: blade-0*
-  roles:
-    - pulp-consumer
--- a/roles/cert-redis/files/cert-redis/6379/6379.conf
+++ b/roles/cert-redis/files/cert-redis/6379/6379.conf
--- a/roles/cert-redis/files/cert-redis/6379/dump.rdb
+++ b/roles/cert-redis/files/cert-redis/6379/dump.rdb
--- a/roles/cert-redis/files/cert-redis/cert-redis.service
+++ b/roles/cert-redis/files/cert-redis/cert-redis.service
@@ -1,16 +0,0 @@
-[Unit]
-Description=Redis persistent key-value database
-After=network.target
-After=network-online.target
-Wants=network-online.target
-
-[Service]
-ExecStart=/usr/local/bin/start-cert-redis
-ExecStop=killall redis-server
-Type=forking
-RuntimeDirectory=redis
-RuntimeDirectoryMode=0755
-
-[Install]
-WantedBy=multi-user.target
-
--- a/roles/cert-redis/files/cert-redis/install.sh
+++ b/roles/cert-redis/files/cert-redis/install.sh
@@ -1,6 +0,0 @@
-#!/bin/bash
-#
-cp -rf redis-server /usr/local/bin/
-cp -rf redis-cli /usr/local/bin
-cp -rf cert-redis.service /usr/lib/systemd/system/
-cp -rf start-cert-redis /usr/local/bin
--- a/roles/cert-redis/files/cert-redis/redis-cli
+++ b/roles/cert-redis/files/cert-redis/redis-cli
--- a/roles/cert-redis/files/cert-redis/redis-server
+++ b/roles/cert-redis/files/cert-redis/redis-server
--- a/roles/cert-redis/files/cert-redis/start-cert-redis
+++ b/roles/cert-redis/files/cert-redis/start-cert-redis
@@ -1,4 +0,0 @@
-#!/bin/bash
-#
-
-/usr/local/bin/redis-server /home/tsg/cert-redis/6379/6379.conf
--- a/roles/cert-redis/tasks/main.yml
+++ b/roles/cert-redis/tasks/main.yml
@@ -1,15 +0,0 @@
- name: "copy cert-redis to destination server"
-  copy:
-    src: "{{ role_path }}/files/"
-    dest: /home/tsg
-    mode: 0755
-
- name: "install cert-redis"
-  shell: cd /home/tsg/cert-redis;sh install.sh
-
- name: "start cert-redis"
-  systemd:
-    name: cert-redis.service
-    state: started
-    daemon_reload: yes
-    enabled: yes
--- a/roles/certstore/files/certstore-base-online-20200119.tar.gz
+++ b/roles/certstore/files/certstore-base-online-20200119.tar.gz
--- a/roles/certstore/files/jemalloc-3.6.0-1.el7.x86_64.rpm
+++ b/roles/certstore/files/jemalloc-3.6.0-1.el7.x86_64.rpm
--- a/roles/certstore/tasks/main.yml
+++ b/roles/certstore/tasks/main.yml
@@ -1,26 +0,0 @@
---
- name: "copy redis and dependency to destination"
-  synchronize:
-    src: "{{ role_path }}/files/"
-    dest: "/tmp/ansible_deploy/"
-
- name: Ensures /home/tsg exists
-  file: path=/home/tsg state=directory
-  tags: mkdir
-
- name: install certstore
-  unarchive:
-    src: "{{ role_path }}/files/certstore-base-online-20200119.tar.gz"
-    dest: /home/tsg
-
- name: template certstore configure file
-  template:
-    src: "{{ role_path }}/templates/cert_store.ini.j2"
-    dest: /home/tsg/certstore-base/conf/cert_store.ini
-
- name: bootup certstore
-  blockinfile:
-    marker: "## {mark} bootstrap certstore"
-    path: /etc/rc.d/rc.local
-    block: |
-      cd /home/tsg/certstore-base; ./r2_certstore
--- a/roles/certstore/templates/cert_store.ini.j2
+++ b/roles/certstore/templates/cert_store.ini.j2
@@ -1,45 +0,0 @@
-[SYSTEM]
-#1:print on screen, 0:don't
-DEBUG_SWITCH = 1
-#10:DEBUG, 20:INFO, 30:FATAL
-RUN_LOG_LEVEL = 30
-RUN_LOG_PATH = ./logs
-[CONFIG]
-#Number of running threads
-thread-nu = 4
-#1 rsync, 0 sync
-mode=1
-#Local default root certificate is valid for 30 days by default
-expire_after = 30
-#Local default root certificate path
-local_debug = 1
-ca_path = ./cert/tango-ca-v3-trust-ca.pem
-untrusted_ca_path = ./cert/mesalab-ca-untrust.pem
-[NTC_MAAT]
-#Configure the load mode,
-#0: using the configuration distribution network
-#1: using local json
-#2: using Redis reads
-maat_json_switch=2
-#When the loading mode is sent to the network, set the scanning configuration modification interval (s).
-effective_interval=1
-#Specify the location of the configuration library table file
-table_info=./conf/table_info.conf
-#Incremental profile path
-inc_cfg_dir=./rule/inc/index
-#Full profile path
-full_cfg_dir=./rule/full/index
-#Json file path when json schema is used
-pxy_obj_keyring=./conf/pxy_obj_keyring.json
-[LIBEVENT]
-#Local monitor port number, default is 9991
-port = 9991
-[CERTSTORE_REDIS]
-#The Redis server IP address and port number where the certificate is stored locally
-ip = 127.0.0.1
-port = 6379
-[MAAT_REDIS]
-#Maat monitors the Redsi server IP address and port number
-ip = {{ maat_redis_server.address }}
-port = {{ maat_redis_server.port }}
-dbindex =  {{ maat_redis_server.db }}
--- a/roles/dump_rtp_pcap/files/dump_rtp_pcap-1.0.2.445da24-2.el7.x86_64.rpm
+++ b/roles/dump_rtp_pcap/files/dump_rtp_pcap-1.0.2.445da24-2.el7.x86_64.rpm
--- a/roles/dump_rtp_pcap/tasks/main.yml
+++ b/roles/dump_rtp_pcap/tasks/main.yml
@@ -0,0 +1,22 @@
+- name: "dump-rtp-pcap: copy dump-rtp-pcap rpm package to destination"
+  copy:
+    src: "{{ role_path }}/files/"
+    dest: /tmp/ansible_deploy/
+
+- name: "dump-rtp-pcap: install dump-rtp-pcap rpm from localhost"
+  yum:
+    name:
+      - /tmp/ansible_deploy/dump_rtp_pcap-1.0.2.445da24-2.el7.x86_64.rpm
+    state: present
+
+- name: "dump-rtp-pcap: Template the dump_rtp_pcap.json"
+  template:
+    src: "{{ role_path }}/templates/dump_rtp_pcap.json.j2"
+    dest: /home/mesasoft/dump_rtp_pcap/dump_rtp_pcap.json
+  tags: template
+ 
+- name: "start dump_rtp_pcap"
+  systemd:
+    name: dump_rtp_pcap.service
+    enabled: yes
+    daemon_reload: yes
--- a/roles/dump_rtp_pcap/templates/dump_rtp_pcap.json.j2
+++ b/roles/dump_rtp_pcap/templates/dump_rtp_pcap.json.j2
@@ -0,0 +1,23 @@
+{
+    "endian":"little",
+    "aws_access_key_id": "{{ dump_rtp_pcap.aws_access_key_id }}",
+    "aws_secret_access_key": "{{ dump_rtp_pcap.aws_secret_access_key }}",
+    "aws_session_token": "{{ dump_rtp_pcap.aws_session_token }}",
+    "bucket_name": "rtp-log",
+    "consume_auto_offset_reset":"latest",
+    "consume_bootstrap_servers": ["{{ dump_rtp_pcap.consume_bootstrap_servers | join("\",\"") }}"],
+    "consume_topic": "INTERNAL-RTP-LOG",
+    "endpoint_url": "{{ dump_rtp_pcap.endpoint_url }}",
+    "file_prefix":"rtp_log",
+    "group_id": "rtp-log-1",
+    "produce_bootstrap_servers": "{{ dump_rtp_pcap.produce_bootstrap_servers }}",
+    "produce_topic": "VOIP-RECORD-LOG",
+    "region_name": "us-east-1",
+    "save_speed_emit_interval":30,
+    "upload_speed_emit_interval":30,
+    "queue_size":{{ dump_rtp_pcap.queue_size }},
+    "coroutine_max_num":{{ dump_rtp_pcap.coroutine_max_num }},
+    "coroutine_num":{{ dump_rtp_pcap.coroutine_num }},
+    "qfull_mode":{{ dump_rtp_pcap.qfull_mode }},
+    "qfull_interval":{{ dump_rtp_pcap.qfull_interval }}
+}
--- a/roles/firewall/files/app_proto_engine-devel-2.0.4.95a943e-2.el7.x86_64.rpm
+++ b/roles/firewall/files/app_proto_engine-devel-2.0.4.95a943e-2.el7.x86_64.rpm
--- a/roles/firewall/files/app_proto_identify-2.0.1.dd683eb-2.el7.x86_64.rpm
+++ b/roles/firewall/files/app_proto_identify-2.0.1.dd683eb-2.el7.x86_64.rpm
--- a/roles/firewall/files/capture_packet_plug-3.0.6.a2db4a4-2.el7.x86_64.rpm
+++ b/roles/firewall/files/capture_packet_plug-3.0.6.a2db4a4-2.el7.x86_64.rpm
--- a/roles/firewall/files/conn_telemetry-1.0.2.8d6da43-2.el7.x86_64.rpm
+++ b/roles/firewall/files/conn_telemetry-1.0.2.8d6da43-2.el7.x86_64.rpm
--- a/roles/firewall/files/dns-2.0.12.e083fec-2.el7.x86_64.rpm
+++ b/roles/firewall/files/dns-2.0.12.e083fec-2.el7.x86_64.rpm
--- a/roles/firewall/files/dns-debug-1.0.0.-1.el7.x86_64.rpm
+++ b/roles/firewall/files/dns-debug-1.0.0.-1.el7.x86_64.rpm
--- a/roles/firewall/files/ftp-1.0.8.13d5fda-2.el7.x86_64.rpm
+++ b/roles/firewall/files/ftp-1.0.8.13d5fda-2.el7.x86_64.rpm
--- a/roles/firewall/files/ftp-debug-1.0.0.-1.el7.x86_64.rpm
+++ b/roles/firewall/files/ftp-debug-1.0.0.-1.el7.x86_64.rpm
--- a/roles/firewall/files/fw_dns_plug-3.0.6.57c2feb-2.el7.x86_64.rpm
+++ b/roles/firewall/files/fw_dns_plug-3.0.6.57c2feb-2.el7.x86_64.rpm
--- a/roles/firewall/files/fw_dns_plug-debug-1.0.2.1c9d36d-1.el7.centos.x86_64.rpm
+++ b/roles/firewall/files/fw_dns_plug-debug-1.0.2.1c9d36d-1.el7.centos.x86_64.rpm
--- a/roles/firewall/files/fw_ftp_plug-3.0.1.0a78573-2.el7.x86_64.rpm
+++ b/roles/firewall/files/fw_ftp_plug-3.0.1.0a78573-2.el7.x86_64.rpm
--- a/roles/firewall/files/fw_ftp_plug-debug-1.0.0.bd656e4-1.el7.centos.x86_64.rpm
+++ b/roles/firewall/files/fw_ftp_plug-debug-1.0.0.bd656e4-1.el7.centos.x86_64.rpm
--- a/roles/firewall/files/fw_http_plug-3.2.3.6b8c95d-2.el7.x86_64.rpm
+++ b/roles/firewall/files/fw_http_plug-3.2.3.6b8c95d-2.el7.x86_64.rpm
--- a/roles/firewall/files/fw_http_plug-3.2.5.30df450-2.el7.x86_64.rpm
+++ b/roles/firewall/files/fw_http_plug-3.2.5.30df450-2.el7.x86_64.rpm
--- a/roles/firewall/files/fw_http_plug-debug-1.0.3.3c95e78-1.el7.centos.x86_64.rpm
+++ b/roles/firewall/files/fw_http_plug-debug-1.0.3.3c95e78-1.el7.centos.x86_64.rpm
--- a/roles/firewall/files/fw_mail_plug-3.1.1.777fa90-2.el7.x86_64.rpm
+++ b/roles/firewall/files/fw_mail_plug-3.1.1.777fa90-2.el7.x86_64.rpm
--- a/roles/firewall/files/fw_mail_plug-debug-1.0.1.8792ed8-1.el7.centos.x86_64.rpm
+++ b/roles/firewall/files/fw_mail_plug-debug-1.0.1.8792ed8-1.el7.centos.x86_64.rpm
--- a/roles/firewall/files/fw_quic_plug-3.0.4.947ef77-2.el7.x86_64.rpm
+++ b/roles/firewall/files/fw_quic_plug-3.0.4.947ef77-2.el7.x86_64.rpm
--- a/roles/firewall/files/fw_ssl_plug-3.1.1.d9e9de4-2.el7.x86_64.rpm
+++ b/roles/firewall/files/fw_ssl_plug-3.1.1.d9e9de4-2.el7.x86_64.rpm
--- a/roles/firewall/files/fw_voip_plug-1.0.6.341fe83-2.el7.x86_64.rpm
+++ b/roles/firewall/files/fw_voip_plug-1.0.6.341fe83-2.el7.x86_64.rpm
--- a/roles/firewall/files/gtp-1.0.4.8804e43-2.el7.x86_64.rpm
+++ b/roles/firewall/files/gtp-1.0.4.8804e43-2.el7.x86_64.rpm
--- a/roles/firewall/files/gtp_signaling_plug-1.0.2.2dfced5-2.el7.x86_64.rpm
+++ b/roles/firewall/files/gtp_signaling_plug-1.0.2.2dfced5-2.el7.x86_64.rpm
--- a/roles/firewall/files/http-2.0.5.c61ad9a-2.el7.x86_64.rpm
+++ b/roles/firewall/files/http-2.0.5.c61ad9a-2.el7.x86_64.rpm
--- a/roles/firewall/files/http-debug-1.0.0.-1.el7.x86_64.rpm
+++ b/roles/firewall/files/http-debug-1.0.0.-1.el7.x86_64.rpm
--- a/roles/firewall/files/mail-1.0.11.48abeae-2.el7.x86_64.rpm
+++ b/roles/firewall/files/mail-1.0.11.48abeae-2.el7.x86_64.rpm
--- a/roles/firewall/files/mail-debug-1.0.0.-1.el7.x86_64.rpm
+++ b/roles/firewall/files/mail-debug-1.0.0.-1.el7.x86_64.rpm
--- a/roles/firewall/files/mesa_sip-1.1.1.0721ead-2.el7.x86_64.rpm
+++ b/roles/firewall/files/mesa_sip-1.1.1.0721ead-2.el7.x86_64.rpm
--- a/roles/firewall/files/quic-1.1.17.8c22b4d-2.el7.x86_64.rpm
+++ b/roles/firewall/files/quic-1.1.17.8c22b4d-2.el7.x86_64.rpm
--- a/roles/firewall/files/radius-1.0.2.7bddf74-2.el7.x86_64.rpm
+++ b/roles/firewall/files/radius-1.0.2.7bddf74-2.el7.x86_64.rpm
--- a/roles/firewall/files/rtp-1.0.4.91b4ab7-2.el7.x86_64.rpm
+++ b/roles/firewall/files/rtp-1.0.4.91b4ab7-2.el7.x86_64.rpm
--- a/roles/firewall/files/ssl-2.0.2.1389716-2.el7.x86_64.rpm
+++ b/roles/firewall/files/ssl-2.0.2.1389716-2.el7.x86_64.rpm
--- a/roles/firewall/files/ssl-debug-1.0.0.-1.el7.x86_64.rpm
+++ b/roles/firewall/files/ssl-debug-1.0.0.-1.el7.x86_64.rpm
--- a/roles/firewall/files/tsg_conn_sketch-2.1.41.906e62b-2.el7.x86_64.rpm
+++ b/roles/firewall/files/tsg_conn_sketch-2.1.41.906e62b-2.el7.x86_64.rpm
--- a/roles/firewall/files/tsg_master-debug-1.0.1.f624b67-1.el7.centos.x86_64.rpm
+++ b/roles/firewall/files/tsg_master-debug-1.0.1.f624b67-1.el7.centos.x86_64.rpm
--- a/roles/firewall/tasks/main.yml
+++ b/roles/firewall/tasks/main.yml
@@ -4,86 +4,65 @@
    src: "{{ role_path }}/files/"
    dest: /tmp/ansible_deploy/

- name: "install dns-debug rpms from localhost"
+- name: "install firewall packages"
  yum:
-    name:
-      - /tmp/ansible_deploy/dns-debug-1.0.0.-1.el7.x86_64.rpm
+    name: "{{ fw_packages }}"
    state: present
-  when: install_dns_debug == "yes"
+    skip_broken: yes
+  vars:
+    fw_packages:
+      - /tmp/ansible_deploy/capture_packet_plug-3.0.6.a2db4a4-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/conn_telemetry-1.0.2.8d6da43-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/dns-2.0.12.e083fec-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/ftp-1.0.8.13d5fda-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/fw_dns_plug-3.0.6.57c2feb-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/fw_ftp_plug-3.0.1.0a78573-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/fw_http_plug-3.2.5.30df450-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/fw_mail_plug-3.1.1.777fa90-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/fw_quic_plug-3.0.4.947ef77-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/fw_ssl_plug-3.1.1.d9e9de4-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/http-2.0.5.c61ad9a-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/mail-1.0.11.48abeae-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/quic-1.1.17.8c22b4d-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/ssl-2.0.2.1389716-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/tsg_conn_sketch-2.1.41.906e62b-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/rtp-1.0.4.91b4ab7-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/mesa_sip-1.1.1.0721ead-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/fw_voip_plug-1.0.6.341fe83-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/gtp-1.0.4.8804e43-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/gtp_signaling_plug-1.0.2.2dfced5-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/app_proto_identify-2.0.1.dd683eb-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/app_proto_engine-devel-2.0.4.95a943e-2.el7.x86_64.rpm

- name: "install ftp-debug rpms from localhost"
-  yum:
-    name:
-      - /tmp/ansible_deploy/ftp-debug-1.0.0.-1.el7.x86_64.rpm
-    state: present
-  when: install_ftp_debug == "yes"
-
- name: "install http-debug rpms from localhost"
-  yum:
-    name:
-      - /tmp/ansible_deploy/http-debug-1.0.0.-1.el7.x86_64.rpm
-    state: present
-  when: install_http_debug == "yes"
- 
- name: "install mail-debug rpms from localhost"
-  yum:
-    name:
-      - /tmp/ansible_deploy/mail-debug-1.0.0.-1.el7.x86_64.rpm
-    state: present
-  when: install_mail_debug == "yes"
-
- name: "install ssl-debug rpms from localhost"
-  yum:
-    name:   
-      - /tmp/ansible_deploy/ssl-debug-1.0.0.-1.el7.x86_64.rpm
-    state: present
-  when: install_ssl_debug == "yes"
-
- name: "install fw_dns_plug-debug rpms from localhost"
-  yum:
-    name:
-      - /tmp/ansible_deploy/fw_dns_plug-debug-1.0.2.1c9d36d-1.el7.centos.x86_64.rpm
-    state: present
-  when: install_fw_dns_plug_debug == "yes" 
- 
- name: "install fw_ftp_plug-debug rpms from localhost"
-  yum:
-    name:
-      - /tmp/ansible_deploy/fw_ftp_plug-debug-1.0.0.bd656e4-1.el7.centos.x86_64.rpm
-    state: present
-  when: install_fw_ftp_plug_debug == "yes"
-  
- name: "install fw_http_plug-debug rpms from localhost"
-  yum:
-    name:
-      - /tmp/ansible_deploy/fw_http_plug-debug-1.0.3.3c95e78-1.el7.centos.x86_64.rpm
-    state: present
-  when: install_fw_http_plug_debug == "yes" 
- 
- name: "install fw_mail_plug-debug rpms from localhost"
-  yum:
-    name:
-      - /tmp/ansible_deploy/fw_mail_plug-debug-1.0.1.8792ed8-1.el7.centos.x86_64.rpm
-    state: present
-  when: install_fw_mail_plug_debug == "yes"
-
- name: "install tsg-master rpms from localhost"
-  yum:
-    name:
-      - /tmp/ansible_deploy/tsg_master-debug-1.0.1.f624b67-1.el7.centos.x86_64.rpm
-    state: present
-  when: install_tsg_master == "yes" 
-
- name: Template the tsgconf/main.conf
+- name: "Template the tsgconf/main.conf"
  template:
    src: "{{ role_path }}/templates/main.conf.j2"
    dest: /home/mesasoft/sapp_run/tsgconf/main.conf
  tags: template


- name: Template the tsgconf/maat.conf
+- name: "Template the tsgconf/maat.conf"
  template:
    src: "{{ role_path }}/templates/maat.conf.j2"
    dest: /home/mesasoft/sapp_run/tsgconf/maat.conf
  tags: template

+
+- name: "Template the conf/capture_packet_plug.conf.j2"
+  template:
+    src: "{{ role_path }}/templates/capture_packet_plug.conf.j2"
+    dest: /home/mesasoft/sapp_run/conf/capture_packet_plug.conf
+  tags: template
+
+ 
+- name: "Template the /home/mesasoft/sapp_run/plug/business/tsg_conn_sketch/tsg_conn_sketch.inf"
+  template:
+    src: "{{ role_path }}/templates/tsg_conn_sketch.inf.j2"
+    dest: /home/mesasoft/sapp_run/plug/business/tsg_conn_sketch/tsg_conn_sketch.inf
+  tags: template
+
+- name: "Template the conf/http/http.conf"
+  template:
+    src: "{{ role_path }}/templates/http.conf.j2"
+    dest:  /home/mesasoft/sapp_run/conf/http/http.conf
+  tags: template
--- a/roles/firewall/templates/capture_packet_plug.conf.j2
+++ b/roles/firewall/templates/capture_packet_plug.conf.j2
@@ -0,0 +1,26 @@
+[MAAT]
+MAAT_MODE=2
+#EFFECTIVE_FLAG=
+STAT_SWITCH=1
+PERF_SWITCH=1
+TABLE_INFO=conf/capture_packet_tableinfo.conf
+STAT_FILE=capture_packet_maat.status
+EFFECT_INTERVAL_S=1
+REDIS_IP={{ maat_redis_server.address }}
+REDIS_PORT_NUM={{ maat_redis_server.port_num }}
+REDIS_PORT={{ maat_redis_server.port }}
+REDIS_INDEX={{ maat_redis_server.db }}
+JSON_CFG_FILE=conf/capture_packet_maat.json
+INC_CFG_DIR=capture_packet_rule/inc/index/
+FULL_CFG_DIR=capture_packet_rule/full/index/
+EFFECTIVE_RANGE_FILE=/opt/tsg/etc/tsg_device_tag.json
+ACCEPT_TAGS={"tags":[{"tag":"data_center","value":"{{ data_center }}"}]}
+
+[LOG]
+NIC_NAME={{ nic_mgr.name }}
+BROKER_LIST={{ log_kafkabrokers.address | join(",") }}
+FIELD_FILE=conf/capture_packet_log_field.conf
+
+[SYSTEM]
+LOG_LEVEL=30
+LOG_PATH=./tsglog/capture_packet_plug/capture_packet
--- a/roles/firewall/templates/http.conf.j2
+++ b/roles/firewall/templates/http.conf.j2
@@ -0,0 +1,43 @@
+#http_special
+#all regions
+1	HTTP_ALL
+2	HTTP_OTHER_REGIONS
+#http state
+3	HTTP_STATE
+4	HTTP_REQ_LINE
+5	HTTP_RES_LINE	
+6	HTTP_CONTENT            
+7	HTTP_UNGZIP_CONTENT
+8	HTTP_MESSAGE_URL
+9	HTTP_URI
+#http_request
+10	HTTP_HOST
+11	HTTP_REFERER
+12	HTTP_USER_AGENT
+13	HTTP_COOKIE
+14	HTTP_PROXY_AUTHORIZATION
+15	HTTP_AUTHORIZATION
+#http_response
+16	HTTP_LOCATION
+17	HTTP_SERVER
+18	HTTP_ETAG
+#http_general
+19	HTTP_DATE
+20	HTTP_TRAILER
+21	HTTP_TRANSFER_ENCODING
+22	HTTP_VIA
+23	HTTP_PRAGMA
+24	HTTP_CONNECTION
+#http_content
+25	HTTP_CONT_ENCODING
+26	HTTP_CONT_LANGUAGE
+27	HTTP_CONT_LOCATION
+28	HTTP_CONT_DISPOSITION
+29	HTTP_CONT_RANGE
+30	HTTP_CONT_LENGTH
+31	HTTP_CONT_TYPE
+32	HTTP_CHARSET
+33	HTTP_EXPIRES
+34	HTTP_X_FLASH_VERSION
+35	HTTP_TRANSFER_LENGTH
+36	Set-Cookie
--- a/roles/firewall/templates/maat.conf.j2
+++ b/roles/firewall/templates/maat.conf.j2
@@ -1,4 +1,5 @@
 [STATIC]
+###0:location 1:json 2:redis
 MAAT_MODE=2
 STAT_SWITCH=1
 PERF_SWITCH=1
@@ -6,14 +7,16 @@ TABLE_INFO=tsgconf/tsg_static_tableinfo.conf
 STAT_FILE=tsg_static_maat.status
 EFFECT_INTERVAL_S=1
 REDIS_IP={{ maat_redis_server.address }}
-REDIS_PORT_NUM=1
-REDIS_PORT=7002
-REDIS_INDEX=0
+REDIS_PORT_NUM={{ maat_redis_server.port_num }}
+REDIS_PORT={{ maat_redis_server.port }}
+REDIS_INDEX={{ maat_redis_server.db }}
 JSON_CFG_FILE=tsgconf/tsg_maat.json
 INC_CFG_DIR=tsgrule/inc/index/
 FULL_CFG_DIR=tsgrule/full/index/
+EFFECTIVE_RANGE_FILE=/opt/tsg/etc/tsg_device_tag.json

 [DYNAMIC]
+###0:location 1:json 2:redis
 MAAT_MODE=2
 STAT_SWITCH=1
 PERF_SWITCH=1
@@ -21,10 +24,45 @@ TABLE_INFO=tsgconf/tsg_dynamic_tableinfo.conf
 STAT_FILE=tsg_dynamic_maat.status
 EFFECT_INTERVAL_S=1
 REDIS_IP={{ dynamic_maat_redis_server.address }}
-REDIS_PORT_NUM=1
-REDIS_PORT=7002
-REDIS_INDEX=1
+REDIS_PORT_NUM={{ dynamic_maat_redis_server.port_num }}
+REDIS_PORT={{ dynamic_maat_redis_server.port }}
+REDIS_INDEX={{ dynamic_maat_redis_server.db }}
 JSON_CFG_FILE=tsgconf/tsg_maat.json
 INC_CFG_DIR=tsgrule/inc/index/
 FULL_CFG_DIR=tsgrule/full/index/
+EFFECTIVE_RANGE_FILE=/opt/tsg/etc/tsg_device_tag.json

+[APP_SIGNATURE_MAAT]
+MAAT_MODE=2
+STAT_SWITCH=1
+PERF_SWITCH=1
+TABLE_INFO=tsgconf/app_sketch_tableinfo.conf
+STAT_FILE=app_sketch_maat.status
+EFFECT_INTERVAL_S=1
+REDIS_IP={{ maat_redis_server.address }}
+REDIS_PORT_NUM={{ maat_redis_server.port_num }}
+REDIS_PORT={{ maat_redis_server.port }}
+REDIS_INDEX={{ maat_redis_server.db }}
+JSON_CFG_FILE=tsgconf/app_sketch_maat.json
+INC_CFG_DIR=tsgrule/inc/index/
+FULL_CFG_DIR=tsgrule/full/index/
+EFFECTIVE_RANGE_FILE=/opt/tsg/etc/tsg_device_tag.json
+
+[CAPTURE]
+MAAT_MODE=2
+STAT_SWITCH=1
+PERF_SWITCH=1
+TABLE_INFO=tsgconf/app_sketch_tableinfo.conf
+STAT_FILE=app_sketch_maat.status
+EFFECT_INTERVAL_S=1
+REDIS_IP={{ maat_redis_server.address }}
+REDIS_PORT_NUM={{ maat_redis_server.port_num }}
+REDIS_PORT={{ maat_redis_server.port }}
+REDIS_INDEX={{ maat_redis_server.db }}
+JSON_CFG_FILE=tsgconf/app_sketch_maat.json
+INC_CFG_DIR=tsgrule/inc/index/
+FULL_CFG_DIR=tsgrule/full/index/
+EFFECTIVE_RANGE_FILE=/opt/tsg/etc/tsg_device_tag.json
+
+[MAAT]
+ACCEPT_TAGS={"tags":[{"tag":"data_center","value":"{{ data_center }}"}]}
--- a/roles/firewall/templates/main.conf.j2
+++ b/roles/firewall/templates/main.conf.j2
@@ -1,47 +1,103 @@
+[VOIP_PLUG]
+TIMEOUT=300
+LOG_PATH="./tsglog/fw_voip_plug/fw_voip_plug"
+LOG_LEVEL={{ fw_voip_log_level }}
+TABLE_TO=TSG_FIELD_SIP_RESPONDER_DESCRIPTION
+TABLE_FROM=TSG_FIELD_SIP_ORIGINATOR_DESCRIPTION
+
 [FTP_PLUG]
-LOG_PATH=./tsglog/fw_ftp_plug/fw_ftp_plug
-LOG_LEVEL=10
+LOG_PATH="./tsglog/fw_ftp_plug/fw_ftp_plug"
+LOG_LEVEL={{ fw_ftp_log_level }}
 TIMEOUT=600
+
 [MAIL_PLUG]
-LOG_PATH=./tsglog/fw_mail_plug/fw_mail_plug
-LOG_LEVEL=10
+LOG_PATH="./tsglog/fw_mail_plug/fw_mail_plug"
+LOG_LEVEL={{ fw_mail_log_level }}
 TIMEOUT=600
+
 [HTTP_PLUG]
-LOG_PATH=./tsglog/fw_http_plug/fw_http_plug
-LOG_LEVEL=10
+LOG_PATH="./tsglog/fw_http_plug/fw_http_plug"
+LOG_LEVEL={{ fw_http_log_level }}
+
 [DNS_PLUG]
-LOG_PATH=./tsglog/fw_dns_plug/fw_dns_plug
-LOG_LEVEL=10
+LOG_PATH="./tsglog/fw_dns_plug/fw_dns_plug"
+LOG_LEVEL={{ fw_dns_log_level }}
+
+[QUIC_PLUG]
+LOG_PATH="./tsglog/fw_quic_plug/fw_quic_plug"
+LOG_LEVEL={{ fw_quic_log_level }}
+
+[CONTROL_PLUG]
+LOG_PATH="./tsglog/app_control_plug/app_control_plug"
+LOG_LEVEL={{ app_control_log_level }}
+
 [MAAT]
-PROFILE=./tsgconf/maat.conf
-IP_ADDR_TABLE=TSG_OBJ_IP_ADDR
-SUBSCRIBER_ID_TABLE=TSG_OBJ_SUBSCRIBER_ID
-CB_SUBSCRIBER_IP_TABLE=TSG_DYN_SUBSCRIBER_IP
+PROFILE="./tsgconf/maat.conf"
+SUBSCRIBER_ID_TABLE="TSG_OBJ_SUBSCRIBER_ID"
+CB_SUBSCRIBER_IP_TABLE="TSG_DYN_SUBSCRIBER_IP"
+IP_ADDR_TABLE="TSG_SECURITY_ADDR"

 [TSG_LOG]
 MODE=1
-NIC_NAME={{ nic_mgr.name }}
+NIC_NAME="{{ nic_mgr.name }}"
 MAX_SERVICE=1
-LOG_LEVEL=10
-LOG_PATH=./tsglog/tsglog
-BROKER_LIST={{ log_kafkabrokers.address }}
-COMMON_FIELD_FILE=tsgconf/tsg_log_field.conf
+LOG_LEVEL={{ tsg_log_level }}
+LOG_PATH="./tsglog/tsglog"
+BROKER_LIST="{{ log_kafkabrokers.address | join(",") }}"
+COMMON_FIELD_FILE="tsgconf/tsg_log_field.conf"

 [STATISTIC]
-CYCLE=0
+CYCLE=5
 TELEGRAF_PORT=8100
-TELEGRAF_IP=127.0.0.1
-OUTPUT_PATH=./tsg_statistic.log
-APP_NAME=statistic
+TELEGRAF_IP="127.0.0.1"
+OUTPUT_PATH="./tsg_statistic.log"
+APP_NAME="statistic"

 [FIELD_STAT]
-CYCLE=3
-TELEGRAF_PORT=8125
-TELEGRAF_IP=127.0.0.1
-OUTPUT_PATH=./tsg_stat.log
-APP_NAME=tsg_master
+CYCLE=5
+TELEGRAF_PORT=8100
+TELEGRAF_IP="127.0.0.1"
+OUTPUT_PATH="./tsg_stat.log"
+APP_NAME="tsg_master"

 [SYSTEM]
+NIC_NAME="{{ nic_mgr.name }}"
+ENTRANCE_ID={{ tsg_master_entrance_id }}
+LOG_LEVEL={{ tsg_master_log_level }}
+LOG_PATH="./tsglog/tsg_master"
+POLICY_PRIORITY_LABEL="POLICY_PRIORITY"
+L7_PROTOCOL_FILE="./tsgconf/tsg_l7_protocol.conf"
+DEVICE_ID_COMMAND="hostname | awk -F'-' '{print $3}'| awk -F'adc' '{print $2}'"
+
+[TSG_CONN_SKETCH]
+log_service=2
+live_service=6
+transaction_service=7
+live_service_switch=1
+transaction_service_switch=1
+live_intervals_time = 30
+
+[HOS_CONF]
+hos_serverip="{{ firewall.hos_serverip }}"
+hos_serverport={{ firewall.hos_serverport }}
+hos_accesskeyid="default"
+hos_secretkey="default"
+hos_poolsize=100
+hos_thread_sum=32
+hos_cache_size=102400
+hos_fs2_serverip="127.0.0.1"
+hos_fs2_serverport=10086
+
+[APP_SKETCH_LOCAL]
 LOG_LEVEL=10
-LOG_PATH=./tsglog/tsg_master
-POLICY_PRIORITY_LABEL=POLICY_PRIORITY
+LOG_PATH="./tsglog/app_sketch_local/app_sketch_local"
+
+[APP_SKETCH_FEEDBACK]
+QOS=1
+PUBLISH_TOPIC="APP_SIGNATURE_ID"
+#CLIENT_ID=
+BROKER_IP="{{ firewall.APP_SKETCH_BROKER_IP }}"
+BROKER_PORT="{{ firewall.APP_SKETCH_BROKER_PORT }}"
+
+[APP_PROTO_ENGINE]
+license_path=/data/app_proto_engine/license
--- a/roles/firewall/templates/tsg_conn_sketch.inf.j2
+++ b/roles/firewall/templates/tsg_conn_sketch.inf.j2
@@ -0,0 +1,46 @@
+[PLUGINFO]
+PLUGNAME=TSG_CONN_SKETCH
+SO_PATH=./plug/business/tsg_conn_sketch/tsg_conn_sketch.so
+INIT_FUNC=tsg_conn_record_init
+DESTROY_FUNC=tsg_conn_record_destroy
+
+
+[TCP]
+FUNC_FLAG=ALL
+FUNC_NAME=tsg_record_tcp_entry
+
+[TCP_ALL]
+FUNC_FLAG=ALL
+FUNC_NAME=tsg_record_tcpall_entry
+
+[UDP]
+FUNC_FLAG=ALL
+FUNC_NAME=tsg_record_udp_entry
+
+[HTTP]
+FUNC_FLAG=ALL
+FUNC_NAME=tsg_record_http_entry
+
+[SSL]
+FUNC_FLAG=SSL_CLIENT_HELLO,SSL_SERVER_HELLO,SSL_APPLICATION_DATA,SSL_CERTIFICATE_DETAIL
+FUNC_NAME=tsg_record_ssl_entry
+
+[DNS]
+FUNC_FLAG=ALL
+FUNC_NAME=tsg_record_dns_entry
+
+[MAIL]
+FUNC_FLAG=ALL
+FUNC_NAME=tsg_record_mail_entry
+
+[RTP]
+FUNC_FLAG=ALL
+FUNC_NAME=tsg_record_rtp_entry
+
+[SIP]
+FUNC_FLAG=ALL
+FUNC_NAME=tsg_record_sip_entry
+
+[FTP]
+FUNC_FLAG=ALL
+FUNC_NAME=tsg_record_ftp_entry
--- a/roles/framework/files/framework/framework.conf
+++ b/roles/framework/files/framework/framework.conf
--- a/roles/framework/files/framework/framework-2.0.11.aad8b7e-1.el7.centos.x86_64.rpm
+++ b/roles/framework/files/framework/framework-2.0.11.aad8b7e-1.el7.centos.x86_64.rpm
--- a/roles/framework/files/libMESA_field_stat-1.0.2.6d45eed-2.el7.x86_64.rpm
+++ b/roles/framework/files/libMESA_field_stat-1.0.2.6d45eed-2.el7.x86_64.rpm
--- a/roles/framework/files/libMESA_field_stat2-2.9.10.72ac4f1-2.el7.x86_64.rpm
+++ b/roles/framework/files/libMESA_field_stat2-2.9.10.72ac4f1-2.el7.x86_64.rpm
--- a/roles/framework/files/libMESA_handle_logger-2.0.8.f76af2f-2.el7.x86_64.rpm
+++ b/roles/framework/files/libMESA_handle_logger-2.0.8.f76af2f-2.el7.x86_64.rpm
--- a/roles/framework/files/libMESA_htable-3.10.12.cf4ccfc-2.el7.x86_64.rpm
+++ b/roles/framework/files/libMESA_htable-3.10.12.cf4ccfc-2.el7.x86_64.rpm
--- a/roles/framework/files/libMESA_prof_load-1.0.6.c6da36a-2.el7.x86_64.rpm
+++ b/roles/framework/files/libMESA_prof_load-1.0.6.c6da36a-2.el7.x86_64.rpm
--- a/roles/framework/files/libWiredLB-2.0.5.4629165-2.el7.x86_64.rpm
+++ b/roles/framework/files/libWiredLB-2.0.5.4629165-2.el7.x86_64.rpm
--- a/roles/framework/files/libaws-c-common-1.0.3.fa2adf0-2.el7.x86_64.rpm
+++ b/roles/framework/files/libaws-c-common-1.0.3.fa2adf0-2.el7.x86_64.rpm
--- a/roles/framework/files/libaws-c-event-stream-1.0.6.67fd944-2.el7.x86_64.rpm
+++ b/roles/framework/files/libaws-c-event-stream-1.0.6.67fd944-2.el7.x86_64.rpm
--- a/roles/framework/files/libaws-checksums-1.0.6.8b09ac1-2.el7.x86_64.rpm
+++ b/roles/framework/files/libaws-checksums-1.0.6.8b09ac1-2.el7.x86_64.rpm
--- a/roles/framework/files/libaws-cpp-sdk-core-1.0.8.a3fe079-2.el7.x86_64.rpm
+++ b/roles/framework/files/libaws-cpp-sdk-core-1.0.8.a3fe079-2.el7.x86_64.rpm
--- a/roles/framework/files/libaws-cpp-sdk-s3-2.0.0.f3c33ea-2.el7.x86_64.rpm
+++ b/roles/framework/files/libaws-cpp-sdk-s3-2.0.0.f3c33ea-2.el7.x86_64.rpm
--- a/roles/framework/files/libbreakpad_mini-1.0.2.a56ef00-2.el7.x86_64.rpm
+++ b/roles/framework/files/libbreakpad_mini-1.0.2.a56ef00-2.el7.x86_64.rpm
--- a/roles/framework/files/libcjson-1.7.10.ab2896f-2.el7.x86_64.rpm
+++ b/roles/framework/files/libcjson-1.7.10.ab2896f-2.el7.x86_64.rpm
--- a/roles/framework/files/libdocumentanalyze-2.0.6.2d1abe0-2.el7.x86_64.rpm
+++ b/roles/framework/files/libdocumentanalyze-2.0.6.2d1abe0-2.el7.x86_64.rpm
--- a/roles/framework/files/libhos-client-cpp-1.0.26.a8573f5-2.el7.x86_64.rpm
+++ b/roles/framework/files/libhos-client-cpp-1.0.26.a8573f5-2.el7.x86_64.rpm
--- a/roles/framework/files/libmaatframe-3.2.1.8bf48ba-2.el7.x86_64.rpm
+++ b/roles/framework/files/libmaatframe-3.2.1.8bf48ba-2.el7.x86_64.rpm
--- a/roles/framework/files/librdkafka-0.11.4-1.el7.x86_64.rpm
+++ b/roles/framework/files/librdkafka-0.11.4-1.el7.x86_64.rpm
--- a/roles/framework/files/librulescan-2.2.3.93a68a2-2.el7.x86_64.rpm
+++ b/roles/framework/files/librulescan-2.2.3.93a68a2-2.el7.x86_64.rpm
--- a/roles/framework/files/libtsglua-1.0.8.0dbf2e6-2.el7.x86_64.rpm
+++ b/roles/framework/files/libtsglua-1.0.8.0dbf2e6-2.el7.x86_64.rpm
--- a/roles/framework/files/libwiredcfg-2.0.6.67ae0ab-2.el7.x86_64.rpm
+++ b/roles/framework/files/libwiredcfg-2.0.6.67ae0ab-2.el7.x86_64.rpm
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
fumingwei	c810c89082	feature:新增部署packet_dump的操作	2021-07-22 17:31:28 +08:00
fumingwei	58f1bc8044	bugfix:修改部署过程出现配置文件路径错误和变量缺失问题	2021-07-22 17:17:28 +08:00
fumingwei	7fe7cc953e	同步tsg-os配置文件	2021-07-21 11:40:30 +08:00
fumingwei	e2fe322a06	firewall插件和tsg-os同步	2021-07-21 10:21:07 +08:00
fumingwei	5729ad8653	bugfix:删除多余kni插件	2021-07-06 15:09:02 +08:00
fumingwei	e3977b920e	OMPUB-159:新增v21.06适配mirror流量的DPI安装包	2021-07-06 14:48:40 +08:00
fumingwei	3322c11ad9	更新gtp rpm包版本由v1.0.3到v1.0.4	2021-06-08 10:04:04 +08:00
fumingwei	c3085983cf	注释掉mcn3上安装switch_control，新增mcn3上的adc_exporter	2021-06-02 16:50:46 +08:00
fumingwei	1f30b045be	v21.05: 更新tfe	2021-06-01 17:22:01 +08:00
fumingwei	6bf568fcbe	v21.05:新增gtp_signaling_plug插件	2021-06-01 16:35:09 +08:00
fumingwei	a013eff4ab	v21.05:新增gtp插件	2021-06-01 16:32:54 +08:00
fumingwei	35e543676d	v21.05: 更新kni	2021-06-01 16:29:11 +08:00
fumingwei	605a42c867	v21.05:更新librulescan安装包	2021-06-01 16:27:13 +08:00
fumingwei	13cbc426a7	v21.05:更新fw_mail_plug 插件	2021-06-01 16:24:53 +08:00
fumingwei	b59eeb68f5	v21.05: 更新:tsg_conn_sketch 插件	2021-06-01 16:22:40 +08:00
fumingwei	4740eeb48b	v21.05:更新libmaatframe	2021-06-01 16:20:41 +08:00
fumingwei	f0637faf7a	v21.05: 更新sapp	2021-06-01 16:16:07 +08:00
fumingwei	04b88b791f	v21.05:更新app_proto_identify插件	2021-06-01 15:57:37 +08:00
fumingwei	b7d6f32f8e	v21.05:更新app_sketch_local 插件	2021-06-01 15:55:43 +08:00
fumingwei	19743438a6	更新fw_http_plug插件	2021-06-01 15:53:54 +08:00
fumingwei	b7216727f8	更新v21.05 tsg_master插件	2021-06-01 15:52:17 +08:00
fumingwei	5515d7dd7a	更新mesa_sip插件	2021-06-01 15:50:32 +08:00
fumingwei	20b3719fbe	修改main.yml中的voip引用的table info表项	2021-05-19 18:19:05 +08:00
fumingwei	e15494d7e4	增加安装内核后，重启操作	2021-05-06 15:02:39 +08:00
fumingwei	628b0bbf04	修改变量log_mino 为 pangu_pxy.log_cache	2021-04-27 18:42:21 +08:00
fumingwei	b0dc10d139	增加sapp conflist的mesa_sip,rtp,fw_voip_plug 插件	2021-04-27 10:14:06 +08:00
fumingwei	f64240fcbf	增加package-dump 监控	2021-04-26 18:13:53 +08:00
fumingwei	ff90a94d4b	修改packet_dump_server 使用的配置文件	2021-04-26 11:45:09 +08:00
fumingwei	fb1c66c76c	1、新增dump_rtp_pcap安装2、整合配置变量	2021-04-25 17:19:23 +08:00
fumingwei	6e495828f0	修改和增加sapp的配置文件	2021-04-23 18:07:30 +08:00
fumingwei	2c58349922	21.04 版本更新，更新记录：https://docs.geedge.net/pages/viewpage.action?pageId=28803144	2021-04-22 19:45:01 +08:00
fumingwei	04cea8afd4	Merge branch 'tsg-version21.04-deploy' of https://git.mesalab.cn/tsg/tsg-scripts into tsg-version21.04-deploy	2021-04-17 10:09:35 +08:00
fumingwei	9dcd0cfbdd	修改atca vxlan流量属性接入配置	2021-04-17 10:08:40 +08:00
fumingwei	8338693e40	更新hos-client-cpp rpm 包	2021-04-16 17:54:39 +08:00
fumingwei	88664464f9	修复21.03 bug，相关链接：https://docs.geedge.net/pages/viewpage.action?pageId=30869129	2021-04-16 15:52:37 +08:00
fumingwei	6a98bc17b8	修改atca vxlan流量属性接入配置	2021-04-13 09:42:11 +08:00
fumingwei	1ed3568b7f	增加支持hos 公共库的rpm包	2021-03-23 16:49:12 +08:00
fumingwei	0a16f4dc3d	增加在tun模式下开启tfe-env-tun-mode service	2021-03-23 09:30:22 +08:00
fumingwei	131bb95a1e	i更新mesa_ip 到最新版本	2021-03-19 15:14:14 +08:00
fumingwei	14b3be388a	21.03 版本更新，更新内容请参考；https://docs.geedge.net/pages/viewpage.action?pageId=23042804	2021-03-19 14:24:42 +08:00
fumingwei	f8d24abd4c	修改自检部署脚本位置	2021-02-08 09:23:58 +08:00
fumingwei	bd3bcd1e91	添加自检安装部署	2021-02-08 09:21:47 +08:00
fumingwei	41f8a0c8da	更新tsg_master，sapp，libmaatframe，tfe，app_control_plug，app_master rpm包	2021-02-07 19:47:38 +08:00
fumingwei	6dfaf41870	20.11.rc3 rebase version 20.11	2021-01-31 22:50:33 +08:00
fumingwei	bcf5049ecb	晚上服务器部署模式	2021-01-29 19:41:26 +08:00
fumingwei	5267b73590	tsg scripts version 20.11 上传	2021-01-29 18:03:04 +08:00
刘学利	8beaf16134	Update conflist.inf.j2;更新conlist.inf,调整插件挂载的顺序	2020-10-20 16:36:58 +08:00
fumingwei	43d1a13cde	tsg-dignose 自动部署脚本追加到tfe 可信证书文件中	2020-10-20 16:26:33 +08:00
fumingwei	5349fd24fb	1、增加tsg_master_entrance_id 2、修改sapp configlist.inf 3、kni rpm install 强制安装	2020-10-19 21:56:57 +08:00
fumingwei	344c734f70	Merge branch 'tsg-version20.11.rc1-deploy' of https://git.mesalab.cn/tsg/tsg-scripts into tsg-version20.11.rc1-deploy	2020-10-19 20:55:59 +08:00
fumingwei	ed6f5c3d3b	Merge branch 'tsg-version20.11.rc1-deploy-firewall' into tsg-version20.11.rc1-deploy # Conflicts: # roles/sapp/tasks/main.yml 更新firewall相关RPM包	2020-10-19 20:55:52 +08:00
liuxueli	93fc4a94b8	更新rpm	2020-10-19 20:50:35 +08:00
fengweihao	aeee8afab9	app-sketch-global升级	2020-10-19 20:43:17 +08:00
fengweihao	67ae52725b	cerstore升级	2020-10-19 20:42:42 +08:00
fumingwei	b0c9ea045b	更新kni	2020-10-19 19:33:31 +08:00
luwenpeng	9d9b8ad83c	升级 tfe 到 4.3.14	2020-10-19 18:30:26 +08:00
fumingwei	1c5ea5b740	1、增加内存限制	2020-10-19 14:52:08 +08:00
fumingwei	7800356765	修改telegraf 安装失败问题	2020-10-17 18:04:44 +08:00
liuxueli	18410aa84a	修正app_proto_identify安装路径	2020-10-17 18:03:27 +08:00
fumingwei	11bf3dfa8e	Merge branch 'tsg-version20.11.rc1-deploy-firewall' into tsg-version20.11.rc1-deploy	2020-10-17 14:12:48 +08:00
liuxueli	a517b99219	更新app_proto_identify和packet_dump	2020-10-17 14:03:11 +08:00
fumingwei	3fdae02a52	1、增加telegraf collect 部署 2、修改telegrafaf 配置文件	2020-10-17 13:59:56 +08:00
liuxueli	2b2cbf4113	更新tsg_master及packet_dump相应的RPM包	2020-10-17 10:36:19 +08:00
fumingwei	f0725b0e02	修改 clotho 为 package_dump	2020-10-16 16:57:20 +08:00
liuxueli	0f2b89512f	Merge branch 'tsg-version20.11.rc1-deploy' into tsg-version20.11.rc1-deploy-firewall	2020-10-16 13:58:58 +08:00
liuxueli	924df3f5fd	更新packet_dump的安装	2020-10-16 13:57:59 +08:00
liuxueli	0aaff59a37	Merge branch 'tsg-version20.11.rc1-deploy-firewall' of https://git.mesalab.cn/tsg/tsg-scripts into tsg-version20.11.rc1-deploy-firewall	2020-10-16 13:13:16 +08:00
fumingwei	451677775d	合并提交分支	2020-10-16 10:28:48 +08:00
fumingwei	0fe01beaf5	1、增加libbreakpad_mini 安装 2、修改kni 部署	2020-10-16 10:22:16 +08:00
liuxueli	dc050b2e79	更新sapp配置文件模板; 更新pcapng存储程序;	2020-10-16 10:16:01 +08:00
liuxueli	a6a13adc07	更新fw_ssl_plug的RPM	2020-10-16 10:16:01 +08:00
luwenpeng	470194eb2d	升级 tfe 到 4.3.12	2020-10-16 10:12:27 +08:00
liuxueli	9c1e8fb655	更新sapp配置文件模板; 更新pcapng存储程序;	2020-10-16 10:08:11 +08:00
liuxueli	27f242ec8f	Merge branch 'tsg-version20.11.rc1-deploy-firewall' of https://git.mesalab.cn/tsg/tsg-scripts into tsg-version20.11.rc1-deploy-firewall # Conflicts: # roles/firewall/tasks/main.yml	2020-10-16 09:55:34 +08:00
liuxueli	b2c9836677	更新fw_ssl_plug的RPM	2020-10-16 09:53:46 +08:00
fumingwei	f1f5f29fe1	修改kni 部署脚本	2020-10-15 18:29:05 +08:00
fumingwei	deeb575b7b	1、修改breakpad_upload_url为全局变量 2、修改自检rpm包和部署脚本	2020-10-15 16:52:08 +08:00
liuxueli	44885b6f02	发布firewall的20.11版本	2020-10-15 16:40:56 +08:00
liuxueli	1a173bddcf	发布firewall的20.11版本	2020-10-15 15:50:19 +08:00
fengweihao	fe5852ce1c	app-sketch-global更新	2020-10-14 19:05:55 +08:00
fengweihao	f49bc21400	添加zlog模板	2020-10-14 19:05:37 +08:00
fengweihao	88d6fda48f	更新RPM安装包修改配置文件	2020-10-14 19:05:37 +08:00
luwenpeng	de0992db4d	更新 TFE 20.11 版配置文件，升级 tfe 到 4.3.11	2020-10-14 17:45:06 +08:00
fumingwei	fcb6118c31	1、co telegraf_statistic 更新到最新版本	2020-10-13 16:25:16 +08:00
fumingwei	d9ebec0f1c	增加telegraf collect 部署	2020-10-10 17:43:33 +08:00
fumingwei	381ef27011	更新自检程序为20.10	2020-10-10 14:13:57 +08:00
luqiuwen	da9b09ad08	升级mrzcpd到4.3.28	2020-10-09 20:32:03 -07:00
zhangzhihan	4ae7c7e329	update	2020-09-28 21:55:04 +08:00
zhangzhihan	c9abe87819	update	2020-09-28 20:41:30 +08:00
zhangzhihan	ac1e11b722	update	2020-09-25 16:05:10 +08:00
zhangzhihan	03b37a86d8	update	2020-09-25 15:24:41 +08:00
zhangzhihan	5aba47de31	update	2020-09-25 15:10:14 +08:00
zhangzhihan	b57e742be8	update	2020-09-25 12:12:25 +08:00
zhangzhihan	4177c779ef	update	2020-09-24 15:36:49 +08:00
zhangzhihan	e522e090b5	update	2020-09-23 15:27:49 +08:00
zhangzhihan	92ed83217a	update	2020-09-23 14:56:28 +08:00
zhangzhihan	c84cf9fa02	update	2020-09-23 14:07:56 +08:00
zhangzhihan	37dab8e842	update	2020-09-21 23:14:14 +08:00
zhangzhihan	05b56cb4ec	update	2020-09-21 18:33:10 +08:00
zhangzhihan	27d3231a6e	update	2020-09-14 21:55:36 +08:00
zhangzhihan	b4735332f4	update	2020-09-14 21:48:27 +08:00
zhangzhihan	f70cf73628	update	2020-09-10 20:19:30 +08:00
zhangzhihan	1d0943fdb0	update	2020-09-10 20:12:17 +08:00
zhangzhihan	1d210d18c4	update new 20.08	2020-09-10 03:22:39 +08:00
zhangzhihan	e088bc922b	update	2020-09-04 10:55:01 +08:00
zhangzhihan	845a73e69f	update	2020-09-03 20:20:04 +08:00
zhangzhihan	0f1d3dac47	update dpi 20.08	2020-09-01 10:59:05 +08:00
zhangzhihan	198f0ab8a0	20.07	2020-07-28 14:55:32 +08:00
zhangzhihan	4ea95f7201	20.07.rc1	2020-07-24 16:06:23 +08:00
zhangzhihan	e6fbb265a8	update	2020-06-24 18:08:40 +08:00
zhangzhihan	e1dc6b5f62	update 20.06.01	2020-06-22 10:34:56 +08:00
zhangzhihan	e67c3feb23	uodate 20.06	2020-06-14 13:07:04 +08:00
zhangzhihan	32dca71844	update	2020-06-11 17:23:57 +08:00
zhangzhihan	a54f8ce853	update	2020-06-11 17:15:58 +08:00
zhangzhihan	f3076ea577	update	2020-06-11 13:18:05 +08:00
zhangzhihan	e0d3ff7927	update	2020-06-11 13:17:06 +08:00
zhangzhihan	829dd78560	update	2020-06-09 13:10:38 +08:00
zhangzhihan	792ce3da1a	20.05.01	2020-05-28 17:27:31 +08:00
zhangzhihan	aad31a42bb	20200522	2020-05-22 11:08:29 +08:00
zhangzhihan	35c6127063	20200522	2020-05-22 09:27:29 +08:00
zhangzhihan	17221ed921	20200521	2020-05-21 15:30:04 +08:00
zhangzhihan	037489a9b4	20200521	2020-05-21 15:11:12 +08:00
zhangzhihan	faae89e6e5	tsgv20.05更新	2020-05-18 18:52:52 +08:00
zhangzhihan	cd5d4b9a42	更新mrglobal.conf vlan filter	2020-05-08 11:15:05 +08:00
zhangzhihan	37847b9fba	修正部署中bug	2020-05-07 20:50:17 +08:00
zhangzhihan	ed2956f0de	v20.5临时版本	2020-04-30 21:58:38 +08:00
zhangzhihan	624489cc60	v20.5临时版本	2020-04-30 21:53:59 +08:00
zhangzhihan	6dc5a5113d	sapp更新4.0.8	2020-04-29 14:59:53 +08:00
zhangzhihan	8dd9d58e07	更新sapp，优化部署	2020-04-28 17:54:17 +08:00
zhangzhihan	0c4a1306e9	更新ftp和fw_http插件	2020-04-28 13:12:16 +08:00
zhangzhihan	d8ded2517a	sapp更新至4.0.11	2020-04-27 16:31:07 +08:00
zhangzhihan	5382ab72a2	修复20.4部署bug	2020-04-27 10:49:24 +08:00
zhangzhihan	f8ba0f2019	功能端部署剧本升级，适配20.4版本	2020-04-26 02:09:50 +08:00
zhangzhihan	633624c5a5	功能端部署剧本升级，适配20.04版本	2020-04-26 02:06:47 +08:00
zhangzhihan	9cad585759	新建Tsg-v3.0分支	2020-04-03 17:47:36 +08:00