From bf1f1dee6a2cdcf54b05d63019d40272343bfc36 Mon Sep 17 00:00:00 2001
From: liuxueli <liuxueli@iie.ac.cn>
Date: Fri, 20 Aug 2021 17:13:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=9Atsg=5Fmaster=20=20ap?=
 =?UTF-8?q?p=5Fsketch=5Flocal=20=20libmaatframe=20=20capture=5Fpacket=5Fpl?=
 =?UTF-8?q?ug=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=88=96=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=EF=BC=9A=20TSG-7483=20-=20monitor=E6=B5=81=E9=87=8F=E8=BD=AC?=
 =?UTF-8?q?=E5=8F=91vlan=20id=E9=BB=98=E8=AE=A4=E5=85=B3=E9=97=AD=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=B5=81=E9=87=8F=E6=B2=A1=E6=9C=89=E8=BD=AC=E5=8F=91?=
 =?UTF-8?q?=E5=88=B0=E7=AC=AC=E4=B8=89=E6=96=B9=E8=AE=BE=E5=A4=87=20TSG-74?=
 =?UTF-8?q?51=20-=20Firewall=20=E8=BF=9E=E6=8E=A5kafka=E6=97=B6=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=AE=A4=E8=AF=81=E4=BF=A1=E6=81=AF=20TSG-7449=20-=20?=
 =?UTF-8?q?app=5Fsketch=5Flocal=E6=94=AF=E6=8C=81=E9=9D=9E=E7=9A=84?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB=E6=9D=A1=E4=BB=B6=20TSG-5744=20-=20AppSketch?=
 =?UTF-8?q?=20local=E4=B8=8Eglobal=E6=80=A7=E8=83=BD=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ansible/install_config/group_vars/rpm_version.yml | 8 ++++----
 ansible/roles/firewall/templates/main.conf.j2.j2  | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml
index ed29a8e0..b0f85b0d 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.1.6f324e7
+  capture_packet_plug: capture_packet_plug-3.1.2.001f9c6
   conn_telemetry: conn_telemetry-1.0.2.8d6da43
   dns: dns-2.0.14.6d7e2f8
   ftp: ftp-1.0.8.13d5fda
@@ -30,7 +30,7 @@ firewall_rpm_version:
 framework_rpm_version:
   libcjson: libcjson-1.7.11.93ffba0
   libdocumentanalyze: libdocumentanalyze-2.0.7.eb1f13b
-  libmaatframe: libmaatframe-3.4.7.03d351f
+  libmaatframe: libmaatframe-3.4.8.c84fb97
   libMESA_field_stat: libMESA_field_stat-1.0.2.6d45eed
   libMESA_field_stat2: libMESA_field_stat2-2.9.11.0bb06b4
   libMESA_handle_logger: libMESA_handle_logger-2.0.8.f76af2f
@@ -58,10 +58,10 @@ tfe_rpm_version:
   tfe: tfe-4.5.12.f764a4b
 
 tsg_app_rpm_version:
-  app_sketch_local: app_sketch_local-4.1.2.d1660e6
+  app_sketch_local: app_sketch_local-4.1.3.bffa759
   
 tsg_master_rpm_version:
-  tsg_master: tsg_master-5.2.3.145786c 
+  tsg_master: tsg_master-5.2.4.ea1875f
 
 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 e9a8dce7..47e5ca1e 100644
--- a/ansible/roles/firewall/templates/main.conf.j2.j2
+++ b/ansible/roles/firewall/templates/main.conf.j2.j2
@@ -43,6 +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"
 {% raw %}BROKER_LIST="{{ olap.kafka_broker.address_list | join(",") }}"
 {% endraw %}
 COMMON_FIELD_FILE="tsgconf/tsg_log_field.conf"