gfwleak/tsg-tsg-os-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新tfe到v4.8.52, 版本修改: 优化kafka句柄创建和TOPIC注册

Browse Source
This commit is contained in:
fengweihao
2023-12-19 15:43:49 +08:00
parent 66cd696e5b
commit 5a3e9fcf2e
3 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/install_config/group_vars/rpm_version.yml
View File

@@ -77,8 +77,8 @@ sapp_rpm_version:
sapp-pr: sapp-pr-4.3.34.10b3243
tfe_rpm_version:
tfe: tfe-4.8.51.b370096
tfe-pr: tfe-pr-4.8.51.b370096
tfe: tfe-4.8.52.7fcaefc
tfe-pr: tfe-pr-4.8.52.7fcaefc
tsg_app_rpm_version:
context_based_detector: context_based_detector-6.0.1.24ae5b9

9
ansible/roles/tfe/templates/tfe.conf.j2.j2
View File

@@ -122,14 +122,6 @@ key_log_file=log/sslkeylog.log
# mid cert cache
mc_cache_enable=1
mc_vsystem_id={% raw %}{{ vsys_id }}
{% endraw %}
mc_cache_eth={{ control_and_policy.nic_name }}
{% raw %}mc_cache_broker_list={{ olap.kafka_broker.address_list | join(",") }}
{% endraw %}
mc_cache_topic=PXY-EXCH-INTERMEDIA-CERT
sasl_username=admin
sasl_passwd=galaxy2019
[key_keeper]
#Mode: debug - generate cert with ca_path, normal - generate cert with cert store
@@ -212,6 +204,7 @@ NIC_NAME={{ control_and_policy.nic_name }}
{% endraw %}
logger_send_topic=PROXY-EVENT
file_bucket_topic=TRAFFIC-FILE-STREAM-RECORD
mc_cache_topic=PXY-EXCH-INTERMEDIA-CERT
sasl_username=admin
sasl_passwd=galaxy2019
device_id_filepath=/opt/tsg/etc/tsg_sn.json

6
ansible/roles/traffic-engine/files/helm/conf/tfe.conf
View File

@@ -97,11 +97,6 @@ key_log_file=log/sslkeylog.log
# mid cert cache
mc_cache_enable=1
mc_vsystem_id={{ .Values.vsys_id }}
mc_cache_broker_list={{- include "traffic-engine.config.olap-address" (list . ",") }}
mc_cache_topic=PXY-EXCH-INTERMEDIA-CERT
sasl_username={{ .Values.external_resources.olap.kafka_brokers.sasl_username }}
sasl_passwd={{ .Values.external_resources.olap.kafka_brokers.sasl_password }}
[key_keeper]
#Mode: debug - generate cert with ca_path, normal - generate cert with cert store
@@ -179,6 +174,7 @@ enable=1
kafka_brokerlist={{- include "traffic-engine.config.olap-address" (list . ",") }}
logger_send_topic=PROXY-EVENT
file_bucket_topic=TRAFFIC-FILE-STREAM-RECORD
mc_cache_topic=PXY-EXCH-INTERMEDIA-CERT
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