From 51aa4df14faf1ae4a09ea4ec7b713a3de8e915cf Mon Sep 17 00:00:00 2001
From: liuxueli <liuxueli@geedgenetworks.com>
Date: Wed, 10 Apr 2024 19:20:08 +0800
Subject: [PATCH] Update firewall-3.2.4.ee44c9e utable-1.0.7.cefdc91

---
 .../install_config/group_vars/rpm_version.yml  |  4 ++--
 .../roles/firewall/templates/main.conf.j2.j2   | 18 +++++-------------
 .../firewall_logger_transmitter_schema.json    | 10 +++++-----
 .../traffic-engine/files/helm/conf/main.conf   | 11 +++--------
 4 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml
index d2c117a9..edef3dc9 100644
--- a/ansible/install_config/group_vars/rpm_version.yml
+++ b/ansible/install_config/group_vars/rpm_version.yml
@@ -3,7 +3,7 @@ certstore_rpm_version:
 
 firewall_rpm_version:
   conn_telemetry: conn_telemetry-1.0.3.4ef6df6
-  firewall: firewall-3.2.3.9f014de
+  firewall: firewall-3.2.4.ee44c9e
   glimpse_detector: glimpse_detector-3.0.2.eb2ae13
   qdpi_detector: qdpi_detector-4.0.3.9f81ea0
   #tsg_ddos_sketch: tsg_ddos_sketch-2.0.2.35e03d0
@@ -53,7 +53,7 @@ framework_rpm_version:
   #24_libstatistics: libstatistics-2.0.20.895d68e
   25_libipfix_exporter: libipfix_exporter-1.0.6.0e73c24
   26_libosfp: libosfp-1.3.6.af67397
-  27_libutable: utable-1.0.6.7edaf9d
+  27_libutable: utable-1.0.7.cefdc91
   28_libmaatframe: libmaatframe-4.1.33.3e1acdd
 
 kni_rpm_version:
diff --git a/ansible/roles/firewall/templates/main.conf.j2.j2 b/ansible/roles/firewall/templates/main.conf.j2.j2
index 3215d520..04348fa5 100644
--- a/ansible/roles/firewall/templates/main.conf.j2.j2
+++ b/ansible/roles/firewall/templates/main.conf.j2.j2
@@ -2,22 +2,14 @@
 PROFILE="./tsgconf/maat.conf"
 
 [TSG_LOG]
-SENDLOG_SWITCH=on
-RINGBUFF_NUM=2
-RINGBUFF_SIZE=100000
-ASYNC_SENDLOG_ENABLED=1
+IPFIX_SCHEMA_PROFILE=./tsgconf/firewall_logger_ipfix_schema.json
+LOGGER_SCHEMA_PROFILE=./tsgconf/firewall_logger_transmitter_schema.json
+
 TRAFFIC_VSYSTEM_ID={% raw %}{{ vsys_id }}
 {% endraw %}
-NAMESPACE_ID=1
+
 NIC_NAME="{{ control_and_policy.nic_name }}"
-MAX_SERVICE=1
-LOG_LEVEL=30
-LOG_PATH="log/firewall.kafka"
-COMPRESSION_TYPE="snappy"
-SASL_USERNAME="admin"
-SASL_PASSWD="galaxy2019"
-{% raw %}BROKER_LIST="{{ olap.kafka_broker.address_list | join(",") }}"
-{% endraw %}
+
 COMMON_FIELD_FILE="tsgconf/tsg_log_field.conf"
 {% raw %}
 {% if sessionrecord.enable_contains_app_id == 1 %}
diff --git a/ansible/roles/traffic-engine/files/helm/conf/firewall_logger_transmitter_schema.json b/ansible/roles/traffic-engine/files/helm/conf/firewall_logger_transmitter_schema.json
index dbac0c56..70875ca4 100644
--- a/ansible/roles/traffic-engine/files/helm/conf/firewall_logger_transmitter_schema.json
+++ b/ansible/roles/traffic-engine/files/helm/conf/firewall_logger_transmitter_schema.json
@@ -43,7 +43,7 @@
         },
         {{- end }}
         {
-            "async": "off",
+            "async": "on",
             "name": "SESSION-RECORD",
             "mode": [
                 {{- if eq .Values.external_resources.olap.udp_collectors.enable .Values.define_enable_val_yes }}
@@ -63,7 +63,7 @@
             ]
         },
         {
-            "async": "off",
+            "async": "on",
             "name": "TRANSACTION-RECORD",
             "mode": [
                 {
@@ -75,7 +75,7 @@
             ]
         },
         {
-            "async": "off",
+            "async": "on",
             "name": "VOIP-RECORD",
             "mode": [
                 {
@@ -87,7 +87,7 @@
             ]
         },
         {
-            "async": "off",
+            "async": "on",
             "name": "TRAFFIC-FILE-STREAM-RECORD",
             "mode": [
                 {
@@ -99,7 +99,7 @@
             ]
         },
         {
-            "async": "off",
+            "async": "on",
             "name": "TROUBLESHOOTING-FILE-STREAM-RECORD",
             "mode": [
                 {
diff --git a/ansible/roles/traffic-engine/files/helm/conf/main.conf b/ansible/roles/traffic-engine/files/helm/conf/main.conf
index e0abb652..e29f131c 100644
--- a/ansible/roles/traffic-engine/files/helm/conf/main.conf
+++ b/ansible/roles/traffic-engine/files/helm/conf/main.conf
@@ -10,15 +10,10 @@ DEVICE_TAG_FILE=/opt/tsg/etc/tsg_device_tag.json
 ACCEPT_TAGS={"tags":[{{- include "traffic-engine.device-tag-list" . }}]}
 
 [TSG_LOG]
-SENDLOG_SWITCH=on
-RINGBUFF_NUM=2
-RINGBUFF_SIZE=100000
-ASYNC_SENDLOG_ENABLED=1
+IPFIX_SCHEMA_PROFILE=./tsgconf/firewall_logger_ipfix_schema.json
+LOGGER_SCHEMA_PROFILE=./tsgconf/firewall_logger_transmitter_schema.json
+
 TRAFFIC_VSYSTEM_ID={{ .Values.vsys_id }}
-COMPRESSION_TYPE="snappy"
-SASL_USERNAME="{{ .Values.external_resources.olap.kafka_brokers.sasl_username }}"
-SASL_PASSWD="{{ .Values.external_resources.olap.kafka_brokers.sasl_password }}"
-BROKER_LIST="{{- include "traffic-engine.config.addresses.converter" (list .Values.external_resources.olap.kafka_brokers.addresses  ",") }}"
 
 {{- if eq .Values.firewall.logs.contains_app_id.enable .Values.define_enable_val_yes }}
 SEND_APP_ID_SWITCH=1