diff options
| author | liuxueli <[email protected]> | 2023-07-12 23:43:26 +0800 |
|---|---|---|
| committer | liuxueli <[email protected]> | 2023-07-12 23:43:26 +0800 |
| commit | 079e9646dbbf8ce54f62a4267dab2fc4a4d2fb5a (patch) | |
| tree | 0614366a5d9a0edbac367b1645586fda1296e493 | |
| parent | 069ecd24a0a7841388a0a0650c63c3b3581b13eb (diff) | |
更新http、session_record、firewall, 修复:v23.07-rc1
firewall: TCP/UDP未注册FS Line ID, 使用FS-operate函数操作可能会导致重启
http,session_record: 修正输出本地日志的级别
| -rw-r--r-- | ansible/install_config/group_vars/rpm_version.yml | 6 | ||||
| -rw-r--r-- | ansible/roles/firewall/templates/main.conf.j2.j2 | 10 | ||||
| -rw-r--r-- | ansible/roles/traffic-engine/files/helm/conf/main.conf | 10 |
3 files changed, 19 insertions, 7 deletions
diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml index 24054abf..8896be7c 100644 --- a/ansible/install_config/group_vars/rpm_version.yml +++ b/ansible/install_config/group_vars/rpm_version.yml @@ -4,8 +4,8 @@ certstore_rpm_version: firewall_rpm_version: capture_packet_plug: capture_packet_plug-5.0.6.1820f69 conn_telemetry: conn_telemetry-1.0.3.4ef6df6 - firewall: firewall-2.0.13.94a9a55 - session_record: session_record-4.1.4.118c7d7 + firewall: firewall-2.0.14.e78add7 + session_record: session_record-4.1.5.291307e gtp_signaling_plug: gtp_signaling_plug-2.0.0.3f233d7 tsg_vulpes: tsg_vulpes-1.0.9.0d7c615 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 dns: dns-2.1.6.8cfb357 ftp: ftp-1.0.15.1fc64fe - http: http-2.0.12.0747ada + http: http-2.0.13.5efe313 mail: mail-1.0.19.e982b44 quic: quic-2.0.6.513732e ssl: ssl-3.0.0.a52514a diff --git a/ansible/roles/firewall/templates/main.conf.j2.j2 b/ansible/roles/firewall/templates/main.conf.j2.j2 index 825d01dd..25513225 100644 --- a/ansible/roles/firewall/templates/main.conf.j2.j2 +++ b/ansible/roles/firewall/templates/main.conf.j2.j2 @@ -61,8 +61,8 @@ APP_NAME="app_metric" [FIELD_STAT] CYCLE=5 -TELEGRAF_PORT=8100 -TELEGRAF_IP="127.0.0.1" +#TELEGRAF_PORT=8200 +#TELEGRAF_IP="127.0.0.1" OUTPUT_PATH="log/master.status" APP_NAME="tsg_master" @@ -91,6 +91,12 @@ DEVICE_SEQ_IN_DATA_CENTER={{ session_id_generator.snowflake_worker_id_offset }} {% endraw %} FEATURE_TAMPER=1 +[FIREWALL] +CYCLE=30 +#TELEGRAF_PORT=8500 +#TELEGRAF_IP=127.0.0.1 +OUTPUT_PATH="log/firewall.status" + [SESSION_RECORD] interim_intervals_time = 120 sendlog_in_tcp_close=1 diff --git a/ansible/roles/traffic-engine/files/helm/conf/main.conf b/ansible/roles/traffic-engine/files/helm/conf/main.conf index 1e3c6976..82949a03 100644 --- a/ansible/roles/traffic-engine/files/helm/conf/main.conf +++ b/ansible/roles/traffic-engine/files/helm/conf/main.conf @@ -58,8 +58,8 @@ APP_NAME="app_metric" [FIELD_STAT] CYCLE=5 -TELEGRAF_PORT=8100 -TELEGRAF_IP="127.0.0.1" +#TELEGRAF_PORT=8200 +#TELEGRAF_IP="127.0.0.1" OUTPUT_PATH="log/master.status" APP_NAME="tsg_master" @@ -84,6 +84,12 @@ SHAPING_SID={{ .Values.sid.shaping }} PROXY_SID={{ .Values.sid.proxy }} {{- end }} +[FIREWALL] +CYCLE=30 +#TELEGRAF_PORT=8500 +#TELEGRAF_IP=127.0.0.1 +OUTPUT_PATH="log/firewall.status" + [SESSION_RECORD] interim_intervals_time = {{ .Values.sessionrecord.interim_record.intervals_in_sec }} sendlog_in_tcp_close=1 |