更新sapp、tsg_master、wire_graft、libwire_graft，修复或新增:

TSG-13844 - 7400设备内存突增导致多个服务重启出现告警
TSG-12461 - SAPP静态链接jemalloc后导致加壳失败
OMPUB-809 - 22.12版本sapp-pr硬锁无效
TSG-13942 - Session Records的Interim日志中Shaping Rule IDs为空
TSG-13294 - 安全策略条件flags+http+部分filter时，无法命中策略
TSG-13959 - 功能端支持从redis中读取是否开启Session Record的开关
TSG-13864 - 建议在Security Events中加上字段common_flags_identify_info

ansible/install_config/group_vars/rpm_version.yml

@@ -62,9 +62,9 @@ mrzcpd_rpm_version:
 
 
 sapp_rpm_version:
-  sapp: sapp-4.2.94.851bb08
+  sapp: sapp-4.2.95.7448abe
   tcpdump_mesa: tcpdump_mesa-1.0.13.6ec67f5
-  sapp-pr: sapp-pr-4.2.94.851bb08
+  sapp-pr: sapp-pr-4.2.95.7448abe
 
 tfe_rpm_version:
   tfe: tfe-4.7.02.a2a4c32
@@ -74,7 +74,7 @@ tsg_app_rpm_version:
   app_sketch_local: app_sketch_local-4.5.5.7a60af1
 
 tsg_master_rpm_version:
-  tsg_master: tsg_master-5.10.6.4ba6f09
+  tsg_master: tsg_master-5.10.7.bbc31c8
 
 shaping_master_rpm_version:
   shaping_master: shaping_master-1.1.0.75d8306
@@ -90,8 +90,8 @@ wannat_wangw_rpm_version:
   libwannat_common: libwannat_common-1.0.3.6dc42b6
 
 wire_graft_rpm_version:
-  wire_graft: wire_graft_plug-1.5.8.211f1f1
-  libwire_graft: libwire_graft-1.5.8.211f1f1
+  wire_graft: wire_graft_plug-1.5.9.c858f08
+  libwire_graft: libwire_graft-1.5.9.c858f08
 
 hasp_update_rpm_version:
   hasp_update: hasp_update-1.0.1.b836a3b

ansible/roles/firewall/templates/main.conf.j2.j2

@@ -142,7 +142,7 @@ dns_flood_thresh="{{ ddossketch.dns_flood_report_thresh }}"
 {% if dp_steering_firewall.enable_mirror == 1 %}
 [TRAFFIC_MIRROR]
 TRAFFIC_MIRROR_ENABLE=1
-NIC_NAME={{ dp_traffic_mirror.nic_name }}
+NIC_NAME="{{ dp_traffic_mirror.nic_name }}"
 DEFAULT_VLAN_ID={{ dp_traffic_mirror.traffic_mirror_vlan_id }}
 {% endif %}
 [RADIUS_PLUG]
@@ -160,12 +160,12 @@ DEFAULT_VLAN_ID={{ dp_traffic_mirror.traffic_mirror_vlan_id }}
 {% if data_center.name is not defined and device.tags is not defined %}
 {{ device.tags }}
 {% endif %}
-DEVICE_TAGS={"tags":[{{ tags_list | join(",") }}]}
+DEVICE_TAGS="{"tags":[{{ tags_list | join(",") }}]}"
 {% endraw %}
 PACKET_TYPE_FLAG=16
-COLLECT_TOPIC=RADIUS-RECORD
+COLLECT_TOPIC="RADIUS-RECORD"
 SERVICE_ID=162
-LOG_PATH=./log/radius_collect_plug/radius_collect_plug
+LOG_PATH="./log/radius_collect_plug/radius_collect_plug"
 LOG_LEVEL=30
 
 [GTP_SIGNALING]
@@ -176,7 +176,7 @@ SENDLOG_SWITCH=0
 {% endif %}
 {% endraw %}
 #NO/HASH/REDIS
-SIGNALING_ORIGIN=REDIS
+SIGNALING_ORIGIN="REDIS"
 
 [CAPTURE]
 {% raw %}

ansible/roles/sapp/tasks/main.yml

@@ -8,6 +8,12 @@
     download_dir: "{{ path_download }}"
   with_dict: "{{ sapp_rpm_version }}"
 
+- name: "download rpm packages: jemalloc"
+  yum:
+    name: "jemalloc"
+    conf_file: "{{ rpm_repo_config_path }}"
+    state: present
+
 - name: "Create directory /opt/tsg/framework and /opt/tsg/sapp if they not exist"
   file:
     path: "{{ item }}"

ansible/roles/traffic-engine/files/helm/conf/main.conf

@@ -120,14 +120,14 @@ TRAFFIC_MIRROR_ENABLE=1
 {{- else }}
 TRAFFIC_MIRROR_ENABLE=0
 {{- end }}
-NIC_NAME={{ .Values.nic_mirror_name }}
+NIC_NAME="{{ .Values.nic_mirror_name }}"
 DEFAULT_VLAN_ID=0
 [RADIUS_PLUG]
-DEVICE_TAGS={"tags":[{{- include "traffic-engine.device-tag-list" . }}]}
+DEVICE_TAGS="{"tags":[{{- include "traffic-engine.device-tag-list" . }}]}"
 PACKET_TYPE_FLAG=16
-COLLECT_TOPIC=RADIUS-RECORD
+COLLECT_TOPIC="RADIUS-RECORD"
 SERVICE_ID=162
-LOG_PATH=./log/radius_collect_plug/radius_collect_plug
+LOG_PATH="./log/radius_collect_plug/radius_collect_plug"
 LOG_LEVEL=30
 
 {{- if eq .Values.decoders.GTPC .Values.define_enable_val_yes }}
@@ -138,7 +138,7 @@ SENDLOG_SWITCH=1
 SENDLOG_SWITCH=0
 {{- end }}
 #NO/HASH/REDIS
-SIGNALING_ORIGIN=REDIS
+SIGNALING_ORIGIN="REDIS"
 {{- end }}
 
 [CAPTURE]