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

feature:TSG-7875,TSG-7976,provision新增session_record_id_generator和device.tags配置项

Browse Source
This commit is contained in:
fumingwei
2021-09-28 16:46:42 +08:00
committed by 付明卫
parent 3daacf1f3a
commit 217ec45e57
6 changed files with 64 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,5 +65,19 @@ FULL_CFG_DIR=tsgrule/full/index/
EFFECTIVE_RANGE_FILE=/opt/tsg/etc/tsg_device_tag.json
[MAAT]
{% raw %}ACCEPT_TAGS={"tags":[{"tag":"data_center","value":"{{ data_center.name }}"}]}
{% raw %}{% set tags_list = [] %}
{% if data_center.name is defined %}
{% set tag_json = "{\"tag\":\"" ~ "data_center" ~ "\",\"value\":\"" ~ data_center.name ~ "\"}" %}
{{tags_list.append(tag_json)}}{% endif %}
{% if device.tags is defined %}
{% for device_tag in device.tags %}
{% for key,value in device_tag.items() %}
{% set tag_json = "{\"tag\":\"" ~ key ~ "\",\"value\":\"" ~ value ~ "\"}" %}
{{tags_list.append(tag_json)}}{% endfor %}
{% endfor %}
{% endif %}
{% if data_center.name is not defined and device.tags is not defined %}
{{ device.tags }}
{% endif %}
ACCEPT_TAGS={"tags":[{{ tags_list | join(",") }}]}
{% endraw %}

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

@@ -65,14 +65,26 @@ APP_NAME="tsg_master"
[SYSTEM]
NIC_NAME="{{ firewall.main_conf.SYSTEM.NIC_NAME }}"
{% raw %}DATACENTER_ID={{ data_center.id }}
{% raw %}{% if session_record_id_generator.snowflake_worker_id_base is defined %}
DATACENTER_ID={{ session_record_id_generator.snowflake_worker_id_base }}
{% elif data_center.id is defined %}
DATACENTER_ID={{ data_center.id }}
{% else %}
DATACENTER_ID={{ session_record_id_generator.snowflake_worker_id_base }}
{% endif %}
{% endraw %}
LOG_LEVEL=30
LOG_PATH="./tsglog/tsg_master"
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}'"
{% raw %}DEVICE_SEQ_IN_DATA_CENTER={{ device.sequence_in_data_center }}
{% raw %}{% if session_record_id_generator.snowflake_worker_id_offset is defined %}
DEVICE_SEQ_IN_DATA_CENTER={{ session_record_id_generator.snowflake_worker_id_offset }}
{% elif device.sequence_in_data_center is defined %}
DEVICE_SEQ_IN_DATA_CENTER={{ device.sequence_in_data_center }}
{% else %}
DEVICE_SEQ_IN_DATA_CENTER={{ session_record_id_generator.snowflake_worker_id_offset }}
{% endif %}
{% endraw %}
[TSG_CONN_SKETCH]

12
ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.7400MCN0P01R01
View File

@@ -1,11 +1,13 @@
version: 1
data_center:
name: City instance
id: 1
device:
sequence_in_data_center: 1
tags:
- key1: value1
- key2: value2
session_record_id_generator:
snowflake_worker_id_base: 1
snowflake_worker_id_offset: 1
feature:
enable_policy_local_cache: 1

7
ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.7400MCN123P01R01
View File

@@ -1,8 +1,9 @@
version: 1
data_center:
name: City instance
id: 1
device:
tags:
- key1: value1
- key2: value2
feature:
enable_policy_local_cache: 1

13
ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.9000NPBP01R01
View File

@@ -1,11 +1,14 @@
version: 1
data_center:
name: City instance
id: 1
device:
sequence_in_data_center: 1
tags:
- key1: value1
- key2: value2
session_record_id_generator:
snowflake_worker_id_base: 1
snowflake_worker_id_offset: 1
feature:
enable_stream_bypass_under_ddos: 0

18
ansible/roles/tsg_device_tag/templates/tsg_device_tag.json.j2.j2
View File

@@ -1,3 +1,17 @@
[MAAT]
{% raw %}ACCEPT_TAGS={"tags":[{"tag":"data_center","value":"{{ data_center.name }}"}]}
[MAAT]
{% raw %}{% set tags_list = [] %}
{% if data_center.name is defined %}
{% set tag_json = "{\"tag\":\"" ~ "data_center" ~ "\",\"value\":\"" ~ data_center.name ~ "\"}" %}
{{tags_list.append(tag_json)}}{% endif %}
{% if device.tags is defined %}
{% for device_tag in device.tags %}
{% for key,value in device_tag.items() %}
{% set tag_json = "{\"tag\":\"" ~ key ~ "\",\"value\":\"" ~ value ~ "\"}" %}
{{tags_list.append(tag_json)}}{% endfor %}
{% endfor %}
{% endif %}
{% if data_center.name is not defined and device.tags is not defined %}
{{ device.tags }}
{% endif %}
ACCEPT_TAGS={"tags":[{{ tags_list | join(",") }}]}
{% endraw %}