20.11.rc3 rebase version 20.11dpi-version20.11.rc3-deploy

7 files changed, 39 insertions, 45 deletions

diff --git a/install_config/group_vars/.server_as_tun_mode.yml.swp b/install_config/group_vars/.server_as_tun_mode.yml.swp
new file mode 100644
index 0000000..1cf82cf
--- /dev/null
+++ b/install_config/group_vars/.server_as_tun_mode.yml.swp
diff --git a/install_config/group_vars/adc_global.yml b/install_config/group_vars/adc_global.yml
index 3977194..81229fa 100644
--- a/install_config/group_vars/adc_global.yml
+++ b/install_config/group_vars/adc_global.yml
@@ -3,19 +3,16 @@
 tsg_access_type: 2
 #####2: ADC;
 tsg_running_type: 2
-
+#####deploy mode: cluster, single
+deploy_mode: "cluster"
 ########################################
 #Deploy_finished_reboot
 Deploy_finished_reboot: 0
 
 ########################################
-#TSG Cluster Mode
-tsg_cluster_mode: 0
-
-########################################
 #IP Config
 maat_redis_city_server:
-  address: "10.9.62.253"
+  address: "10.4.62.253"
   port: 7002
 
 maat_redis_server:
@@ -35,16 +32,10 @@ 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"
+  address: "10.4.62.253"
   port: 9090
 
 #########################################
@@ -55,6 +46,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
@@ -66,7 +58,7 @@ tfe_http_log_level: FATAL
 pangu_log_level: FATAL
 doh_log_level: FATAL
 
-certstore_log_level: 30
+certstore_log_level: FATAL
 packet_dump_log_level: 10
 
 #######################################
@@ -103,9 +95,12 @@ tfe:
 ########################################
 #Marsio Config
 #marsio工作在ADC计算板时，建议使用如下配置，以保证更高的处理性能
-mrzcpd:
+mcn0_mrzcpd:
   iocore: 52,53,54,55
 
+mcn123_mrzcpd:
+  iocore: 54,55
+
 mrtunnat:
   lcore_id: 48,49,50,51 
 
@@ -118,10 +113,12 @@ app_master_log_level: 10
 app_sketch_local_log_level: 10
 app_control_plug_log_level: 10
 
-
-breakpad_upload_url: http://10.4.63.4:9000/api/2/minidump/?sentry_key=3556bac347c74585a994eb6823faf5c6
-
+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"
diff --git a/install_config/group_vars/adc_mcn0.yml b/install_config/group_vars/adc_mcn0.yml
index d0d8227..60bfaf0 100644
--- a/install_config/group_vars/adc_mcn0.yml
+++ b/install_config/group_vars/adc_mcn0.yml
@@ -37,5 +37,5 @@ AllotAccess:
   virturlID_4: 1302
   #vvipv4_mask: 24
   #vvipv6_mask: 64
- 
+
 bladename: mcn0
diff --git a/install_config/group_vars/adc_mcn2.yml b/install_config/group_vars/adc_mcn2.yml
index 10d00df..ff33049 100644
--- a/install_config/group_vars/adc_mcn2.yml
+++ b/install_config/group_vars/adc_mcn2.yml
@@ -15,5 +15,5 @@ nic_inner_ctrl:
 nic_traffic_mirror:
   name: ens8f2
   use_mrzcpd: 1
-
+  
 bladename: mcn2
\ No newline at end of file
diff --git a/install_config/group_vars/adc_mcn3.yml b/install_config/group_vars/adc_mcn3.yml
index df3846c..51b1e09 100644
--- a/install_config/group_vars/adc_mcn3.yml
+++ b/install_config/group_vars/adc_mcn3.yml
@@ -15,5 +15,5 @@ nic_inner_ctrl:
 nic_traffic_mirror:
   name: ens8f2
   use_mrzcpd: 1
-
+  
 bladename: mcn3
\ No newline at end of file
diff --git a/install_config/group_vars/server_as_tun_mode.yml b/install_config/group_vars/server_as_tun_mode.yml
index 21bc996..55e1a28 100644
--- a/install_config/group_vars/server_as_tun_mode.yml
+++ b/install_config/group_vars/server_as_tun_mode.yml
@@ -1,18 +1,17 @@
 #########################################
-#####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:
   name: eth0
@@ -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"
diff --git a/install_config/hosts b/install_config/hosts
index 8715518..0fe8b50 100644
--- a/install_config/hosts
+++ b/install_config/hosts
@@ -7,7 +7,8 @@
 #20.09版本新增APP部署
 #[app_global]
 #0.0.0.0
-#[server-as-tun-mode]
+
+#[server_as_tun_mode]
 #1.1.1.1 device_id=device_1
 #
 #[adc_mxn]
@@ -29,19 +30,16 @@
 #[adc_mcn3]
 #10.3.76.1 device_id=device_1
 #10.3.76.2 device_id=device_2
-#[app_global]
 
-#[server-as-tun-mode]
-#p
-#[adc_mxn]
+#[app_global]
+#[server_as_tun_mode]
+#broken warning:
+#10.4.52.71
 [adc_mcn0]
-10.9.51.[1:15]
 [adc_mcn1]
-10.9.52.[1:15]
 [adc_mcn2]
-10.9.53.[1:15]
 [adc_mcn3]
-10.9.54.[1:14]
-[packet_dump_server]
-10.9.61.3
+[app_global]
+[server_as_tun_mode]
+