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

更新http、session_record、firewall, 修复:

Browse Source 
firewall: TCP/UDP未注册FS Line ID, 使用FS-operate函数操作可能会导致重启
http,session_record: 修正输出本地日志的级别
This commit is contained in:
liuxueli
2023-07-12 23:43:26 +08:00
parent 069ecd24a0
commit 079e9646db
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,8 +4,8 @@ certstore_rpm_version:
firewall_rpm_version: firewall_rpm_version:
capture_packet_plug: capture_packet_plug-5.0.6.1820f69 capture_packet_plug: capture_packet_plug-5.0.6.1820f69
conn_telemetry: conn_telemetry-1.0.3.4ef6df6 conn_telemetry: conn_telemetry-1.0.3.4ef6df6
firewall: firewall-2.0.13.94a9a55 firewall: firewall-2.0.14.e78add7
session_record: session_record-4.1.4.118c7d7 session_record: session_record-4.1.5.291307e
gtp_signaling_plug: gtp_signaling_plug-2.0.0.3f233d7 gtp_signaling_plug: gtp_signaling_plug-2.0.0.3f233d7
tsg_vulpes: tsg_vulpes-1.0.9.0d7c615 tsg_vulpes: tsg_vulpes-1.0.9.0d7c615
radius_collect_plug: radius_collect_plug-2.0.11.47a51f3 radius_collect_plug: radius_collect_plug-2.0.11.47a51f3
@@ -14,7 +14,7 @@ firewall_rpm_version:
tsg_ddos_sketch: tsg_ddos_sketch-1.3.5.447bcc2 tsg_ddos_sketch: tsg_ddos_sketch-1.3.5.447bcc2
dns: dns-2.1.6.8cfb357 dns: dns-2.1.6.8cfb357
ftp: ftp-1.0.15.1fc64fe ftp: ftp-1.0.15.1fc64fe
http: http-2.0.12.0747ada http: http-2.0.13.5efe313
mail: mail-1.0.19.e982b44 mail: mail-1.0.19.e982b44
quic: quic-2.0.6.513732e quic: quic-2.0.6.513732e
ssl: ssl-3.0.0.a52514a ssl: ssl-3.0.0.a52514a

10
ansible/roles/firewall/templates/main.conf.j2.j2
View File

@@ -61,8 +61,8 @@ APP_NAME="app_metric"
[FIELD_STAT] [FIELD_STAT]
CYCLE=5 CYCLE=5
TELEGRAF_PORT=8100 #TELEGRAF_PORT=8200
TELEGRAF_IP="127.0.0.1" #TELEGRAF_IP="127.0.0.1"
OUTPUT_PATH="log/master.status" OUTPUT_PATH="log/master.status"
APP_NAME="tsg_master" APP_NAME="tsg_master"
@@ -91,6 +91,12 @@ DEVICE_SEQ_IN_DATA_CENTER={{ session_id_generator.snowflake_worker_id_offset }}
{% endraw %} {% endraw %}
FEATURE_TAMPER=1 FEATURE_TAMPER=1
[FIREWALL]
CYCLE=30
#TELEGRAF_PORT=8500
#TELEGRAF_IP=127.0.0.1
OUTPUT_PATH="log/firewall.status"
[SESSION_RECORD] [SESSION_RECORD]
interim_intervals_time = 120 interim_intervals_time = 120
sendlog_in_tcp_close=1 sendlog_in_tcp_close=1

10
ansible/roles/traffic-engine/files/helm/conf/main.conf
View File

@@ -58,8 +58,8 @@ APP_NAME="app_metric"
[FIELD_STAT] [FIELD_STAT]
CYCLE=5 CYCLE=5
TELEGRAF_PORT=8100 #TELEGRAF_PORT=8200
TELEGRAF_IP="127.0.0.1" #TELEGRAF_IP="127.0.0.1"
OUTPUT_PATH="log/master.status" OUTPUT_PATH="log/master.status"
APP_NAME="tsg_master" APP_NAME="tsg_master"
@@ -84,6 +84,12 @@ SHAPING_SID={{ .Values.sid.shaping }}
PROXY_SID={{ .Values.sid.proxy }} PROXY_SID={{ .Values.sid.proxy }}
{{- end }} {{- end }}
[FIREWALL]
CYCLE=30
#TELEGRAF_PORT=8500
#TELEGRAF_IP=127.0.0.1
OUTPUT_PATH="log/firewall.status"
[SESSION_RECORD] [SESSION_RECORD]
interim_intervals_time = {{ .Values.sessionrecord.interim_record.intervals_in_sec }} interim_intervals_time = {{ .Values.sessionrecord.interim_record.intervals_in_sec }}
sendlog_in_tcp_close=1 sendlog_in_tcp_close=1