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

Update firewall-3.0.12.7fb8f4d stellar-c-1.0.6.37117f9

Browse Source
This commit is contained in:
liuxueli
2023-12-13 18:44:26 +08:00
parent fc584d815e
commit 5e3349ce45
3 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,7 @@ certstore_rpm_version:
firewall_rpm_version: firewall_rpm_version:
conn_telemetry: conn_telemetry-1.0.3.4ef6df6 conn_telemetry: conn_telemetry-1.0.3.4ef6df6
firewall: firewall-3.0.11.f3473f5 firewall: firewall-3.0.12.7fb8f4d
#gtp_signaling_plug: gtp_signaling_plug-2.0.0.3f233d7 #gtp_signaling_plug: gtp_signaling_plug-2.0.0.3f233d7
#radius_collect_plug: radius_collect_plug-2.0.11.47a51f3 #radius_collect_plug: radius_collect_plug-2.0.11.47a51f3
glimpse_detector: glimpse_detector-3.0.0.7240884 glimpse_detector: glimpse_detector-3.0.0.7240884
@@ -28,7 +28,7 @@ firewall_rpm_version:
session_flags: session_flags-2.2.5.fb0ff23 session_flags: session_flags-2.2.5.fb0ff23
stat_policy_enforcer: stat_policy_enforcer-3.1.4.95250e9 stat_policy_enforcer: stat_policy_enforcer-3.1.4.95250e9
sf_classifier: sf_classifier-1.0.8.7da11bd sf_classifier: sf_classifier-1.0.8.7da11bd
stellar-c: stellar-c-1.0.4.44f2c7f stellar-c: stellar-c-1.0.6.37117f9
framework_rpm_version: framework_rpm_version:
00_libcjson: libcjson-1.7.12.6c09dcf 00_libcjson: libcjson-1.7.12.6c09dcf

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

@@ -1,11 +1,11 @@
[STATIC] [CM_STATIC_MAAT]
###file, json, redis ###file, json, redis
MAAT_MODE=redis MAAT_MODE=redis
STAT_SWITCH=1 STAT_SWITCH=1
PERF_SWITCH=0 PERF_SWITCH=0
HIT_GROUP_SWITCH=1 HIT_GROUP_SWITCH=1
TABLE_INFO=tsgconf/firewall_maat_tableinfo.json TABLE_INFO=tsgconf/firewall_cm_maat_tableinfo.json
STAT_FILE=log/firewall.maat.status STAT_FILE=log/firewall.cm.maat.status
EFFECT_INTERVAL_MS=1000 EFFECT_INTERVAL_MS=1000
GARBAGE_COLLECT_MS=60000 GARBAGE_COLLECT_MS=60000
RULE_UPDATE_CHECK_INTERVAL_MS=1000 RULE_UPDATE_CHECK_INTERVAL_MS=1000
@@ -15,11 +15,30 @@ REDIS_PORT={% raw %}{{ cm_policy_server_port }}
{% endraw %} {% endraw %}
{% raw %}REDIS_INDEX={{ vsys_id }} {% raw %}REDIS_INDEX={{ vsys_id }}
{% endraw %} {% endraw %}
JSON_CFG_FILE=tsgconf/firewall_maat_rule.json JSON_CFG_FILE=tsgconf/firewall_cm_maat_rule.json
INC_CFG_DIR=tsgrule/inc/index/ INC_CFG_DIR=tsgrule/inc/index/
FULL_CFG_DIR=tsgrule/full/index/ FULL_CFG_DIR=tsgrule/full/index/
EFFECTIVE_RANGE_FILE=/opt/tsg/etc/tsg_device_tag.json EFFECTIVE_RANGE_FILE=/opt/tsg/etc/tsg_device_tag.json
LOG_PATH="log/firewall.maat" LOG_PATH="log/firewall.cm.maat"
[SD_DYNAMIC_MAAT]
MAAT_MODE=redis
STAT_SWITCH=1
PERF_SWITCH=1
TABLE_INFO=tsgconf/firewall_sd_maat_tableinfo.json
STAT_FILE=log/firewall.sd.maat.status
EFFECT_INTERVAL_MS=100
GARBAGE_COLLECT_MS=30000
RULE_UPDATE_CHECK_INTERVAL_MS=100
REDIS_IP=127.0.0.1
REDIS_PORT_NUM=1
REDIS_PORT=7002
REDIS_INDEX=1
JSON_CFG_FILE=tsgconf/firewall_sd_maat_rule.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/firewall.sd.maat"
[MAAT] [MAAT]
{% raw %}{% set tags_list = [] %} {% raw %}{% set tags_list = [] %}

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

@@ -1,29 +1,29 @@
[STATIC] [CM_STATIC_MAAT]
###file, json, redis ###file, json, redis
MAAT_MODE=redis MAAT_MODE=redis
STAT_SWITCH=1 STAT_SWITCH=1
PERF_SWITCH=0 PERF_SWITCH=0
HIT_GROUP_SWITCH=1 HIT_GROUP_SWITCH=1
TABLE_INFO=tsgconf/firewall_maat_tableinfo.json TABLE_INFO=tsgconf/firewall_cm_maat_tableinfo.json
STAT_FILE=log/master.maat.status STAT_FILE=log/firewall.cm.maat.status
EFFECT_INTERVAL_MS=1000 EFFECT_INTERVAL_MS=1000
GARBAGE_COLLECT_MS=60000 GARBAGE_COLLECT_MS=60000
RULE_UPDATE_CHECK_INTERVAL_MS=1000 RULE_UPDATE_CHECK_INTERVAL_MS=1000
REDIS_IP={{- include "traffic-engine.global.cm.server-ip" . }} REDIS_IP={{- include "traffic-engine.global.cm.server-ip" . }}
REDIS_PORT={{- include "traffic-engine.global.cm.server-port" . }} REDIS_PORT={{- include "traffic-engine.global.cm.server-port" . }}
REDIS_INDEX={{ .Values.vsys_id }} REDIS_INDEX={{ .Values.vsys_id }}
JSON_CFG_FILE=tsgconf/firewall_maat_rule.json JSON_CFG_FILE=tsgconf/firewall_cm_maat_rule.json
INC_CFG_DIR=tsgrule/inc/index/ INC_CFG_DIR=tsgrule/inc/index/
FULL_CFG_DIR=tsgrule/full/index/ FULL_CFG_DIR=tsgrule/full/index/
EFFECTIVE_RANGE_FILE=/opt/tsg/etc/tsg_device_tag.json EFFECTIVE_RANGE_FILE=/opt/tsg/etc/tsg_device_tag.json
LOG_PATH="log/master.maat" LOG_PATH="log/firewall.cm.maat"
[DYNAMIC_MAPPING_MAAT] [SD_DYNAMIC_MAAT]
MAAT_MODE=redis MAAT_MODE=redis
STAT_SWITCH=1 STAT_SWITCH=1
PERF_SWITCH=1 PERF_SWITCH=1
TABLE_INFO=tsgconf/tsg_dynamic_mapping_tableinfo.json TABLE_INFO=tsgconf/firewall_sd_maat_tableinfo.json
STAT_FILE=log/dynamic.mapping.maat.status STAT_FILE=log/firewall.sd.maat.status
EFFECT_INTERVAL_MS={{ .Values.external_resources.sd.policy_effect_interval_ms }} EFFECT_INTERVAL_MS={{ .Values.external_resources.sd.policy_effect_interval_ms }}
GARBAGE_COLLECT_MS={{ .Values.external_resources.sd.policy_garbage_collection_interval_ms }} GARBAGE_COLLECT_MS={{ .Values.external_resources.sd.policy_garbage_collection_interval_ms }}
RULE_UPDATE_CHECK_INTERVAL_MS={{ .Values.external_resources.sd.policy_update_check_interval_ms }} RULE_UPDATE_CHECK_INTERVAL_MS={{ .Values.external_resources.sd.policy_update_check_interval_ms }}
@@ -31,12 +31,11 @@ REDIS_IP={{- include "traffic-engine.global.sd.server-ip" . }}
REDIS_PORT_NUM=1 REDIS_PORT_NUM=1
REDIS_PORT={{- include "traffic-engine.global.sd.server-port" . }} REDIS_PORT={{- include "traffic-engine.global.sd.server-port" . }}
REDIS_INDEX={{ .Values.external_resources.sd.db_index }} REDIS_INDEX={{ .Values.external_resources.sd.db_index }}
JSON_CFG_FILE=tsgconf/tsg_dynamic_mapping_maat.json JSON_CFG_FILE=tsgconf/firewall_sd_maat_rule.json
INC_CFG_DIR=tsgrule/inc/index/ INC_CFG_DIR=tsgrule/inc/index/
FULL_CFG_DIR=tsgrule/full/index/ FULL_CFG_DIR=tsgrule/full/index/
EFFECTIVE_RANGE_FILE=/opt/tsg/etc/tsg_device_tag.json EFFECTIVE_RANGE_FILE=/opt/tsg/etc/tsg_device_tag.json
LOG_LEVEL=0 LOG_PATH="log/firewall.sd.maat"
LOG_PATH="log/dynamic.mapping.maat"
[MAAT] [MAAT]
ACCEPT_TAGS={"tags":[{{- include "traffic-engine.device-tag-list" . }}]} ACCEPT_TAGS={"tags":[{{- include "traffic-engine.device-tag-list" . }}]}