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

1.delete telegraf_statistic output influxdb

Browse Source 
2.modify mcn0 and mcn123 mrzcpd config  icore
3.modify firewall template  tags error
This commit is contained in:
fumingwei
2020-11-20 11:18:49 +06:00
parent fb1ad1955b
commit 0ab4d2a4ec
6 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
NurSultan_install_config/group_vars/adc_global.yml
View File

@@ -36,8 +36,8 @@ log_kafkabrokers:
telegraf_kafkabrokers: telegraf_kafkabrokers:
address: "\"10.4.61.10:9092\",\"10.4.61.11:9092\",\"10.4.61.12:9092\",\"10.4.61.13:9092\",\"10.4.61.14:9092\",\"10.4.61.15:9092\",\"10.4.61.16:9092\",\"10.4.61.17:9092\",\"10.4.61.18:9092\",\"10.4.61.19:9092\",\"10.4.61.20:9092\"" address: "\"10.4.61.10:9092\",\"10.4.61.11:9092\",\"10.4.61.12:9092\",\"10.4.61.13:9092\",\"10.4.61.14:9092\",\"10.4.61.15:9092\",\"10.4.61.16:9092\",\"10.4.61.17:9092\",\"10.4.61.18:9092\",\"10.4.61.19:9092\",\"10.4.61.20:9092\""
monitor_outputs_influxdb: #monitor_outputs_influxdb:
url: "http://127.0.0.1:58086" # url: "http://127.0.0.1:58086"
log_minio: log_minio:
address: "10.4.62.253" address: "10.4.62.253"
@@ -93,9 +93,9 @@ kni:
######################################## ########################################
#Tfe Config #Tfe Config
tfe: #tfe:
nr_threads: 32 # nr_threads: 32
mirror_enable: 1 # mirror_enable: 1
######################################## ########################################
#Marsio Config #Marsio Config

7
group_vars/adc_global_general.yml
View File

@@ -77,15 +77,18 @@ kni:
######################################## ########################################
#Tfe Config #Tfe Config
tfe: tfe:
nr_threads: 32 nr_threads: 50
mirror_enable: 1 mirror_enable: 1
######################################## ########################################
#Marsio Config #Marsio Config
#marsio工作在ADC计算板时，建议使用如下配置，以保证更高的处理性能 #marsio工作在ADC计算板时，建议使用如下配置，以保证更高的处理性能
mrzcpd: mcn0_mrzcpd:
iocore: 52,53,54,55 iocore: 52,53,54,55
mcn123_mrzcpd:
iocore: 54,55
mrtunnat: mrtunnat:
lcore_id: 48,49,50,51 lcore_id: 48,49,50,51

2
roles/firewall/tasks/main.yml
View File

@@ -56,5 +56,5 @@
template: template:
src: "{{ role_path }}/templates/tsg_conn_sketch.inf.j2" src: "{{ role_path }}/templates/tsg_conn_sketch.inf.j2"
dest: /home/mesasoft/sapp_run/plug/business/tsg_conn_sketch/tsg_conn_sketch.inf dest: /home/mesasoft/sapp_run/plug/business/tsg_conn_sketch/tsg_conn_sketch.inf
tags: template tags: template tags: template

6
roles/mrzcpd/templates/adc_inline/mrglobal.conf.adc_inline.j2
View File

@@ -32,7 +32,11 @@ promisc=1
[service] [service]
# lcore id for i/o service, use comma to split # lcore id for i/o service, use comma to split
iocore={{ mrzcpd.iocore }} {% if bladename == "mcn0" %}
iocore={{ mcn0_mrzcpd.iocore }}
{% else %}
iocore={{ mcn123_mrzcpd.iocore }}
{% endif %}
distmode=2 distmode=2
hashmode=0 hashmode=0

6
roles/mrzcpd/templates/allot_access/mrglobal.conf.allot_access.j2
View File

@@ -33,7 +33,11 @@ promisc=1
[service] [service]
# lcore id for i/o service, use comma to split # lcore id for i/o service, use comma to split
iocore={{ mrzcpd.iocore }} {% if bladename == "mcn0" %}
iocore={{ mcn0_mrzcpd.iocore }}
{% else %}
iocore={{ mcn123_mrzcpd.iocore }}
{% endif %}
distmode=2 distmode=2
hashmode=0 hashmode=0

6
roles/telegraf_statistic/templates/telegraf_statistic.conf.j2
View File

@@ -30,6 +30,6 @@
ServiceAddress= ":8100" ServiceAddress= ":8100"
data_format = "influx" data_format = "influx"
[[outputs.influxdb]] #[[outputs.influxdb]]
urls = ["{{ monitor_outputs_influxdb.url }}"] # urls = ["{{ monitor_outputs_influxdb.url }}"]
database = "tsg_stat" # database = "tsg_stat"