1、新增dump_rtp_pcap安装2、整合配置变量

2 files changed, 72 insertions, 54 deletions

diff --git a/install_config/group_vars/adc_global.yml b/install_config/group_vars/adc_global.yml
index 50ba1e1..008e5fa 100644
--- a/install_config/group_vars/adc_global.yml
+++ b/install_config/group_vars/adc_global.yml
@@ -70,6 +70,9 @@ sapp:
   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,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43
   inbound_route_dir: 1
+  prometheus_enable: 1
+  prometheus_port: 9273
+  prometheus_url_path: "/metrics"
 
 ########################################
 #Kni Config
@@ -107,38 +110,42 @@ mrtunnat:
 
 #########################################
 #Tsg_app
-tsg_app_enable: 0
-app_global_ip: "1.1.1.1"
-applog_level: 10
-app_master_log_level: 10
-app_sketch_local_log_level: 10
-app_control_plug_log_level: 10
+tsg_app:
+  enable: 0
 
 breakpad_upload_url: http://10.4.63.4:9000/api/2/minidump/?sentry_key=3203b43fd5384a7dbe6a48ecb1f3c595
 data_center: Kyzylorda
 tsg_master_entrance_id: 9
 nic_mgr: 
    name: em1
-   
-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"
 
+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_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"
+
+
+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
diff --git a/install_config/group_vars/server_as_tun_mode.yml b/install_config/group_vars/server_as_tun_mode.yml
index 2b8304f..3812230 100644
--- a/install_config/group_vars/server_as_tun_mode.yml
+++ b/install_config/group_vars/server_as_tun_mode.yml
@@ -81,6 +81,10 @@ sapp:
   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"
+
 
 #########################################
 #Sapp Double-Arm Config
@@ -121,12 +125,8 @@ mrtunnat:
 
 #########################################
 #Tsg_app
-tsg_app_enable: 1
-app_global_ip: "1.1.1.1"
-applog_level: 10
-app_master_log_level: 10
-app_sketch_local_log_level: 10
-app_control_plug_log_level: 10
+tsg_app:
+  enable: 1
 
 #########################################
 #ATCA Config
@@ -162,23 +162,34 @@ breakpad_upload_url: http://127.0.0.1:9000/api/2/minidump/?sentry_key=3556bac347
 data_center: Beijing
 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"
\ No newline at end of file
+
+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_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"
+
+
+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