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"