From 15329aeb795bd2f8396086747f850d8cec6a0cac Mon Sep 17 00:00:00 2001 From: liuxueli Date: Tue, 7 Sep 2021 11:36:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8F=92=E4=BB=B6=EF=BC=9Ats?= =?UTF-8?q?g=5Fmaster=20quic=20rtp=20tsg=5Fconn=5Fsketch=20capture=5Fpacke?= =?UTF-8?q?t=5Fplug=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=88=96=E9=80=82=E9=85=8D?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=9A=20TSG-7607=20-=20firewall=20?= =?UTF-8?q?=E9=80=82=E9=85=8DTOPIC=E5=90=8D=E7=A7=B0=E5=8F=98=E6=9B=B4=20T?= =?UTF-8?q?SG-7600=20-=20=E6=A0=B9=E6=8D=AEAPP=5FID=5FDICT=E4=B8=AD?= =?UTF-8?q?=E7=9A=84timeout=E6=97=B6=E9=97=B4=E8=AE=BE=E7=BD=AE=E6=B5=81?= =?UTF-8?q?=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4=20TSG-7626=20-=20=E6=96=B0?= =?UTF-8?q?=E7=96=86=E5=8F=91=E7=8E=B0:=20IP=E5=BD=92=E5=B1=9E=E5=9C=B0?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=AD=97=E6=AE=B5=E4=BB=85=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E4=B8=80=E7=BA=A7=20TSG-7551=20-=20quic=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E5=B1=82=E6=94=AF=E6=8C=81=E8=A7=A3=E6=9E=90GQUIC=2035/39=20DO?= =?UTF-8?q?NE=20TSG-7627=20-=20=E6=96=B0=E7=96=86=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=EF=BC=9A=E8=A7=A3=E6=9E=90=E5=8A=A0=E5=AF=86QUIC=20SNI?= =?UTF-8?q?=E5=AF=BC=E8=87=B4watchdog=20timeout=20TSG-7636=20-=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8DQUIC=E8=A7=A3=E6=9E=90=E5=B1=82=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E7=9A=84=E8=AF=BB=E8=B6=8A=E7=95=8C=E9=97=AE=E9=A2=98=20TSG-76?= =?UTF-8?q?34=20-=20QUIC=E8=A7=A3=E6=9E=90=E5=B1=82=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E8=A7=A3=E6=9E=90gquic=2023/34/37/41/44=E7=9A=84SNI=20TSG-7604?= =?UTF-8?q?=20-=20=E6=96=B0=E7=96=86=E7=8E=AF=E5=A2=83=E5=8F=91=E7=8E=B0:?= =?UTF-8?q?=20RTP=E8=A7=A3=E6=9E=90=E5=B1=82=E5=B0=86DNS=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=8C=85=E8=AF=AF=E8=AF=86=E5=88=AB=E4=B8=BARTP=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE=20TSG-7624=20-=20=E6=8D=95=E5=8C=85=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E9=80=82=E9=85=8Dtopic=E5=90=8D=E7=A7=B0=E5=8F=98=E6=9B=B4=20T?= =?UTF-8?q?SG-7628=20-=20=E6=96=B0=E7=96=86=E7=8E=AF=E5=A2=83=EF=BC=9Atsg?= =?UTF-8?q?=5Fconn=5Fsketch=E4=BC=9A=E8=AF=9D=E8=AE=B0=E5=BD=95=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E5=A4=84=E7=90=86SIP=E6=B5=81=E9=87=8F=E5=BB=B6?= =?UTF-8?q?=E6=97=B6=E8=BE=83=E9=AB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ansible/install_config/group_vars/rpm_version.yml | 10 +++++----- ansible/roles/firewall/templates/main.conf.j2.j2 | 4 ++-- .../templates/telegraf_statistic.conf.j2.j2 | 1 - 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml index 18684ad4..7418388e 100644 --- a/ansible/install_config/group_vars/rpm_version.yml +++ b/ansible/install_config/group_vars/rpm_version.yml @@ -2,7 +2,7 @@ certstore_rpm_version: certstore: certstore-2.1.8.20210604.8077136 firewall_rpm_version: - capture_packet_plug: capture_packet_plug-3.1.2.001f9c6 + capture_packet_plug: capture_packet_plug-3.1.3.ee500bd conn_telemetry: conn_telemetry-1.0.2.8d6da43 dns: dns-2.0.14.6d7e2f8 ftp: ftp-1.0.8.13d5fda @@ -14,10 +14,10 @@ firewall_rpm_version: fw_ssl_plug: fw_ssl_plug-3.2.2.58bac95 http: http-2.0.5.c61ad9a mail: mail-1.0.12.28f3d17 - quic: quic-1.2.3.e33f9b4 + quic: quic-1.2.6.033f935 ssl: ssl-2.0.4.99e3b10 - tsg_conn_sketch: tsg_conn_sketch-3.0.20.07a0a93 - rtp: rtp-1.0.4.91b4ab7 + tsg_conn_sketch: tsg_conn_sketch-3.0.22.4c02e27 + rtp: rtp-1.0.5.93e978a mesa_sip: mesa_sip-1.1.2.b4bc77d fw_voip_plug: fw_voip_plug-1.0.7.0521f2f app_proto_identify: app_proto_identify-2.0.5.e3554f3 @@ -61,7 +61,7 @@ tsg_app_rpm_version: app_sketch_local: app_sketch_local-4.1.4.99af904 tsg_master_rpm_version: - tsg_master: tsg_master-5.3.2.98031e1 + tsg_master: tsg_master-5.3.3.3e911b2 tsg_diagnose_rpm_version: tsg_diagnose: tsg-diagnose-21.03.01.39beba7 diff --git a/ansible/roles/firewall/templates/main.conf.j2.j2 b/ansible/roles/firewall/templates/main.conf.j2.j2 index ec901bbc..47e5ca1e 100644 --- a/ansible/roles/firewall/templates/main.conf.j2.j2 +++ b/ansible/roles/firewall/templates/main.conf.j2.j2 @@ -43,8 +43,8 @@ NIC_NAME="{{ firewall.main_conf.TSG_LOG.NIC_NAME }}" MAX_SERVICE=1 LOG_LEVEL=30 LOG_PATH="./tsglog/tsglog" -#SASL_USERNAME="admin" -#SASL_PASSWD="galaxy2019" +SASL_USERNAME="admin" +SASL_PASSWD="galaxy2019" {% raw %}BROKER_LIST="{{ olap.kafka_broker.address_list | join(",") }}" {% endraw %} COMMON_FIELD_FILE="tsgconf/tsg_log_field.conf" diff --git a/ansible/roles/telegraf_statistic/templates/telegraf_statistic.conf.j2.j2 b/ansible/roles/telegraf_statistic/templates/telegraf_statistic.conf.j2.j2 index fb8e67a9..e592ec43 100644 --- a/ansible/roles/telegraf_statistic/templates/telegraf_statistic.conf.j2.j2 +++ b/ansible/roles/telegraf_statistic/templates/telegraf_statistic.conf.j2.j2 @@ -18,7 +18,6 @@ [[outputs.kafka]] sasl_username = "admin" sasl_password = "galaxy2019" - sasl_mechanism = "PLAIN" {% raw %} brokers = [ "{{ olap.kafka_broker.address_list | join("\",\"") }}" ] {% endraw %} topic = "TRAFFIC-METRICS"