update new 20.08

This commit is contained in:
zhangzhihan
2020-09-10 03:22:39 +08:00
parent e088bc922b
commit 1d210d18c4
44 changed files with 448 additions and 431 deletions

View File

@@ -7,7 +7,7 @@ enable=1
# RLOG_LV_DEBUG : 10
# RLOG_LV_INFO : 20
# RLOG_LV_FATAL : 30
log_level=10
log_level={{ doh_log_level }}
[maat]
# default TSG_OBJ_APP_ID

View File

@@ -1,5 +1,5 @@
[STAT]
no_stats=0
statsd_server={{ fs_remote.address }}
statsd_port={{ fs_remote.port }}
statsd_server=127.0.0.1
statsd_port=8100
histogram_bins=0.50,0.80,0.9,0.95

View File

@@ -1,7 +1,9 @@
[debug]
log_level=10
log_level={{ pangu_log_level }}
[log]
# default 1, if enable "en_sendlog", the iterm "tfe.conf [kafka] enable" must set 1
en_sendlog=1
entrance_id=0
#Addresses of minio. Format is defined by WiredLB.

View File

@@ -1,5 +1,5 @@
{% if tsg_access_type == 4 %}
TFE_DEVICE_DATA_INCOMING={ nic_data_incoming.vf2_name }}
TFE_DEVICE_DATA_INCOMING={{ nic_data_incoming.vf2_name }}
{% elif tsg_running_type == 0 %}
TFE_DEVICE_DATA_INCOMING=tun_kni
{% else %}
@@ -14,7 +14,7 @@ TFE_PEER_MAC_DATA_INCOMING=aa:bb:cc:dd:ee:ff
TFE_LOCAL_IP_DATA_INCOMING=172.16.241.2
TFE_PEER_IP_DATA_INCOMING=172.16.241.1
{% if tsg_running_type == 0 or 1 %}
TFE_WATCHDOG_DEVICE={{ server.tun_name }}
{% if tsg_running_type == 0 %}
TFE_WATCHDOG_DEVICE={{ nic_inner_ctrl.name }}
TFE_WATCHDOG_IP=192.168.100.1
{% endif %}

View File

@@ -32,11 +32,7 @@ service_cache_expire_seconds=600
# default 0
mc_cache_enable=1
# default eth0
{% if tsg_running_type == 0 or 1 %}
mc_cache_eth={{ server.tun_name }}
{% else %}
mc_cache_eth={{ nic_inner_ctrl.name }}
{% endif %}
# default NULL
mc_cache_broker_list={{ log_kafkabrokers.address }}
# default PXY-EXCH-INTERMEDIA-CERT
@@ -59,12 +55,14 @@ enable_health_check=1
passthrough_all_tcp=0
[traffic_mirror]
{% if tsg_running_type == 0 or 1 %}
{% if tsg_running_type == 0 %}
device=lo
type=0
{% else %}
device={{ nic_traffic_mirror.name }}
type=1
{% endif %}
type=0
[ratelimit]
#read_rate=200000
@@ -82,25 +80,21 @@ tcp_ttl_upstream=75
tcp_ttl_downstream=70
[log]
level=10
level={{ tfe_log_level }}
[stat]
statsd_server={{ fs_remote.address }}
statsd_port={{ fs_remote.port }}
statsd_server=127.0.0.1
statsd_port=8100
statsd_cycle=5
# FS_OUTPUT_STATSD=1, FS_OUTPUT_INFLUX_LINE=2
statsd_format=2
[http]
loglevel=10
loglevel={{ tfe_http_log_level }}
[kafka]
enable=1
{% if tsg_running_type == 0 or 1 %}
nic_name={{ server.ethname }}
{% else %}
nic_name={{ nic_mgr.name }}
{% endif %}
kafka_brokerlist={{ log_kafkabrokers.address }}
kafka_topic=PROXY-EVENT-LOG
device_id_filepath=/opt/tsg/etc/tsg_sn.json