From 2715e303c36e25ff1cc3b5fb7372e63baf078d1d Mon Sep 17 00:00:00 2001
From: yangyubo <yangyubo@geedgenetworks.com>
Date: Fri, 1 Sep 2023 17:46:44 +0800
Subject: [PATCH] =?UTF-8?q?TSG-15739:=E5=8A=9F=E8=83=BD=E7=AB=AF=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E8=BE=93=E5=87=BAIPFIX=E5=B0=81=E8=A3=85=E7=9A=84UDP?=
 =?UTF-8?q?=E6=8A=A5=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml
index 6ff449d9..df74dbe7 100644
--- a/ansible/install_config/group_vars/rpm_version.yml
+++ b/ansible/install_config/group_vars/rpm_version.yml
@@ -57,6 +57,7 @@ framework_rpm_version:
   22_libMESA_sts: libMESA_sts-1.0.1.663f190
   23_libfieldstat4: libfieldstat4-4.1.4.c6e8281
   24_libstatistics: libstatistics-1.0.12.34a6760
+  25_libipfix_exporter: libipfix_exporter-1.0.6.0e73c24
 
 kni_rpm_version:
   kni: kni-5.1.8.ce6433e
@@ -81,7 +82,7 @@ tsg_app_rpm_version:
   app_sketch_local: app_sketch_local-5.0.6.cc02934
 
 tsg_master_rpm_version:
-  tsg_master: tsg_master-6.1.4.fc4c493
+  tsg_master: tsg_master-6.1.5.5c1e250
 
 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 c1ee3199..c892d4e2 100644
--- a/ansible/roles/firewall/templates/main.conf.j2.j2
+++ b/ansible/roles/firewall/templates/main.conf.j2.j2
@@ -8,7 +8,7 @@ LOG_LEVEL=30
 LOG_PATH="log/master.scan"
 
 [TSG_LOG]
-MODE=1
+MODE=kafka
 VSYSTEM_ID={% raw %}{{ vsys_id }}
 {% endraw %}
 NAMESPACE_ID=1
diff --git a/ansible/roles/traffic-engine/files/helm/conf/main.conf b/ansible/roles/traffic-engine/files/helm/conf/main.conf
index 295f6c7a..88ede4ac 100644
--- a/ansible/roles/traffic-engine/files/helm/conf/main.conf
+++ b/ansible/roles/traffic-engine/files/helm/conf/main.conf
@@ -8,7 +8,7 @@ LOG_LEVEL=30
 LOG_PATH="log/master.scan"
 
 [TSG_LOG]
-MODE=1
+MODE=kafka
 VSYSTEM_ID={{ .Values.vsys_id }}
 NAMESPACE_ID=1
 MAX_SERVICE=1