gfwleak/tsg-tsg-os-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新tsg_master、tsg_conn_sketch、app_sketch_local，修复或新增:

Browse Source 
TSG-15317 - VoIP Records中RTP原始包缺少文件下载地址
tsg_master,app_sketch_local: 增加MAAT4的输出统计
This commit is contained in:
liuxueli
2023-06-05 18:04:20 +08:00
committed by 付明卫
parent 60bbb09f36
commit 1634c5bdd2
9 changed files with 25 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/install_config/group_vars/rpm_version.yml
View File

@@ -5,7 +5,7 @@ firewall_rpm_version:
capture_packet_plug: capture_packet_plug-5.0.4.ab1a5a6
conn_telemetry: conn_telemetry-1.0.3.4ef6df6
firewall: firewall-2.0.6.f8b1da5
tsg_conn_sketch: tsg_conn_sketch-4.0.3.8f031fb
tsg_conn_sketch: tsg_conn_sketch-4.0.4.d2a5769
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.9.f1e08ad
@@ -72,10 +72,10 @@ tfe_rpm_version:
tfe-pr: tfe-pr-4.8.20.4d26281
tsg_app_rpm_version:
app_sketch_local: app_sketch_local-5.0.3.cd40103
app_sketch_local: app_sketch_local-5.0.4.305e0b1
tsg_master_rpm_version:
tsg_master: tsg_master-6.0.20.26ccdc1
tsg_master: tsg_master-6.0.21.4c8eecd
shaping_master_rpm_version:
shaping_master: shaping_master-1.1.4.b434f47

6
ansible/roles/firewall/templates/maat.conf.j2.j2
View File

@@ -4,7 +4,7 @@ MAAT_MODE=redis
STAT_SWITCH=1
PERF_SWITCH=1
TABLE_INFO=tsgconf/tsg_static_tableinfo.json
STAT_FILE=tsg_static_maat.status
STAT_FILE=log/master.maat.status
EFFECT_INTERVAL_S=1
REDIS_IP={% raw %}{{ cm_policy_server_ip }}
{% endraw %}
@@ -24,7 +24,7 @@ MAAT_MODE=redis
STAT_SWITCH=1
PERF_SWITCH=1
TABLE_INFO=tsgconf/app_sketch_tableinfo.json
STAT_FILE=app_sketch_maat.status
STAT_FILE=log/app_sketch.maat.status
EFFECT_INTERVAL_S=1
REDIS_IP={% raw %}{{ cm_policy_server_ip }}
{% endraw %}
@@ -43,7 +43,7 @@ MAAT_MODE=2
STAT_SWITCH=1
PERF_SWITCH=1
TABLE_INFO=tsgconf/capture_packet_tableinfo.json
STAT_FILE=capture_packet.status
STAT_FILE=log/capture_packet.maat.status
EFFECT_INTERVAL_S=1
REDIS_IP={% raw %}{{ cm_policy_server_ip }}
{% endraw %}

6
ansible/roles/firewall/templates/main.conf.j2.j2
View File

@@ -50,7 +50,7 @@ APP_NAME="security_rule_hits"
CYCLE=5
TELEGRAF_PORT=8100
TELEGRAF_IP="127.0.0.1"
OUTPUT_PATH="./tsg_statistic.log"
OUTPUT_PATH="log/master.metrics"
APP_NAME="statistic"
[APP_METRIC]
@@ -63,7 +63,7 @@ APP_NAME="app_metric"
CYCLE=5
TELEGRAF_PORT=8100
TELEGRAF_IP="127.0.0.1"
OUTPUT_PATH="./tsg_stat.log"
OUTPUT_PATH="log/master.status"
APP_NAME="tsg_master"
[SYSTEM]
@@ -176,7 +176,7 @@ DEVICE_TAGS={"tags":[{{ tags_list | join(",") }}]}
PACKET_TYPE_FLAG=16
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]

8
ansible/roles/sapp/templates/sapp.toml.j2.j2
View File

@@ -193,7 +193,7 @@ dictator_enable=0
enabled=1
### note, if "file_truncate_open_enabled=1", file will be truncated, otherwise open the file for appending.
file_truncate_enabled = 1
#log_file_name = "fs2_sysinfo.log"
#log_file_name = "log/fs2_sysinfo.log"
#log_conf_name = "etc/sapp_log.conf"
[profiling.log.remote]
enabled=0
@@ -282,9 +282,9 @@ dictator_enable=0
cfg_file_well_known_port="etc/well_known_port.conf"
[SECONDARY_DATA_LINK]
data_file_sysinfo_log="sysinfo.log"
data_file_field_stat_log="fs2_sysinfo.log"
data_file_inline_keepalive_log="gdev_keeplive_status.log"
data_file_sysinfo_log="log/sysinfo.log"
data_file_field_stat_log="log/fs2_sysinfo.log"
data_file_inline_keepalive_log="log/gdev_keeplive_status.log"
[LIBRARY_LINK]
marsio_library_path="{{ prefix_path.mrzcpd }}/lib/libmarsio.so"

1
ansible/roles/sapp/templates/sapp_log.conf.j2
View File

@@ -14,5 +14,4 @@ plugin = "%d(%c), %m%n"
__log_runtimelog.fatal "./log/runtimelog.%d(%F)"
__log_runtimelog_plugin.fatal >stdout; plugin
__log_runtimelog_plugin.info "./log/plugin.log.%d(%F)"; plugin
__tsglog_app_sketch_local_app_sketch_local.stop "./log/%c.%d(%F)"; other
!.fatal "./log/%c.%d(%F)"; other

38
ansible/roles/traffic-engine/files/helm/conf/app_sketch_local.inf
View File

@@ -4,44 +4,10 @@ SO_PATH=./plug/business/app_sketch_local/app_sketch_local.so
INIT_FUNC=APP_SKETCH_LOCAL_INIT
DESTROY_FUNC=APP_SKETCH_LOCAL_DESTROY
[POLLING]
FUNC_FLAG=ALL
FUNC_NAME=APP_SKETCH_POLLING_ENTRY
[TCP_ALL]
FUNC_FLAG=ALL
FUNC_NAME=APP_SKETCH_TCPALL_PLUG_ENTRY
[TCP]
FUNC_FLAG=ALL
FUNC_NAME=APP_SKETCH_TCP_PLUG_ENTRY
FUNC_NAME=APP_SKETCH_TCP_ENTRY
[UDP]
FUNC_FLAG=ALL
FUNC_NAME=APP_SKETCH_UDP_PLUG_ENTRY
{{- if eq .Values.decoders.HTTP .Values.define_enable_val_yes }}
[HTTP]
FUNC_FLAG=ALL
FUNC_NAME=APP_SKETCH_HTTP_PLUG_ENTRY
{{- end }}
{{- if eq .Values.decoders.SSL .Values.define_enable_val_yes }}
[SSL]
FUNC_FLAG=SSL_CLIENT_HELLO,SSL_SERVER_HELLO,SSL_APPLICATION_DATA,SSL_CERTIFICATE_DETAIL
FUNC_NAME=APP_SKETCH_SSL_PLUG_ENTRY
{{- end }}
{{- if eq .Values.decoders.DNS .Values.define_enable_val_yes }}
[DNS]
FUNC_FLAG=DNS_ALL
FUNC_NAME=APP_SKETCH_DNS_PLUG_ENTRY
{{- end }}
{{- if eq .Values.decoders.QUIC .Values.define_enable_val_yes }}
[QUIC]
FUNC_FLAG=QUIC_CLIENT_HELLO
FUNC_NAME=APP_SKETCH_QUIC_PLUG_ENTRY
{{- end }}
FUNC_NAME=APP_SKETCH_UDP_ENTRY

6
ansible/roles/traffic-engine/files/helm/conf/maat.conf
View File

@@ -4,7 +4,7 @@ MAAT_MODE=redis
STAT_SWITCH=1
PERF_SWITCH=1
TABLE_INFO=tsgconf/tsg_static_tableinfo.json
STAT_FILE=tsg_static_maat.status
STAT_FILE=log/master.maat.status
EFFECT_INTERVAL_S=1
REDIS_IP={{ .Values.external_resources.cm.address }}
REDIS_PORT={{ .Values.external_resources.cm.port }}
@@ -21,7 +21,7 @@ MAAT_MODE=redis
STAT_SWITCH=1
PERF_SWITCH=1
TABLE_INFO=tsgconf/app_sketch_tableinfo.json
STAT_FILE=app_sketch_maat.status
STAT_FILE=log/app_sketch.maat.status
EFFECT_INTERVAL_S=1
REDIS_IP={{ .Values.external_resources.cm.address }}
REDIS_PORT={{ .Values.external_resources.cm.port }}
@@ -37,7 +37,7 @@ MAAT_MODE=2
STAT_SWITCH=1
PERF_SWITCH=1
TABLE_INFO=tsgconf/capture_packet_tableinfo.json
STAT_FILE=capture_packet.status
STAT_FILE=log/capture_packet.maat.status
EFFECT_INTERVAL_S=1
REDIS_IP={{ .Values.external_resources.cm.address }}
REDIS_PORT={{ .Values.external_resources.cm.port }}

6
ansible/roles/traffic-engine/files/helm/conf/main.conf
View File

@@ -47,7 +47,7 @@ APP_NAME="security_rule_hits"
CYCLE=5
TELEGRAF_PORT=8100
TELEGRAF_IP="127.0.0.1"
OUTPUT_PATH="./tsg_statistic.log"
OUTPUT_PATH="log/master.metrics"
APP_NAME="statistic"
[APP_METRIC]
@@ -60,7 +60,7 @@ APP_NAME="app_metric"
CYCLE=5
TELEGRAF_PORT=8100
TELEGRAF_IP="127.0.0.1"
OUTPUT_PATH="./tsg_stat.log"
OUTPUT_PATH="log/master.status"
APP_NAME="tsg_master"
[SYSTEM]
@@ -143,7 +143,7 @@ DEVICE_TAGS={"tags":[{{- include "traffic-engine.device-tag-list" . }}]}
PACKET_TYPE_FLAG=16
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 }}

8
ansible/roles/traffic-engine/files/helm/conf/sapp.toml
View File

@@ -181,7 +181,7 @@ bypass_trigger_cpu_usage={{ .Values.overload_protection.detect_threshold_cpu_usa
enabled=1
### note, if "file_truncate_open_enabled=1", file will be truncated, otherwise open the file for appending.
file_truncate_enabled = 1
#log_file_name = "fs2_sysinfo.log"
#log_file_name = "log/fs2_sysinfo.log"
#log_conf_name = "etc/sapp_log.conf"
[profiling.log.remote]
enabled=0
@@ -249,9 +249,9 @@ bypass_trigger_cpu_usage={{ .Values.overload_protection.detect_threshold_cpu_usa
cfg_file_well_known_port="etc/well_known_port.conf"
[SECONDARY_DATA_LINK]
data_file_sysinfo_log="sysinfo.log"
data_file_field_stat_log="fs2_sysinfo.log"
data_file_inline_keepalive_log="gdev_keeplive_status.log"
data_file_sysinfo_log="log/sysinfo.log"
data_file_field_stat_log="log/fs2_sysinfo.log"
data_file_inline_keepalive_log="log/gdev_keeplive_status.log"
[LIBRARY_LINK]
marsio_library_path="/opt/tsg/mrzcpd/lib/libmarsio.so"