From 0603ff3d3b863d873b101f4b05b97e2ce85c86ff Mon Sep 17 00:00:00 2001 From: luwenpeng Date: Fri, 13 Nov 2020 19:19:26 +0600 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20traffic=20mirror=20?= =?UTF-8?q?=E7=9A=84=20maat=20=E9=85=8D=E7=BD=AE=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/pangu/pangu_pxy.conf | 4 ---- conf/tfe/tfe.conf | 9 ++------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/conf/pangu/pangu_pxy.conf b/conf/pangu/pangu_pxy.conf index 600403d..aa5b6d4 100644 --- a/conf/pangu/pangu_pxy.conf +++ b/conf/pangu/pangu_pxy.conf @@ -91,7 +91,3 @@ query_undefined_obj=0 statsd_server=10.4.20.201 statsd_port=8125 histogram_bins=0.20,0.40,0.6,0.8 - -[traffic_mirror] -table_info=resource/pangu/table_info_traffic_mirror.conf -stat_file=log/traffic_mirror.status diff --git a/conf/tfe/tfe.conf b/conf/tfe/tfe.conf index 9d7d203..1f0ab0e 100644 --- a/conf/tfe/tfe.conf +++ b/conf/tfe/tfe.conf @@ -140,6 +140,8 @@ enable=1 device=eth4 # 0:TRAFFIC_MIRROR_ETHDEV_AF_PACKET; 1:TRAFFIC_MIRROR_ETHDEV_MARSIO type=1 +table_info=resource/pangu/table_info_traffic_mirror.conf +stat_file=log/traffic_mirror.status [kafka] enable=1 @@ -160,13 +162,6 @@ stat_file=log/pangu_scan.fs2 effect_interval_s=1 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_cfg_file=resource/pangu/pangu_http.json