更新tsg_master、gtp_signaling_plug，修复:

修复tableID定义出现重复的问题, 定义扫描LUA返回值的库表结构, 修复扫描时传入的protocol错误
TSG-14531 - 23.04功能端sapp因gtp_signaling_plug启动异常

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

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

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

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

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]