TSG-1531 tfe 代码整理, 将多插件公用的基础代码移动到 tfe init 阶段

	1.将 kafka 的初始化从 pangu init 阶段移动到 tfe init 阶段
	2.将 device id 的获取从 pangu init 阶段移动到 tfe init 阶段
	3.将 kafka 的配置项从 pangu.conf 移动到 tfe.conf
	4.将 maat  的配置项从 pangu.conf 移动到 tfe.conf

3 files changed, 56 insertions, 34 deletions

diff --git a/conf/doh/doh.conf b/conf/doh/doh.conf
index 0da64de..b128f71 100644
--- a/conf/doh/doh.conf
+++ b/conf/doh/doh.conf
@@ -17,18 +17,11 @@ table_addr=TSG_SECURITY_ADDR
 # default TSG_FIELD_DOH_QNAME
 table_qname=TSG_FIELD_DOH_QNAME
 # default TSG_FIELD_HTTP_HOST
-table_host=TSG_FIELD_HTTP_HOST
+table_host=TSG_FIELD_DOH_HOST
 
 [kafka]
-# default NULL
-device_id_filepath==/opt/tsg/etc/tsg_sn.json
 # default 0
 ENTRANCE_ID=0
 # default 1
-en_sendlog=1
-# default eth0
-NIC_NAME=eth0
-# defautl empty
-kafka_brokerlist=192.168.40.224:9092
-# default POLICY-DOH-LOG
-kafka_topic=POLICY-DOH-LOG
\ No newline at end of file
+# if enable "en_sendlog", the iterm "tfe.conf [kafka] enable" must set 1
+en_sendlog=1
\ No newline at end of file
diff --git a/conf/pangu/pangu_pxy.conf b/conf/pangu/pangu_pxy.conf
index 088b1fe..73d2eec 100644
--- a/conf/pangu/pangu_pxy.conf
+++ b/conf/pangu/pangu_pxy.conf
@@ -2,11 +2,9 @@
 log_level=10
 
 [log]
-nic_name=eth4
 entrance_id=0
-device_id_filepath=/opt/tsg/etc/tsg_sn.json
-kafka_brokerlist=10.4.34.10:9092,10.4.34.11:9092,10.4.34.12:9092,10.4.34.13:9092,10.4.34.14:9092,10.4.34.15:9092,10.4.34.16:9092,10.4.34.17:9092,10.4.34.18:9092,10.4.34.19:9092
-kafka_topic=policy-event-log
+# default 1, if enable "en_sendlog", the iterm "tfe.conf [kafka] enable" must set 1
+en_sendlog=1
 #Addresses of minio. Format is defined by WiredLB.
 minio_ip_list=10.4.35.42-46;
 minio_listen_port=9000
@@ -57,26 +55,6 @@ redis_server=192.168.40.137
 redis_port=6379
 redis_db_index=5
 
-[maat]
-# 0:json 1: redis 2: iris
-maat_input_mode=1
-table_info=resource/pangu/table_info.conf
-json_cfg_file=resource/
-stat_file=log/pangu_scan.fs2
-full_cfg_dir=pangu_policy/full/index/
-inc_cfg_dir=pangu_policy/inc/index/
-maat_redis_server=10.4.34.4
-maat_redis_port_range=6380-6389
-maat_redis_db_index=4
-effect_interval_s=1
-accept_tags={"tags":[{"tag":"location","value":"Astana"}]}
-[dynamic_maat]
-maat_input_mode=1
-table_info=resource/pangu/dynamic_maat_table_info.conf
-maat_redis_server=10.4.20.151
-maat_redis_port_range=6380-6389
-maat_redis_db_index=0
-effect_interval_s=1
 [tango_cache]
 enable_cache=1
 min_cache_obj_size=512
diff --git a/conf/tfe/tfe.conf b/conf/tfe/tfe.conf
index 1ca97ea..ac92c87 100644
--- a/conf/tfe/tfe.conf
+++ b/conf/tfe/tfe.conf
@@ -81,3 +81,54 @@ loglevel=20
 [traffic_mirror]
 device=eth4
 type=1
+
+[kafka]
+enable=1
+NIC_NAME=enp2s0
+kafka_brokerlist=192.168.40.224:9092
+kafka_topic=POLICY-EVENT-LOG
+device_id_filepath==/opt/tsg/etc/tsg_sn.json
+
+[maat]
+# 0:json 1:redis 2:iris
+maat_input_mode=1
+stat_switch=1
+perf_switch=1
+table_info=resource/pangu/table_info.conf
+accept_tags={"tags":[{"tag":"location","value":"Astana"}]}
+stat_file=log/pangu_scan.fs2
+effect_interval_s=1
+
+# json mode conf iterm
+json_cfg_file=resource/pangu/pangu_http.json
+
+# redis mode conf iterm
+maat_redis_server=10.4.34.4
+maat_redis_port_range=6380-6389
+maat_redis_db_index=4
+
+# iris mode conf iterm
+full_cfg_dir=pangu_policy/full/index/
+inc_cfg_dir=pangu_policy/inc/index/
+
+[dynamic_maat]
+# 0:json 1:redis 2:iris
+maat_input_mode=1
+stat_switch=1
+perf_switch=1
+table_info=resource/pangu/dynamic_maat_table_info.conf
+accept_tags={"tags":[{"tag":"location","value":"Astana"}]}
+stat_file=log/pangu_scan.fs2
+effect_interval_s=1
+
+# json mode conf iterm
+json_cfg_file=resource/pangu/pangu_http.json
+
+# redis mode conf iterm
+maat_redis_server=10.4.34.4
+maat_redis_port_range=6380-6389
+maat_redis_db_index=4
+
+# redis mode conf iterm
+full_cfg_dir=pangu_policy/full/index/
+inc_cfg_dir=pangu_policy/inc/index/
\ No newline at end of file