From 079e9646dbbf8ce54f62a4267dab2fc4a4d2fb5a Mon Sep 17 00:00:00 2001 From: liuxueli Date: Wed, 12 Jul 2023 23:43:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0http=E3=80=81session=5Frecord?= =?UTF-8?q?=E3=80=81firewall,=20=E4=BF=AE=E5=A4=8D:=20firewall:=20TCP/UDP?= =?UTF-8?q?=E6=9C=AA=E6=B3=A8=E5=86=8CFS=20Line=20ID,=20=E4=BD=BF=E7=94=A8?= =?UTF-8?q?FS-operate=E5=87=BD=E6=95=B0=E6=93=8D=E4=BD=9C=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E4=BC=9A=E5=AF=BC=E8=87=B4=E9=87=8D=E5=90=AF=20http,s?= =?UTF-8?q?ession=5Frecord:=20=E4=BF=AE=E6=AD=A3=E8=BE=93=E5=87=BA?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E6=97=A5=E5=BF=97=E7=9A=84=E7=BA=A7=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ansible/install_config/group_vars/rpm_version.yml | 6 +++--- ansible/roles/firewall/templates/main.conf.j2.j2 | 10 ++++++++-- 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