From 3b78bbade3cc5c2b17fbf7eba15607d7c1fab44e Mon Sep 17 00:00:00 2001 From: liuxueli Date: Wed, 1 Mar 2023 14:22:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0sapp=E3=80=81tsg=5Fmaster?= =?UTF-8?q?=E3=80=81wire=5Fgraft=E3=80=81libwire=5Fgraft=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=88=96=E6=96=B0=E5=A2=9E:=20TSG-13844=20-=207400?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=86=85=E5=AD=98=E7=AA=81=E5=A2=9E=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E5=A4=9A=E4=B8=AA=E6=9C=8D=E5=8A=A1=E9=87=8D=E5=90=AF?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E5=91=8A=E8=AD=A6=20TSG-12461=20-=20SAPP?= =?UTF-8?q?=E9=9D=99=E6=80=81=E9=93=BE=E6=8E=A5jemalloc=E5=90=8E=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E5=8A=A0=E5=A3=B3=E5=A4=B1=E8=B4=A5=20OMPUB-809=20-?= =?UTF-8?q?=2022.12=E7=89=88=E6=9C=ACsapp-pr=E7=A1=AC=E9=94=81=E6=97=A0?= =?UTF-8?q?=E6=95=88=20TSG-13942=20-=20Session=20Records=E7=9A=84Interim?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=B8=ADShaping=20Rule=20IDs=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=20TSG-13294=20-=20=E5=AE=89=E5=85=A8=E7=AD=96?= =?UTF-8?q?=E7=95=A5=E6=9D=A1=E4=BB=B6flags+http+=E9=83=A8=E5=88=86filter?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=97=A0=E6=B3=95=E5=91=BD=E4=B8=AD=E7=AD=96?= =?UTF-8?q?=E7=95=A5=20TSG-13959=20-=20=E5=8A=9F=E8=83=BD=E7=AB=AF?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=BB=8Eredis=E4=B8=AD=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=BC=80=E5=90=AFSession=20Record=E7=9A=84?= =?UTF-8?q?=E5=BC=80=E5=85=B3=20TSG-13864=20-=20=E5=BB=BA=E8=AE=AE?= =?UTF-8?q?=E5=9C=A8Security=20Events=E4=B8=AD=E5=8A=A0=E4=B8=8A=E5=AD=97?= =?UTF-8?q?=E6=AE=B5common=5Fflags=5Fidentify=5Finfo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ansible/install_config/group_vars/rpm_version.yml | 10 +++++----- ansible/roles/firewall/templates/main.conf.j2.j2 | 10 +++++----- ansible/roles/sapp/tasks/main.yml | 6 ++++++ ansible/roles/traffic-engine/files/helm/conf/main.conf | 10 +++++----- 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml index 60969de2..ef63a074 100644 --- a/ansible/install_config/group_vars/rpm_version.yml +++ b/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 diff --git a/ansible/roles/firewall/templates/main.conf.j2.j2 b/ansible/roles/firewall/templates/main.conf.j2.j2 index fb39706a..b68d50ee 100644 --- a/ansible/roles/firewall/templates/main.conf.j2.j2 +++ b/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 %} diff --git a/ansible/roles/sapp/tasks/main.yml b/ansible/roles/sapp/tasks/main.yml index 65360be8..79d3e978 100644 --- a/ansible/roles/sapp/tasks/main.yml +++ b/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 }}" diff --git a/ansible/roles/traffic-engine/files/helm/conf/main.conf b/ansible/roles/traffic-engine/files/helm/conf/main.conf index cc05e38c..c2a9a3ae 100644 --- a/ansible/roles/traffic-engine/files/helm/conf/main.conf +++ b/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]