From d0004d07d48f8765425e640960ea18cef2233e10 Mon Sep 17 00:00:00 2001
From: luwenpeng <luwenpeng@zdjizhi.com>
Date: Fri, 20 Aug 2021 16:31:03 +0800
Subject: [PATCH] update tfe form 4.5.11 to 4.5.12

---
 .../install_config/group_vars/rpm_version.yml    |  2 +-
 ansible/roles/tfe/templates/tfe.conf.j2.j2       | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml
index 4f14688f..26007ea6 100644
--- a/ansible/install_config/group_vars/rpm_version.yml
+++ b/ansible/install_config/group_vars/rpm_version.yml
@@ -55,7 +55,7 @@ sapp_rpm_version:
   tcpdump_mesa: tcpdump_mesa-1.0.6.faa4eba
 
 tfe_rpm_version:
-  tfe: tfe-4.5.11.2a729a4
+  tfe: tfe-4.5.12.f764a4b
 
 tsg_app_rpm_version:
   app_sketch_local: app_sketch_local-4.1.2.d1660e6
diff --git a/ansible/roles/tfe/templates/tfe.conf.j2.j2 b/ansible/roles/tfe/templates/tfe.conf.j2.j2
index f869fcd6..0c2f3792 100644
--- a/ansible/roles/tfe/templates/tfe.conf.j2.j2
+++ b/ansible/roles/tfe/templates/tfe.conf.j2.j2
@@ -63,8 +63,18 @@ cmsg_port=2475
 watchdog_switch=1
 watchdog_port=2476
 
+[watchdog_tfe]
+# The worker thread updates the timestamp every two seconds
+# The watchdog thread checks the timestamp every second
+enable=1
+timeout_seconds=5
+statistics_window=20
+timeout_cnt_as_fail=3
+timeout_debug=0
+
 [ssl]
 ssl_ja3_debug=0
+ssl_ja3_table=PXY_SSL_FINGERPRINT
 # ssl version Not available, configured via TSG website
 # ssl_max_version=tls13
 # ssl_min_version=ssl3
@@ -111,8 +121,8 @@ mc_cache_eth={{ tfe.tfe_conf.ssl.mc_cache_eth }}
 {% raw %}mc_cache_broker_list={{ olap.kafka_broker.address_list | join(",") }}
 {% endraw %}
 mc_cache_topic=PXY-EXCH-INTERMEDIA-CERT
-
-ssl_ja3_table=PXY_SSL_FINGERPRINT
+sasl_username=admin
+sasl_passwd=galaxy2019
 
 [key_keeper]
 #Mode: debug - generate cert with ca_path, normal - generate cert with cert store
@@ -189,6 +199,8 @@ NIC_NAME={{ tfe.tfe_conf.kafka.NIC_NAME }}
 {% raw %}kafka_brokerlist={{ olap.kafka_broker.address_list | join(",") }}
 {% endraw %}
 kafka_topic=PROXY-EVENT-LOG
+sasl_username=admin
+sasl_passwd=galaxy2019
 device_id_filepath=/opt/tsg/etc/tsg_sn.json
 
 [maat]