20.11.rc3 rebase version 20.11

install_config/group_vars/server_as_tun_mode.yml

@@ -1,17 +1,16 @@
 #########################################
-#####0: Pcap;  1: Inline_device;  4: ATCA_Vlan_Flipping;  5:ATCA_VXLAN;
+#####0: Pcap;  1: Inline_device;   5:ATCA_VXLAN;
 tsg_access_type: 0
 #####0: Tun_mode;  1: normal;
 tsg_running_type: 0
 
+#####deploy mode: cluster, single
+deploy_mode: "single"
+
 ########################################
 #Deploy_finished_reboot
 Deploy_finished_reboot: 0
 
-########################################
-#TSG Cluster Mode
-tsg_cluster_mode: 0
-
 ########################################
 #Server Basic Config
 nic_mgr:
@@ -44,17 +43,12 @@ cert_store_server:
   port: 9991
 
 log_kafkabrokers:
-  address: "10.9.61.4:9092,10.9.61.5:9092,10.9.61.6:9092"
-
-telegraf_kafkabrokers:
-  address: "\"10.9.61.4:9092\",\"10.9.61.5:9092\",\"10.9.61.6:9092\""
-
-monitor_outputs_influxdb:
-  url: "http://127.0.0.1:58086"
+  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
@@ -63,6 +57,7 @@ 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
@@ -165,3 +160,7 @@ 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"