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

更新tsg_master、firewal插件，支持:

Browse Source 
TSG-14177 - TSG命中Security Policy后根据策略ID发送相应的Metric
TSG-13778 - TSG master支持MAAT4
TSG-13779 - Firewall支持MAAT4
This commit is contained in:
liuxueli
2023-04-03 19:51:57 +08:00
committed by 付明卫
parent 47a047f488
commit 35e2a36f5d
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@ certstore_rpm_version:
firewall_rpm_version:
capture_packet_plug: capture_packet_plug-4.1.5.b9783ff
conn_telemetry: conn_telemetry-1.0.3.4ef6df6
firewall: firewall-1.0.8.caa4b57
firewall: firewall-2.0.0.fbdb9af
tsg_conn_sketch: tsg_conn_sketch-3.4.2.7c84a19
gtp_signaling_plug: gtp_signaling_plug-1.0.5.8d64946
tsg_vulpes: tsg_vulpes-1.0.9.0d7c615
@@ -77,7 +77,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.8.8819217
tsg_master: tsg_master-6.0.0.39cdb03
shaping_master_rpm_version:
shaping_master: shaping_master-1.1.4.b434f47

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

@@ -1,9 +1,9 @@
[STATIC]
###0:location 1:json 2:redis
MAAT_MODE=2
MAAT_MODE=redis
STAT_SWITCH=1
PERF_SWITCH=1
TABLE_INFO=tsgconf/tsg_static_tableinfo.conf
TABLE_INFO=tsgconf/tsg_static_tableinfo.json
STAT_FILE=tsg_static_maat.status
EFFECT_INTERVAL_S=1
REDIS_IP={% raw %}{{ cm_policy_server_ip }}
@@ -39,7 +39,7 @@ EFFECTIVE_RANGE_FILE=/opt/tsg/etc/tsg_device_tag.json
MAAT_MODE=2
STAT_SWITCH=1
PERF_SWITCH=1
TABLE_INFO=tsgconf/capture_packet_tableinfo.conf
TABLE_INFO=tsgconf/capture_packet_tableinfo.json
STAT_FILE=capture_packet.status
EFFECT_INTERVAL_S=1
REDIS_IP={% raw %}{{ cm_policy_server_ip }}

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

@@ -1,9 +1,9 @@
[STATIC]
###0:location 1:json 2:redis
MAAT_MODE=2
MAAT_MODE=redis
STAT_SWITCH=1
PERF_SWITCH=1
TABLE_INFO=tsgconf/tsg_static_tableinfo.conf
TABLE_INFO=tsgconf/tsg_static_tableinfo.json
STAT_FILE=tsg_static_maat.status
EFFECT_INTERVAL_S=1
REDIS_IP={{ .Values.external_resources.cm.address }}
@@ -33,7 +33,7 @@ EFFECTIVE_RANGE_FILE=/opt/tsg/etc/tsg_device_tag.json
MAAT_MODE=2
STAT_SWITCH=1
PERF_SWITCH=1
TABLE_INFO=tsgconf/capture_packet_tableinfo.conf
TABLE_INFO=tsgconf/capture_packet_tableinfo.json
STAT_FILE=capture_packet.status
EFFECT_INTERVAL_S=1
REDIS_IP={{ .Values.external_resources.cm.address }}