From fa3e810e8ed132243f9af714a7fc09b6e3799ba1 Mon Sep 17 00:00:00 2001 From: liuxueli Date: Wed, 2 Aug 2023 15:44:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0tsg=5Fmaster=E3=80=81firewall?= =?UTF-8?q?=E3=80=81session=5Frecord=E3=80=81quic=E3=80=81ssl=E3=80=81http?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D:=20tsg=5Fmaster:=20=E8=A7=84?= =?UTF-8?q?=E8=8C=83=E5=8F=98=E9=87=8F=E7=9A=84=E5=AE=9A=E4=B9=89;=20?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=85=B3=E9=97=ADFS=E7=9A=84=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E7=BB=9F=E8=AE=A1=EF=BC=8C=E4=BE=BF=E4=BA=8Evalgrind/?= =?UTF-8?q?asan=E5=AE=9A=E4=BD=8D=E5=86=85=E5=AD=98=E7=9A=84=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E9=97=AE=E9=A2=98=20tsg=5Fmaster:=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0sni=E9=95=BF=E5=BA=A6=E5=88=A4=E6=96=AD=EF=BC=8C?= =?UTF-8?q?=E5=90=8C=E6=97=B6=E8=A7=A3=E6=9E=90=E7=BB=93=E6=9E=9C=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E6=97=B6=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=87=8A=E6=94=BE?= =?UTF-8?q?=E5=B7=B2=E7=94=B3=E8=AF=B7sni=E5=86=85=E5=AD=98=E7=9A=84?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=20tsg=5Fmaster:=20=E4=BF=AE=E5=A4=8Dapplicat?= =?UTF-8?q?ion=20metrics=E6=9B=B4=E6=96=B0=E5=8C=85=E6=95=B0=E6=97=B6?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E5=AD=98=E5=9C=A8=E5=86=85=E5=AD=98=E8=B6=8A?= =?UTF-8?q?=E7=95=8C=20quic:=20=E5=A2=9E=E5=8A=A0=E9=95=BF=E5=BA=A6?= =?UTF-8?q?=E5=88=A4=E6=96=AD=EF=BC=8C=E4=BF=AE=E5=A4=8D=E9=95=BF=E5=BA=A6?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=97=B6=E9=80=A0=E6=88=90=E7=9A=84=E5=86=85?= =?UTF-8?q?=E5=AD=98=E9=9D=9E=E6=B3=95=E8=AF=BB=20http:=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8Dstrncasecmp=E6=97=B6=E6=9C=AA=E5=AF=B9=E5=BE=85?= =?UTF-8?q?=E6=9F=A5=E6=89=BE=E4=B8=B2=E9=95=BF=E5=BA=A6=E4=BF=9D=E6=8A=A4?= =?UTF-8?q?=EF=BC=8C=E5=8F=AF=E8=83=BD=E8=AF=BB=E8=B6=8A=E7=95=8C=E7=9A=84?= =?UTF-8?q?=E9=94=99=E8=AF=AF=20session=5Frecord/firewall/ssl:=20Debug?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=93=BE=E6=8E=A5ASAN=EF=BC=8C=E7=94=A8?= =?UTF-8?q?=E4=BA=8E=E5=AE=9A=E4=BD=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 29e19106078115477c731636237694d7b0031643) --- .../install_config/group_vars/rpm_version.yml | 12 ++++++------ ansible/roles/firewall/templates/main.conf.j2.j2 | 16 ++++++++-------- .../traffic-engine/files/helm/conf/main.conf | 16 ++++++++-------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml index 9b4f3860..99cb3574 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.14.e78add7 - session_record: session_record-4.1.7.5733614 + firewall: firewall-2.0.15.2c5842b + session_record: session_record-4.1.8.962ec30 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,10 +14,10 @@ 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.13.5efe313 + http: http-2.0.15.e949298 mail: mail-1.0.19.e982b44 - quic: quic-2.0.6.513732e - ssl: ssl-3.0.1.8c0ec9f + quic: quic-2.0.8.4d73180 + ssl: ssl-3.0.2.2919874 rtp: rtp-1.0.7.530ac76 gtp: gtp-1.0.7.e1041b2 ssh: ssh-2.1.7.b053e65 @@ -78,7 +78,7 @@ tsg_app_rpm_version: app_sketch_local: app_sketch_local-5.0.6.cc02934 tsg_master_rpm_version: - tsg_master: tsg_master-6.0.43.39ed85f + tsg_master: tsg_master-6.0.46.e089f98 shaping_master_rpm_version: shaping_master: shaping_master-1.1.4.b434f47 diff --git a/ansible/roles/firewall/templates/main.conf.j2.j2 b/ansible/roles/firewall/templates/main.conf.j2.j2 index d0fb55f6..2a7e54a3 100644 --- a/ansible/roles/firewall/templates/main.conf.j2.j2 +++ b/ansible/roles/firewall/templates/main.conf.j2.j2 @@ -50,27 +50,27 @@ TCP_MIN_BYTES=5 UDP_MIN_PKTS=3 UDP_MIN_BYTES=5 -[SECURITY_HITS] -CYCLE=1000 +[SECURITY_HITS_METRICS] +CYCLE_INTERVAL_MS=1000 TELEGRAF_PORT=8400 TELEGRAF_IP="127.0.0.1" APP_NAME="security_rule_hits" -[STATISTIC] -CYCLE=5 +[NETWORK_METRICS] +CYCLE_INTERVAL_MS=5000 TELEGRAF_PORT=8100 TELEGRAF_IP="127.0.0.1" OUTPUT_PATH="log/master.metrics" APP_NAME="statistic" -[APP_METRIC] -CYCLE=1000 +[APPLICATION_METRICS] +CYCLE_INTERVAL_MS=1000 TELEGRAF_PORT=8100 TELEGRAF_IP="127.0.0.1" APP_NAME="app_metric" -[FIELD_STAT] -CYCLE=5 +[MASTER_STATUS] +CYCLE_INTERVAL_MS=30000 #TELEGRAF_PORT=8200 #TELEGRAF_IP="127.0.0.1" OUTPUT_PATH="log/master.status" diff --git a/ansible/roles/traffic-engine/files/helm/conf/main.conf b/ansible/roles/traffic-engine/files/helm/conf/main.conf index 4e3357b4..1cc3fa3a 100644 --- a/ansible/roles/traffic-engine/files/helm/conf/main.conf +++ b/ansible/roles/traffic-engine/files/helm/conf/main.conf @@ -46,27 +46,27 @@ UDP_MIN_PKTS=3 UDP_MIN_BYTES=5 RAPIDJSON_CHUNK_CAPACITY={{ .Values.firewall.rapidjson_chunk_capacity }} -[SECURITY_HITS] -CYCLE=1000 +[SECURITY_HITS_METRICS] +CYCLE_INTERVAL_MS=1000 TELEGRAF_PORT=8400 TELEGRAF_IP="127.0.0.1" APP_NAME="security_rule_hits" -[STATISTIC] -CYCLE=5 +[NETWORK_METRICS] +CYCLE_INTERVAL_MS=5000 TELEGRAF_PORT=8100 TELEGRAF_IP="127.0.0.1" OUTPUT_PATH="log/master.metrics" APP_NAME="statistic" -[APP_METRIC] -CYCLE=1000 +[APPLICATION_METRICS] +CYCLE_INTERVAL_MS=1000 TELEGRAF_PORT=8100 TELEGRAF_IP="127.0.0.1" APP_NAME="app_metric" -[FIELD_STAT] -CYCLE=5 +[MASTER_STATUS] +CYCLE_INTERVAL_MS=30000 #TELEGRAF_PORT=8200 #TELEGRAF_IP="127.0.0.1" OUTPUT_PATH="log/master.status"