From 45ed036309ea99a1c62fd8560c9921272bfbbf75 Mon Sep 17 00:00:00 2001
From: wangmenglan <wangmenglan@geedgenetworks.com>
Date: Thu, 11 Apr 2024 15:41:54 +0800
Subject: [PATCH] TSG-20538:update clixon to 1.2.27

---
 .../install_config/group_vars/rpm_version.yml    |  2 +-
 .../conf/firewall_logger_transmitter_schema.json | 16 ++++++++++++++++
 .../roles/traffic-engine/files/helm/values.yaml  |  7 +++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml
index 55e0cce2..5383f53a 100644
--- a/ansible/install_config/group_vars/rpm_version.yml
+++ b/ansible/install_config/group_vars/rpm_version.yml
@@ -92,7 +92,7 @@ hasp_tools_rpm_version:
 tsg_os_clixon_rpm_version:
   cligen: cligen-5.8.0-release
   clixon: clixon-5.8.0-release
-  tsg-os-mgnt-srv: tsg-os-mgnt-srv-1.2.25.cd275dc
+  tsg-os-mgnt-srv: tsg-os-mgnt-srv-1.2.27.c98f2e6
 
 sce_rpm_version:
   sce: sce-1.2.13.b0cd1a0
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 f748ff52..ee768f92 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
@@ -1,5 +1,9 @@
 {
+    {{- if eq .Values.firewall.logs.enable .Values.define_enable_val_yes }}
     "switch": "on",
+    {{- else }}
+    "switch": "off",
+    {{- end }}
     "channel_list": [
         {{- if eq .Values.external_resources.olap.udp_collectors.enable .Values.define_enable_val_yes }}
         {
@@ -44,7 +48,11 @@
         },
         {{- end }}
         {
+            {{- if eq .Values.session_record.enable .Values.define_enable_val_yes }}
             "switch": "on",
+            {{- else }}
+            "switch": "off",
+            {{- end }}
             "async": "on",
             "name": "SESSION-RECORD",
             "mode": [
@@ -65,7 +73,11 @@
             ]
         },
         {
+            {{- if eq .Values.session_record.enable .Values.define_enable_val_yes }}
             "switch": "on",
+            {{- else }}
+            "switch": "off",
+            {{- end }}
             "async": "on",
             "name": "TRANSACTION-RECORD",
             "mode": [
@@ -91,7 +103,11 @@
             ]
         },
         {
+            {{- if eq .Values.file_stream_record.enable .Values.define_enable_val_yes }}
             "switch": "on",
+            {{- else }}
+            "switch": "off",
+            {{- end }}
             "async": "on",
             "name": "TRAFFIC-FILE-STREAM-RECORD",
             "mode": [
diff --git a/ansible/roles/traffic-engine/files/helm/values.yaml b/ansible/roles/traffic-engine/files/helm/values.yaml
index e092d11a..f91bd1b4 100644
--- a/ansible/roles/traffic-engine/files/helm/values.yaml
+++ b/ansible/roles/traffic-engine/files/helm/values.yaml
@@ -52,6 +52,7 @@ firewall:
   enable: yes
   enable_smartoffload: no
   logs:
+    enable: yes
     contains_app_id:
       enable: yes
     contains_dns_resource_record:
@@ -69,6 +70,12 @@ transaction_record:
   enable_dns: yes
   enable_mail: yes
 
+session_record:
+  enable: yes
+
+file_stream_record:
+  enable: yes
+
 session_manager:
   tcp_session_max: 20021
   tcp_session_unordered_pkt_max: 128