From dedef6de8a41fe86e6947ba3e10349a18cbafcd9 Mon Sep 17 00:00:00 2001 From: liuxueli Date: Thu, 6 Apr 2023 18:45:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0tsg=5Fmaster=E3=80=81gtp=5Fsi?= =?UTF-8?q?gnaling=5Fplug=EF=BC=8C=E4=BF=AE=E5=A4=8D:=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?tableID=E5=AE=9A=E4=B9=89=E5=87=BA=E7=8E=B0=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98,=20=E5=AE=9A=E4=B9=89=E6=89=AB?= =?UTF-8?q?=E6=8F=8FLUA=E8=BF=94=E5=9B=9E=E5=80=BC=E7=9A=84=E5=BA=93?= =?UTF-8?q?=E8=A1=A8=E7=BB=93=E6=9E=84,=20=E4=BF=AE=E5=A4=8D=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E6=97=B6=E4=BC=A0=E5=85=A5=E7=9A=84protocol=E9=94=99?= =?UTF-8?q?=E8=AF=AF=20TSG-14531=20-=2023.04=E5=8A=9F=E8=83=BD=E7=AB=AFsap?= =?UTF-8?q?p=E5=9B=A0gtp=5Fsignaling=5Fplug=E5=90=AF=E5=8A=A8=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ansible/install_config/group_vars/rpm_version.yml | 4 ++-- ansible/roles/firewall/templates/maat.conf.j2.j2 | 2 ++ ansible/roles/firewall/templates/main.conf.j2.j2 | 6 +++--- ansible/roles/traffic-engine/files/helm/conf/maat.conf | 2 ++ ansible/roles/traffic-engine/files/helm/conf/main.conf | 6 +++--- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml index 44f4e272..51c23e62 100644 --- a/ansible/install_config/group_vars/rpm_version.yml +++ b/ansible/install_config/group_vars/rpm_version.yml @@ -6,7 +6,7 @@ firewall_rpm_version: conn_telemetry: conn_telemetry-1.0.3.4ef6df6 firewall: firewall-2.0.1.9af21cd tsg_conn_sketch: tsg_conn_sketch-4.0.0.ce33d21 - gtp_signaling_plug: gtp_signaling_plug-1.0.5.8d64946 + gtp_signaling_plug: gtp_signaling_plug-2.0.0.3f233d7 tsg_vulpes: tsg_vulpes-1.0.9.0d7c615 radius_collect_plug: radius_collect_plug-2.0.8.0575ab1 app_proto_identify: app_proto_identify-2.1.7.2ab882e @@ -76,7 +76,7 @@ tsg_app_rpm_version: app_sketch_local: app_sketch_local-4.5.5.7a60af1 tsg_master_rpm_version: - tsg_master: tsg_master-6.0.1.fce3802 + tsg_master: tsg_master-6.0.2.bb264ca shaping_master_rpm_version: shaping_master: shaping_master-1.1.4.b434f47 diff --git a/ansible/roles/firewall/templates/maat.conf.j2.j2 b/ansible/roles/firewall/templates/maat.conf.j2.j2 index 2dbe4d2f..8a3d5811 100644 --- a/ansible/roles/firewall/templates/maat.conf.j2.j2 +++ b/ansible/roles/firewall/templates/maat.conf.j2.j2 @@ -16,6 +16,7 @@ JSON_CFG_FILE=tsgconf/tsg_maat.json INC_CFG_DIR=tsgrule/inc/index/ FULL_CFG_DIR=tsgrule/full/index/ EFFECTIVE_RANGE_FILE=/opt/tsg/etc/tsg_device_tag.json +LOG_PATH="log/master.maat" [APP_SIGNATURE_MAAT] MAAT_MODE=2 @@ -34,6 +35,7 @@ JSON_CFG_FILE=tsgconf/app_sketch_maat.json INC_CFG_DIR=tsgrule/inc/index/ FULL_CFG_DIR=tsgrule/full/index/ EFFECTIVE_RANGE_FILE=/opt/tsg/etc/tsg_device_tag.json +LOG_PATH="log/app_sketch.maat" [CAPTURE] MAAT_MODE=2 diff --git a/ansible/roles/firewall/templates/main.conf.j2.j2 b/ansible/roles/firewall/templates/main.conf.j2.j2 index 3a2431e5..1c4435c7 100644 --- a/ansible/roles/firewall/templates/main.conf.j2.j2 +++ b/ansible/roles/firewall/templates/main.conf.j2.j2 @@ -13,7 +13,7 @@ NAMESPACE_ID=1 NIC_NAME="{{ control_and_policy.nic_name }}" MAX_SERVICE=1 LOG_LEVEL=30 -LOG_PATH="./tsglog/tsglog" +LOG_PATH="log/master.kafka" SASL_USERNAME="admin" SASL_PASSWD="galaxy2019" {% raw %}BROKER_LIST="{{ olap.kafka_broker.address_list | join(",") }}" @@ -53,7 +53,7 @@ DATACENTER_ID={{ session_id_generator.snowflake_worker_id_base }} {% endif %} {% endraw %} LOG_LEVEL=30 -LOG_PATH="./tsglog/tsg_master" +LOG_PATH="log/master.log" POLICY_PRIORITY_LABEL="POLICY_PRIORITY" L7_PROTOCOL_FILE="./tsgconf/tsg_l7_protocol.conf" DEVICE_ID_COMMAND="hostname | awk -F'-' '{print $3}'| awk -F'adc' '{print $2}'" @@ -113,7 +113,7 @@ hos_fd_request_cache_count=10 [APP_SKETCH_LOCAL] LOG_LEVEL=30 -LOG_PATH="./tsglog/app_sketch_local/app_sketch_local" +LOG_PATH="log/app_sketch.log" SENDBACK_SWITCH=0 SCAN_UDP_PAYLOAD_NUM=8 SCAN_TCP_PAYLOAD_NUM=8 diff --git a/ansible/roles/traffic-engine/files/helm/conf/maat.conf b/ansible/roles/traffic-engine/files/helm/conf/maat.conf index 7c0fbcd6..792e5984 100644 --- a/ansible/roles/traffic-engine/files/helm/conf/maat.conf +++ b/ansible/roles/traffic-engine/files/helm/conf/maat.conf @@ -13,6 +13,7 @@ JSON_CFG_FILE=tsgconf/tsg_maat.json INC_CFG_DIR=tsgrule/inc/index/ FULL_CFG_DIR=tsgrule/full/index/ EFFECTIVE_RANGE_FILE=/opt/tsg/etc/tsg_device_tag.json +LOG_PATH="log/master.maat" [APP_SIGNATURE_MAAT] MAAT_MODE=2 @@ -28,6 +29,7 @@ JSON_CFG_FILE=tsgconf/app_sketch_maat.json INC_CFG_DIR=tsgrule/inc/index/ FULL_CFG_DIR=tsgrule/full/index/ EFFECTIVE_RANGE_FILE=/opt/tsg/etc/tsg_device_tag.json +LOG_PATH="log/app_sketch.maat" [CAPTURE] MAAT_MODE=2 diff --git a/ansible/roles/traffic-engine/files/helm/conf/main.conf b/ansible/roles/traffic-engine/files/helm/conf/main.conf index 73c5da81..2e5990e9 100644 --- a/ansible/roles/traffic-engine/files/helm/conf/main.conf +++ b/ansible/roles/traffic-engine/files/helm/conf/main.conf @@ -11,7 +11,7 @@ VSYSTEM_ID={{ .Values.vsys_id }} NAMESPACE_ID=1 MAX_SERVICE=1 LOG_LEVEL=30 -LOG_PATH="./tsglog/tsglog" +LOG_PATH="log/master.kafka" 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.olap-address" (list . ",") }}" @@ -42,7 +42,7 @@ APP_NAME="tsg_master" [SYSTEM] DATACENTER_ID={{ .Values.session_id_generator.snowflake_worker_id_base }} LOG_LEVEL=30 -LOG_PATH="./tsglog/tsg_master" +LOG_PATH="log/master.log" POLICY_PRIORITY_LABEL="POLICY_PRIORITY" L7_PROTOCOL_FILE="./tsgconf/tsg_l7_protocol.conf" DEVICE_ID_COMMAND="hostname | awk -F'-' '{print $3}'| awk -F'adc' '{print $2}'" @@ -93,7 +93,7 @@ hos_fd_request_cache_count=10 [APP_SKETCH_LOCAL] LOG_LEVEL=30 -LOG_PATH="./tsglog/app_sketch_local/app_sketch_local" +LOG_PATH="log/app_sketch.log" SENDBACK_SWITCH=0 [APP_SKETCH_FEEDBACK]