summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfengweihao <[email protected]>2023-12-15 16:34:36 +0800
committer付明卫 <[email protected]>2023-12-15 09:21:20 +0000
commitb22d48f6b34d94974e5f50f04af628d45a9c95af (patch)
tree69dd8b26663cdba53a91575d36d9cf25b2a5043d
parentc0fd5c6afe0df36c3f65250bb2b903ed7b953d63 (diff)
更新tfe到v4.8.51, 版本修改: TSG-17862 Proxy支持Internal IP address和Exteral IP Address的扫描dev-23.12
-rw-r--r--ansible/install_config/group_vars/rpm_version.yml4
-rw-r--r--ansible/roles/tfe/templates/tfe.conf.j2.j23
-rw-r--r--ansible/roles/traffic-engine/files/helm/conf/tfe.conf3
3 files changed, 6 insertions, 4 deletions
diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml
index 4b4cfdf7..127b0153 100644
--- a/ansible/install_config/group_vars/rpm_version.yml
+++ b/ansible/install_config/group_vars/rpm_version.yml
@@ -77,8 +77,8 @@ sapp_rpm_version:
sapp-pr: sapp-pr-4.3.34.10b3243
tfe_rpm_version:
- tfe: tfe-4.8.50.b801ca9
- tfe-pr: tfe-pr-4.8.50.b801ca9
+ tfe: tfe-4.8.51.b370096
+ tfe-pr: tfe-pr-4.8.51.b370096
tsg_app_rpm_version:
context_based_detector: context_based_detector-6.0.1.24ae5b9
diff --git a/ansible/roles/tfe/templates/tfe.conf.j2.j2 b/ansible/roles/tfe/templates/tfe.conf.j2.j2
index db7bbe35..8385c45e 100644
--- a/ansible/roles/tfe/templates/tfe.conf.j2.j2
+++ b/ansible/roles/tfe/templates/tfe.conf.j2.j2
@@ -210,7 +210,8 @@ enable=1
NIC_NAME={{ control_and_policy.nic_name }}
{% raw %}kafka_brokerlist={{ olap.kafka_broker.address_list | join(",") }}
{% endraw %}
-kafka_topic=PROXY-EVENT
+logger_send_topic=PROXY-EVENT
+file_bucket_topic=TRAFFIC-FILE-STREAM-RECORD
sasl_username=admin
sasl_passwd=galaxy2019
device_id_filepath=/opt/tsg/etc/tsg_sn.json
diff --git a/ansible/roles/traffic-engine/files/helm/conf/tfe.conf b/ansible/roles/traffic-engine/files/helm/conf/tfe.conf
index 55a6624c..188902eb 100644
--- a/ansible/roles/traffic-engine/files/helm/conf/tfe.conf
+++ b/ansible/roles/traffic-engine/files/helm/conf/tfe.conf
@@ -177,7 +177,8 @@ default_vlan_id=0
[kafka]
enable=1
kafka_brokerlist={{- include "traffic-engine.config.olap-address" (list . ",") }}
-kafka_topic=PROXY-EVENT
+logger_send_topic=PROXY-EVENT
+file_bucket_topic=TRAFFIC-FILE-STREAM-RECORD
sasl_username={{ .Values.external_resources.olap.kafka_brokers.sasl_username }}
sasl_passwd={{ .Values.external_resources.olap.kafka_brokers.sasl_password }}
device_id_filepath=/opt/tsg/etc/tsg_sn.json