更新hos-client-cpp rpm 包

rpm包

adc_deploy.yml

@@ -18,17 +18,18 @@
     - {role: tsg_master, tags: tsg_master}
     - {role: kni, tags: kni}
     - {role: firewall, tags: firewall}
-#    - tsg_app
+    - {role: tsg_app, tags: tsg_app}
     - {role: http_healthcheck,tags: http_healthcheck}
     - {role: redis, tags: redis}
     - {role: cert-redis, tags: cert-redis}
     - {role: maat-redis, tags: maat-redis, when: deploy_mode == "cluster"}
     - {role: certstore, tags: certstore}
     - {role: telegraf_statistic, tags: telegraf_statistic}
-    - {role: app_proto_identify, tags: app_proto_identify}
     - {role: adc_exporter, tags: adc_exporter}
 #    - {role: switch_control, tags: switch_control}
     - {role: tsg-env-patch, tags: tsg-env-patch}
+    - {role: docker-env, tags: docker-env}
+    - {role: tsg-diagnose, tags: tsg-diagnose}
 
 - hosts: adc_mcn1
   remote_user: root
@@ -44,6 +45,7 @@
     - {role: adc_exporter, tags: adc_exporter}
 #    - {role: switch_control, tags: switch_control}
     - {role: tsg-env-patch, tags: tsg-env-patch}
+    - {role: tsg-diagnose_sync_ca, tags: tsg-diagnose_sync_ca}
 
 - hosts: adc_mcn2
   remote_user: root
@@ -59,6 +61,7 @@
     - {role: adc_exporter, tags: adc_exporter}
 #    - {role: switch_control, tags: switch_control}
     - {role: tsg-env-patch, tags: tsg-env-path}
+    - {role: tsg-diagnose_sync_ca, tags: tsg-diagnose_sync_ca}
 
 - hosts: adc_mcn3
   remote_user: root
@@ -73,6 +76,12 @@
 #    - {role: adc_exporter, tags: adc_exporter}
     - {role: switch_control, tags: switch_control}
     - {role: tsg-env-patch, tags: tsg-env-patch}
+    - {role: tsg-diagnose_sync_ca, tags: tsg-diagnose_sync_ca}
+
+- hosts: adc_mcn0
+  remote_user: root
+  roles:
+    - {role: tsg-diagnose_stop_sync, tags: tsg-diagnose_stop_sync}
 
 - hosts: packet_dump_server
   remote_user: root

install_config/group_vars/adc_global.yml

@@ -41,6 +41,7 @@ log_minio:
 #########################################
 #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
@@ -122,3 +123,22 @@ nic_mgr:
 sapp_prometheus_enable: 1
 sapp_prometheus_port: 9273
 sapp_prometheus_url_path: "/metrics"
+
+
+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_LOG_LEVEL: 10
+APP_SKETCH_LOG_PATH: "./tsglog/app_sketch_local/app_sketch_local"
+APP_SKETCH_L7_PROTOCOL_LABEL: "BASIC_PROTO_LABEL"
+APP_SKETCH_QOS: 1
+APP_SKETCH_PUBLISH_TOPIC: "APP_SIGNATURE_ID"
+APP_SKETCH_BROKER_LIST: "tcp://192.168.40.161:1883"
+

install_config/group_vars/server_as_tun_mode.yml

@@ -52,6 +52,7 @@ log_minio:
 #########################################
 #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
@@ -164,3 +165,20 @@ tsg_master_entrance_id: 0
 sapp_prometheus_enable: 1
 sapp_prometheus_port: 9273
 sapp_prometheus_url_path: "/metrics"
+
+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_LOG_LEVEL: 10
+APP_SKETCH_LOG_PATH: "./tsglog/app_sketch_local/app_sketch_local"
+APP_SKETCH_L7_PROTOCOL_LABEL: "BASIC_PROTO_LABEL"
+APP_SKETCH_QOS: 1
+APP_SKETCH_PUBLISH_TOPIC: "APP_SIGNATURE_ID"
+APP_SKETCH_BROKER_LIST: "tcp://192.168.40.161:1883"

roles/app_proto_identify/tasks/main.yml

@@ -1,14 +0,0 @@
----
-- name: "copy app_proto_identify rpm package destination server"
-  copy:
-    src: "{{ role_path }}/files/"
-    dest: /tmp/ansible_deploy/
-
-- name: "install app_proto_identify"
-  yum:
-    name: "{{ app_packages }}"
-    state: present
-    skip_broken: yes
-  vars:
-    app_packages:
-      - /tmp/ansible_deploy/app_proto_identify-1.0.7.a5113ba-2.el7.x86_64.rpm

roles/docker-env/tasks/docker-ce.yml

@@ -0,0 +1,38 @@
+---
+- name: "docker-ce: copy docker-ce.zip to dest device"
+  copy:
+    src: '{{ role_path }}/files/docker-ce.zip'
+    dest: /tmp/ansible_deploy/
+    
+- name: "docker-ce: unarchive docker-ce.zip"
+  unarchive:
+    src: /tmp/ansible_deploy/docker-ce.zip
+    dest: /tmp/ansible_deploy/
+    remote_src: yes
+
+- name: "docker-ce: install docker-ce rpm package and dependencies"
+  yum:
+    name:
+      - /tmp/ansible_deploy/docker-ce/container-selinux-2.119.2-1.911c772.el7_8.noarch.rpm
+      - /tmp/ansible_deploy/docker-ce/docker-ce-19.03.13-3.el7.x86_64.rpm
+      - /tmp/ansible_deploy/docker-ce/docker-ce-cli-19.03.13-3.el7.x86_64.rpm
+      - /tmp/ansible_deploy/docker-ce/containerd.io-1.3.7-3.1.el7.x86_64.rpm
+      - /tmp/ansible_deploy/docker-ce/selinux-policy-targeted-3.13.1-266.el7_8.1.noarch.rpm
+      - /tmp/ansible_deploy/docker-ce/selinux-policy-3.13.1-266.el7_8.1.noarch.rpm
+      - /tmp/ansible_deploy/docker-ce/policycoreutils-python-2.5-34.el7.x86_64.rpm
+      - /tmp/ansible_deploy/docker-ce/policycoreutils-2.5-34.el7.x86_64.rpm
+      - /tmp/ansible_deploy/docker-ce/libselinux-utils-2.5-15.el7.x86_64.rpm
+      - /tmp/ansible_deploy/docker-ce/libselinux-python-2.5-15.el7.x86_64.rpm
+      - /tmp/ansible_deploy/docker-ce/libselinux-2.5-15.el7.x86_64.rpm
+      - /tmp/ansible_deploy/docker-ce/setools-libs-3.3.8-4.el7.x86_64.rpm
+      - /tmp/ansible_deploy/docker-ce/libsepol-2.5-10.el7.x86_64.rpm
+      - /tmp/ansible_deploy/docker-ce/libsemanage-python-2.5-14.el7.x86_64.rpm
+      - /tmp/ansible_deploy/docker-ce/libsemanage-2.5-14.el7.x86_64.rpm
+    state: present
+
+- name: "docker-ce: systemctl start docker and enabled docker"
+  systemd:
+    name: docker
+    enabled: yes
+    daemon_reload: yes
+    state: started

roles/docker-env/tasks/docker-compose.yml

@@ -0,0 +1,18 @@
+---
+- name: "docker-compose: copy docker-compose.zip to dest device"
+  copy:
+    src: '{{ role_path }}/files/docker-compose.zip'
+    dest: /tmp/ansible_deploy/
+
+- name: "docker-compose: unarchive docker-compose.zip"
+  unarchive:
+    src: /tmp/ansible_deploy/docker-compose.zip
+    dest: /tmp/ansible_deploy/
+    remote_src: yes
+
+- name: "docker-compose: install docker-compose using pip3"
+  pip:
+    requirements: /tmp/ansible_deploy/docker-compose/requirements.txt
+    extra_args: "--no-index --find-links=file:///tmp/ansible_deploy/docker-compose"
+    state: forcereinstall
+    executable: pip3

roles/docker-env/tasks/main.yml

@@ -0,0 +1,4 @@
+---
+- include: docker-ce.yml
+- include: python3.yml 
+- include: docker-compose.yml 

roles/docker-env/tasks/python3.yml

@@ -0,0 +1,21 @@
+---
+- name: "python3: copy python3.zip to dest device"
+  copy:
+    src: '{{ role_path }}/files/python3.zip'
+    dest: /tmp/ansible_deploy/
+    
+- name: "python3: unarchive python3.zip"
+  unarchive:
+    src: /tmp/ansible_deploy/python3.zip
+    dest: /tmp/ansible_deploy/
+    remote_src: yes
+
+- name: "python3: install python3 rpm package and dependencies"
+  yum:
+    name:
+      - /tmp/ansible_deploy/python3/python3-libs-3.6.8-13.el7.x86_64.rpm
+      - /tmp/ansible_deploy/python3/python3-3.6.8-13.el7.x86_64.rpm
+      - /tmp/ansible_deploy/python3/python3-pip-9.0.3-7.el7_7.noarch.rpm
+      - /tmp/ansible_deploy/python3/python3-setuptools-39.2.0-10.el7.noarch.rpm
+      - /tmp/ansible_deploy/python3/libtirpc-0.2.4-0.16.el7.x86_64.rpm
+    state: present

roles/firewall/tasks/main.yml

@@ -13,11 +13,11 @@
     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.9.b639626-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/dns-2.0.11.2265b5c-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.2.dab58fa-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.0.4.484b54d-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/fw_http_plug-3.1.5.69f6482-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/fw_mail_plug-3.0.2.7401550-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.0.6.a121701-2.el7.x86_64.rpm
@@ -25,8 +25,11 @@
       - /tmp/ansible_deploy/mail-1.0.9.c1d3bde-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/quic-1.1.17.8c22b4d-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/ssl-1.0.12.16b8fb5-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/tsg_conn_sketch-2.0.12.0ad5a3b-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/app_control_plug-1.0.9.97846eb-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/tsg_conn_sketch-2.1.4.f333054-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/rtp-1.0.4.91b4ab7-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/mesa_sip-1.0.9.ede6893-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/fw_voip_plug-1.0.2.090e5da-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/app_proto_identify-1.0.9.a6581a6-2.el7.x86_64.rpm
 
 - name: "Template the tsgconf/main.conf"
   template:

roles/firewall/templates/maat.conf.j2

@@ -32,5 +32,21 @@ 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
+
 [MAAT]
 ACCEPT_TAGS={"tags":[{"tag":"data_center","value":"{{ data_center }}"}]}

roles/firewall/templates/main.conf.j2

@@ -1,3 +1,10 @@
+[VOIP_PLUG]
+TIMEOUT=300
+LOG_PATH="./tsglog/fw_voip_plug/fw_voip_plug"
+LOG_LEVEL={{ fw_voip_log_level }}
+TABLE_TO=TSG_FIELD_SIP_TO
+TABLE_FROM=TSG_FIELD_SIP_FROM
+
 [FTP_PLUG]
 LOG_PATH="./tsglog/fw_ftp_plug/fw_ftp_plug"
 LOG_LEVEL={{ fw_ftp_log_level }}
@@ -54,6 +61,7 @@ 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"
@@ -62,3 +70,26 @@ DEVICE_ID_COMMAND="hostname | awk -F'-' '{print $3}'| awk -F'adc' '{print $2}'"
 
 [TSG_CONN_SKETCH]
 log_service=2
+
+
+[HOS_CONF]
+hos_serverip="{{ hos_serverip }}"
+hos_serverport={{ hos_serverport }}
+hos_accesskeyid="{{ hos_accesskeyid }}"
+hos_secretkey="{{ hos_secretkey }}"
+hos_poolsize={{ hos_poolsize }}
+hos_thread_sum={{ hos_thread_sum }}
+hos_cache_size={{ hos_cache_size }}
+hos_fs2_serverip="{{ hos_fs2_serverip }}"
+hos_fs2_serverport={{ hos_fs2_serverport }}
+
+[APP_SKETCH_LOCAL]
+LOG_LEVEL={{ APP_SKETCH_LOG_LEVEL }}
+LOG_PATH="{{ APP_SKETCH_LOG_PATH }}"
+L7_PROTOCOL_LABEL="{{ APP_SKETCH_L7_PROTOCOL_LABEL }}"
+
+[APP_SKETCH_FEEDBACK]
+QOS={{ APP_SKETCH_QOS }}
+PUBLISH_TOPIC="{{ APP_SKETCH_PUBLISH_TOPIC }}"
+#CLIENT_ID=
+BROKER_LIST="{{ APP_SKETCH_BROKER_LIST }}"

roles/framework/tasks/main.yml

@@ -12,7 +12,7 @@
     packages:
       - /tmp/ansible_deploy/libcjson-1.7.10.ab2896f-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/libdocumentanalyze-2.0.6.2d1abe0-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/libmaatframe-3.1.10.653727e-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/libmaatframe-3.1.14.673eeb9-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/libMESA_field_stat-1.0.2.6d45eed-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/libMESA_field_stat2-2.9.10.72ac4f1-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/libMESA_handle_logger-2.0.7.cb4ad71-2.el7.x86_64.rpm
@@ -25,6 +25,12 @@
       - /tmp/ansible_deploy/libWiredLB-2.0.5.4629165-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/lz4-1.7.5-3.el7.x86_64.rpm
       - /tmp/ansible_deploy/libbreakpad_mini-1.0.2.a56ef00-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/libaws-c-common-1.0.3.fa2adf0-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/libaws-c-event-stream-1.0.6.67fd944-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/libaws-checksums-1.0.6.8b09ac1-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/libaws-cpp-sdk-core-1.0.8.a3fe079-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/libaws-cpp-sdk-s3-2.0.0.f3c33ea-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/libhos-client-cpp-1.0.24.20e6f94-2.el7.x86_64.rpm  
 
 - name: "mkdir /etc/ld.so.conf.d/"
   file:

roles/kni/tasks/main.yml

@@ -7,7 +7,7 @@
 - name: "install kni rpms from localhost"
   yum:
     name:
-      - /tmp/ansible_deploy/kni-20.12.01.13e663f-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/kni-21.03.01.916999f-2.el7.x86_64.rpm
     state: present
 #    skip_broken: yes
 

roles/sapp/tasks/main.yml

@@ -13,7 +13,7 @@
 - name: "install sapp rpms from localhost"
   yum:
     name:
-      - /tmp/ansible_deploy/sapp-4.2.25.893d15d-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/sapp-4.2.26.fc1a6aa-2.el7.x86_64.rpm
     state: present
  
 - name: "install tcpdump_mesa rpms from localhost"

roles/tfe/tasks/main.yml

@@ -14,7 +14,7 @@
   yum:
     name:
       - /tmp/ansible_deploy/tfe-kmod-v1.0.5.20200408-1dkms.noarch.rpm
-      - /tmp/ansible_deploy/tfe-4.3.28.ce28c42-1.el7.x86_64.rpm
+      - /tmp/ansible_deploy/tfe-4.3.30.62dde9e-1.el7.x86_64.rpm
     state: present
 
 - name: "tfe:copy cert file to device"
@@ -74,6 +74,13 @@
     dest: /etc/systemd/system/tfe.service.d/
     mode: 0644
 
+- name: "enable tfe-env-tun-mode"
+  systemd:
+    name: tfe-env-tun-mode
+    enabled: yes
+    daemon_reload: yes
+  when: tsg_running_type == 0
+
 - name: "enable tfe-env"
   systemd:
     name: tfe-env

roles/tsg-diagnose/tasks/main.yml

@@ -0,0 +1,38 @@
+- name: "Tsg-diagnose:copy file to device"
+  copy:
+    src: '{{ role_path }}/files/'
+    dest: /tmp/ansible_deploy/
+    
+- name: "Install tsg-diagnose rpm package"
+  yum:
+    name:
+      - "/tmp/ansible_deploy/tsg-diagnose-21.03.01.39beba7-1.el7.x86_64.rpm"
+    state: present
+
+- name: "Templates tsg-diagnose.config"
+  template:
+    src: "{{role_path}}/templates/tsg-diagnose.config.j2"
+    dest: /opt/tsg/tsg-diagnose/etc/tsg-diagnose.config
+  tags: template
+
+- name: "tsg-diagnose:mkdir -p .badssl_cert_dict"
+  file:
+    path: /opt/tsg/tsg-diagnose/.badssl_cert_dict
+    state: directory
+
+
+- name: "tsg-diagnose: unarchive certs"
+  unarchive:
+    src: /tmp/ansible_deploy/tsg-diagnose-certs.tgz
+    dest: /opt/tsg/tsg-diagnose/.badssl_cert_dict
+    remote_src: yes
+
+- name: 'Tsg-diagnose service start'
+  systemd:
+    name: tsg-diagnose
+    enabled: yes
+    daemon_reload: yes
+    state: started
+
+- name: "tsg-diagnose init rsync deamon"
+  shell: /bin/sh /opt/tsg/tsg-diagnose/deploy/rsync/init_rsyncd.sh

roles/tsg-diagnose/templates/tsg-diagnose.config.j2

@@ -0,0 +1,135 @@
+[test_securityPolicy_bypass]
+# enabled = 1 run this case
+enabled = 1
+#Connection TIMEOUT, in seconds
+conn_timeout = 1
+#max_recv_speed_large  byte/s
+max_recv_speed_large = 6553600
+
+[test_securityPolicy_intercept]
+enabled = 1
+conn_timeout = 1
+max_recv_speed_large = 6553600
+
+[test_securityPolicy_intercept_certerrExpired]
+enabled = 1
+conn_timeout = 1
+max_recv_speed_large = 6553600
+
+[test_securityPolicy_intercept_certerrSelf_signed]
+enabled = 1
+conn_timeout = 1
+max_recv_speed_large = 6553600
+
+[test_securityPolicy_intercept_certerrUntrusted_root]
+enabled = 1
+conn_timeout = 1
+max_recv_speed_large = 6553600
+
+[test_proxyPolicy_ssl_redirect]
+enabled = 1
+conn_timeout = 1
+max_recv_speed_large = 6553600
+
+[test_proxyPolicy_ssl_block]
+enabled = 1
+conn_timeout = 1
+max_recv_speed_large = 6553600
+
+[test_proxyPolicy_ssl_replace]
+enabled = 1
+conn_timeout = 1
+max_recv_speed_large = 6553600
+
+[test_proxyPolicy_ssl_hijack]
+enabled = 1
+conn_timeout = 1
+max_recv_speed_large = 6553600
+
+[test_proxyPolicy_ssl_insert]
+enabled = 1
+conn_timeout = 1
+max_recv_speed_large = 6553600
+
+[test_proxyPolicy_http_redirect]
+enabled = 1
+conn_timeout = 1
+max_recv_speed_large = 6553600
+
+[test_proxyPolicy_http_block]
+enabled = 1
+conn_timeout = 1
+max_recv_speed_large = 6553600
+
+[test_proxyPolicy_http_replace]
+enabled = 1
+conn_timeout = 1
+max_recv_speed_large = 6553600
+
+[test_proxyPolicy_http_hijack]
+enabled = 1
+conn_timeout = 1
+max_recv_speed_large = 6553600
+
+[test_proxyPolicy_http_insert]
+enabled = 1
+conn_timeout = 1
+max_recv_speed_large = 6553600
+
+[test_https_con_traffic_1k]
+enabled = 1
+conn_timeout = 1
+max_recv_speed_large = 6553600
+
+[test_https_con_traffic_4k]
+enabled = 1
+conn_timeout = 1
+max_recv_speed_large = 6553600
+
+[test_https_con_traffic_16k]
+enabled = 1
+conn_timeout = 1
+max_recv_speed_large = 6553600
+
+[test_https_con_traffic_64k]
+enabled = 1
+conn_timeout = 1
+max_recv_speed_large = 6553600
+
+[test_https_con_traffic_256k]
+enabled = 1
+conn_timeout = 1
+max_recv_speed_large = 6553600
+
+[test_https_con_traffic_1M]
+enabled = 1
+conn_timeout = 1
+max_recv_speed_large = 6553600
+
+[test_https_con_traffic_4M]
+enabled = 1
+conn_timeout = 1
+max_recv_speed_large = 6553600
+
+[test_https_con_traffic_16M]
+enabled = 1
+conn_timeout = 4
+max_recv_speed_large = 6553600
+
+[test_https_con_traffic_64M]
+enabled = 1
+conn_timeout = 12
+max_recv_speed_large = 6553600
+
+[start_time_random_delay_range]
+enabled = 1
+#Left_edge is the left edge of the randomly generated time in seconds
+left_edge = 0
+#Left_edge is the right edge of the randomly generated time in seconds
+right_edge = 30
+
+[telegraf]
+host = 192.51.100.1
+port = 58100
+tags_key = app_name
+tags_value = tsg-diagnose

roles/tsg-diagnose_stop_sync/tasks/main.yml

@@ -0,0 +1,3 @@
+- name: "tsg-diagnose:  stop rsync deamon process"
+  shell: killall -9 rsync
+

roles/tsg-diagnose_sync_ca/files/tsg_diagnose_ca.pem

@@ -0,0 +1,49 @@
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIB8jCCAVugAwIBAgIJAP3GpXchIMWHMA0GCSqGSIb3DQEBCwUAMBExDzANBgNV
+BAsMBkdFRURHRTAgFw0yMDAzMDkxNjEyNTlaGA8yMDUwMDMwMjE2MTI1OVowETEP
+MA0GA1UECwwGR0VFREdFMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCraZpH
+Fca2Iu+9E9HzKbEi2Akdk4RrUJxkQjB2Tr7fGxwPDXqdGvSoXDdgnSA0I0bbNqMs
+drgiCWimjnGiWfY0sssKg7plNTQ4i7Zz7P9Isyf6TuxvB09CzdhH2FQ3lLRTb8pv
+BA0E28CCYiZhtX1/3RlDSvxaRKOM3yEt0q+FRQIDAQABo1AwTjAdBgNVHQ4EFgQU
+NqrpSlpCuMBJlCLZEE/D5ZpBy8swHwYDVR0jBBgwFoAUNqrpSlpCuMBJlCLZEE/D
+5ZpBy8swDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOBgQBsybFxUAjzhJ5H
+VbSLhyillxtAJ3vEKtLrMVnAgRUEwamyu1JQGndF9kh8RapSmHhmuZM9iTc+NsNb
+DKGKmEOY0vQMw83xE7EGYj4Nhww9UMyGglmTLbd3yB+uJA97beNVduU2mifDHGmN
+4buMiPl3AozGRl9p5UCzZM5XxMMw1A==
+-----END CERTIFICATE-----

roles/tsg-diagnose_sync_ca/tasks/main.yml

@@ -0,0 +1,15 @@
+- name: "tsg-diagnose: rsync badssl ca certs"
+  shell: rsync -avzP --delete 192.168.100.1::blade0toother /tmp/sync/
+  ignore_errors: true
+
+- name: "tsg-diagnose: add badssl ca file to tfe tls-ca-bundle"
+  shell: cat /tmp/sync/ca-root.crt > /opt/tsg/tfe/resource/tfe/tsg_diagnose_ca.pem && cat /tmp/sync/wpr_cert.pem >> /opt/tsg/tfe/resource/tfe/tsg_diagnose_ca.pem
+  ignore_errors: true
+  register: result_tsg_diagnose_sync_cert_shell
+
+- name: "Tsg-diagnose:copy cert file to device"
+  copy:
+    src: '{{ role_path }}/files/tsg_diagnose_ca.pem'
+    dest: /opt/tsg/tfe/resource/tfe/
+  when: result_tsg_diagnose_sync_cert_shell.rc==1
+

roles/tsg_app/tasks/main.yml

@@ -11,28 +11,6 @@
     skip_broken: yes
   vars:
     app_packages:
-      - /tmp/ansible_deploy/app_master-1.0.5.5a4fb22-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/app_control_plug-1.0.3.447fc53-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/app_proto_identify-1.0.5.5c5342a-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/app_sketch_local-1.0.4.0edaf58-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/app_sketch_local-2.0.2.edf4fb0-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"
-    dest: /home/mesasoft/sapp_run/appconf/main.conf
-  tags: template
-  when: tsg_app_enable == 1
-
-- name: "Template the appconf/maat.conf"
-  template:
-    src: "{{ role_path }}/templates/maat.conf.j2"
-    dest: /home/mesasoft/sapp_run/appconf/maat.conf
-  tags: template
-  when: tsg_app_enable == 1

roles/tsg_app/templates/maat.conf.j2

@@ -1,34 +0,0 @@
-[APP_SIGNATURE_MAAT]
-MAAT_MODE=2
-STAT_SWITCH=1
-PERF_SWITCH=1
-TABLE_INFO=appconf/app_id_tableinfo.conf
-STAT_FILE=app_id_maat.status
-EFFECT_INTERVAL_S=1
-REDIS_IP={{ maat_redis_server.address }}
-REDIS_PORT_NUM=1
-REDIS_PORT={{ maat_redis_server.port }}
-REDIS_INDEX={{ maat_redis_server.db }}
-JSON_CFG_FILE=appconf/app_id_maat.json
-INC_CFG_DIR=apprule/inc/index/
-FULL_CFG_DIR=apprule/full/index/
-EFFECTIVE_RANGE_FILE=/opt/app/etc/app_device_tag.json
-
-[APP_ACTION_MAAT]
-MAAT_MODE=2
-STAT_SWITCH=1
-PERF_SWITCH=1
-TABLE_INFO=appconf/app_action_tableinfo.conf
-STAT_FILE=app_action_maat.status
-EFFECT_INTERVAL_S=1
-REDIS_IP={{ maat_redis_server.address }}
-REDIS_PORT_NUM=1
-REDIS_PORT={{ maat_redis_server.port }}
-REDIS_INDEX={{ maat_redis_server.db }}
-JSON_CFG_FILE=appconf/app_action_maat.json
-INC_CFG_DIR=apprule/inc/index/
-FULL_CFG_DIR=apprule/full/index/
-EFFECTIVE_RANGE_FILE=/opt/tsg/etc/tsg_device_tag.json
-
-[MAAT]
-ACCEPT_TAGS={"tags":[{"tag":"device_id","value":"device_1"}]}

roles/tsg_app/templates/main.conf.j2

@@ -1,39 +0,0 @@
-[FEEDBACK]
-QOS=1
-PUBLISH_TOPIC=APP_SIGNATURE_ID
-#CLIENT_ID=
-BROKER_LIST=tcp://{{ app_global_ip }}:1883
-
-[LUA]
-ENABLE=1
-
-[MAAT]
-PROFILE=./appconf/maat.conf
-
-[APP_LOG]
-MODE=1
-LOG_LEVEL={{ applog_level }}
-LOG_PATH=./applog/applog
-BROKER_LIST={{ log_kafkabrokers.address | join(",") }}
-COMMON_FIELD_FILE=appconf/app_log_field.conf
-
-[FIELD_STAT]
-CYCLE=5
-TELEGRAF_PORT=8100
-TELEGRAF_IP=127.0.0.1
-OUTPUT_PATH=./app_stat.log
-APP_NAME=app_master
-
-[SYSTEM]
-LOG_LEVEL={{ app_master_log_level }}
-LOG_PATH=./applog/app_master
-NIC_NAME={{ nic_mgr.name }}
-
-[APP_SKETCH_LOCAL]
-LOG_LEVEL={{ app_sketch_local_log_level }}
-LOG_PATH=./applog/app_sketch_local/app_sketch_local
-
-[CONTROL_PLUG]
-LOG_LEVEL={{ app_control_plug_log_level }}
-LOG_PATH=./applog/app_control_plug/app_control_plug
-

roles/tsg_master/tasks/main.yml

@@ -6,6 +6,6 @@
 - name: "install tsg_master from localhost"
   yum:
     name:
-      - /tmp/ansible_deploy/tsg_master-3.3.15.7ddb2f1-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/tsg_master-3.4.6.3851946-2.el7.x86_64.rpm
     state: present
     skip_broken: yes

server_deploy.yml

@@ -19,12 +19,6 @@
     - {role: maat-redis, tags: maat-redis, when: deploy_mode == "cluster"}
     - {role: tfe, tags: tfe}
     - {role: telegraf_statistic, tags: telegraf_statistic}
-    - {role: app_proto_identify, tags: app_proto_identify}
-#    - {role: proxy_status, tags: proxy_status}
-#    - {role: adc_exporter, tags: adc_exporter}
-#    - {role: adc_exporter_proxy, tags: adc_exporter_proxy}
-#    - tsg_device_tag
-#    - reboot
 
 - hosts: packet_dump_server
   remote_user: root