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

1.update libMESA_field_stat2-2.9.7 to support prometheus output

Browse Source 
2.update tfe-4.3.21 traffic mirror maat conf
	3.update tfe-4.3.21 support prometheus
This commit is contained in:
fumingwei
2020-11-14 11:09:44 +06:00
parent 8756e297c6
commit 3d52dba2d3
7 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
roles/framework/files/libMESA_field_stat2-2.9.7.2.9.7.2.9.7.0ec8a76-2.el7.x86_64.rpm Normal file
View File

Binary file not shown.

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

@@ -14,7 +14,7 @@
- /tmp/ansible_deploy/libdocumentanalyze-2.0.6.2d1abe0-2.el7.x86_64.rpm - /tmp/ansible_deploy/libdocumentanalyze-2.0.6.2d1abe0-2.el7.x86_64.rpm
- /tmp/ansible_deploy/libmaatframe-3.1.3.4fbcf21-2.el7.x86_64.rpm - /tmp/ansible_deploy/libmaatframe-3.1.3.4fbcf21-2.el7.x86_64.rpm
- /tmp/ansible_deploy/libMESA_field_stat-1.0.2.6d45eed-2.el7.x86_64.rpm - /tmp/ansible_deploy/libMESA_field_stat-1.0.2.6d45eed-2.el7.x86_64.rpm
- /tmp/ansible_deploy/libMESA_field_stat2-2.9.4.4e2dd78-2.el7.x86_64.rpm - /tmp/ansible_deploy/libMESA_field_stat2-2.9.7.2.9.7.2.9.7.0ec8a76-2.el7.x86_64.rpm
- /tmp/ansible_deploy/libMESA_handle_logger-2.0.7.cb4ad71-2.el7.x86_64.rpm - /tmp/ansible_deploy/libMESA_handle_logger-2.0.7.cb4ad71-2.el7.x86_64.rpm
- /tmp/ansible_deploy/libMESA_htable-3.10.12.cf4ccfc-2.el7.x86_64.rpm - /tmp/ansible_deploy/libMESA_htable-3.10.12.cf4ccfc-2.el7.x86_64.rpm
- /tmp/ansible_deploy/libMESA_prof_load-1.0.6.c6da36a-2.el7.x86_64.rpm - /tmp/ansible_deploy/libMESA_prof_load-1.0.6.c6da36a-2.el7.x86_64.rpm

BIN
roles/tfe/files/tfe-4.3.21.012f4f6-1.el7.x86_64.rpm Normal file
View File

Binary file not shown.

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

@@ -14,7 +14,7 @@
yum: yum:
name: name:
- /tmp/ansible_deploy/tfe-kmod-v1.0.5.20200408-1dkms.noarch.rpm - /tmp/ansible_deploy/tfe-kmod-v1.0.5.20200408-1dkms.noarch.rpm
- /tmp/ansible_deploy/tfe-4.3.19.6e80fc6-1.el7.x86_64.rpm - /tmp/ansible_deploy/tfe-4.3.21.012f4f6-1.el7.x86_64.rpm
state: present state: present
- name: "template tfe-env config" - name: "template tfe-env config"

4
roles/tfe/templates/future.conf.j2
View File

@@ -1,7 +1,7 @@
[STAT] [STAT]
no_stats=0 no_stats=0
statsd_server=127.0.0.1 statsd_server=192.168.100.1
statsd_port=58100 statsd_port=8100
histogram_bins=0.50,0.80,0.9,0.95 histogram_bins=0.50,0.80,0.9,0.95
statsd_cycle=5 statsd_cycle=5
# FS_OUTPUT_STATSD=1, FS_OUTPUT_INFLUX_LINE=2 # FS_OUTPUT_STATSD=1, FS_OUTPUT_INFLUX_LINE=2

4
roles/tfe/templates/pangu_pxy.conf.j2
View File

@@ -103,7 +103,3 @@ log_fsstat_dst_ip=10.4.20.201
log_fsstat_dst_port=8125 log_fsstat_dst_port=8125
[traffic_mirror]
table_info=resource/pangu/table_info_traffic_mirror.conf
stat_file=log/traffic_mirror.status

15
roles/tfe/templates/tfe.conf.j2
View File

@@ -132,12 +132,14 @@ tcp_ttl_upstream=75
tcp_ttl_downstream=70 tcp_ttl_downstream=70
[stat] [stat]
statsd_server=127.0.0.1 statsd_server=192.168.100.1
statsd_port=58100 statsd_port=8100
statsd_cycle=5 statsd_cycle=5
# 1:FS_OUTPUT_STATSD; 2:FS_OUTPUT_INFLUX_LINE # 1:FS_OUTPUT_STATSD; 2:FS_OUTPUT_INFLUX_LINE
statsd_format=2 statsd_format=2
histogram_bins=0.5,0.8,0.9,0.95 histogram_bins=0.5,0.8,0.9,0.95
statsd_set_prometheus_port=9001
statsd_set_prometheus_url_path=/metrics
[traffic_mirror] [traffic_mirror]
{% if tsg_running_type != 2 %} {% if tsg_running_type != 2 %}
@@ -151,6 +153,8 @@ device={{ nic_traffic_mirror.name }}
# 0:TRAFFIC_MIRROR_ETHDEV_AF_PACKET; 1:TRAFFIC_MIRROR_ETHDEV_MARSIO # 0:TRAFFIC_MIRROR_ETHDEV_AF_PACKET; 1:TRAFFIC_MIRROR_ETHDEV_MARSIO
type=1 type=1
{% endif %} {% endif %}
table_info=resource/pangu/table_info_traffic_mirror.conf
stat_file=log/traffic_mirror.status
[kafka] [kafka]
enable=1 enable=1
@@ -170,13 +174,6 @@ stat_file=log/pangu_scan.fs2
effect_interval_s=1 effect_interval_s=1
deferred_load_on=0 deferred_load_on=0
# Pangu uses accept_tags to support the effective range of the device.
# Traffic mirroring does not need to support the effective range of the device,
# but pangu and traffic mirroring use the same maat configuration file.
# Therefore, there is no need to set accept_tags in tfe.conf,
# just set accept_tags in the tfe_resource_init() code
# accept_tags={"tags":[{"tag":"device_id","value":"device_1"}]}
# json mode conf iterm # json mode conf iterm
json_cfg_file=resource/pangu/pangu_http.json json_cfg_file=resource/pangu/pangu_http.json