更新流控需求,修改默认上限为3Gbps,改libratelimit.so.1为libratelimit.so; 修复wire_graft因链路信息太多,导致解析文件失败但忘记关闭fd句柄的bug;v20.11

7 files changed, 23 insertions, 21 deletions

diff --git a/cec6_env/group_vars/all.yml b/cec6_env/group_vars/all.yml
index 36a171e..40948af 100644
--- a/cec6_env/group_vars/all.yml
+++ b/cec6_env/group_vars/all.yml
@@ -14,11 +14,11 @@ houyi_global:
         redis_index: 0
         
     rpm_files:
-        houyi_rpm_file: "houyi-1.3.9.9acc87f-1.el7.x86_64.rpm"    
+        houyi_rpm_file: "net_flood-2.1.9.22bb6d5-1.el7.x86_64.rpm"    
         houyi_common_tools_rpm_file: "houyi-common-tools-1.0.6.4e88b89-1.el7.x86_64.rpm"
         houyi_plug_rpm_file: "houyi-plug-1.3.7.0090f28-1.el7.x86_64.rpm"
-        wire_graft_rpm_file: "libwire_graft-1.1.4.ab9badd-2.el7.x86_64.rpm"
-        net_flood_rpm_file: "net_flood-2.1.7.c201512-1.el7.x86_64.rpm"
+        wire_graft_rpm_file: "libwire_graft-1.1.7.a119d59-2.el7.x86_64.rpm"
+        net_flood_rpm_file: "net_flood-2.1.9.22bb6d5-1.el7.x86_64.rpm"
         sapp_rpm_file: "sapp-4.1.7.4f2839a-2.el7.x86_64.rpm"
         
     kafka:
@@ -30,7 +30,8 @@ houyi_global:
         device_id: "device_1"
 
     traffic_control:
-        enabled: 0
-        redis_server_ip: "192.168.40.120"
-        redis_server_port: 7003
-        redis_index: 6        
\ No newline at end of file
+        enabled: 1
+        tc_token_name: "ratelimit"
+        redis_server_ip: "127.0.0.1"
+        redis_server_port: 6379
+        redis_index: 1
\ No newline at end of file
diff --git a/roles/active_defence/files/rpm/houyi-plug-1.3.7.0090f28-1.el7.x86_64.rpm b/roles/active_defence/files/rpm/houyi-plug-1.3.7.0090f28-1.el7.x86_64.rpm
index 90a835a..05df7ae 100644
--- a/roles/active_defence/files/rpm/houyi-plug-1.3.7.0090f28-1.el7.x86_64.rpm
+++ b/roles/active_defence/files/rpm/houyi-plug-1.3.7.0090f28-1.el7.x86_64.rpm
diff --git a/roles/active_defence/files/rpm/libwire_graft-1.1.4.ab9badd-2.el7.x86_64.rpm b/roles/active_defence/files/rpm/libwire_graft-1.1.4.ab9badd-2.el7.x86_64.rpm
deleted file mode 100644
index 588d48c..0000000
--- a/roles/active_defence/files/rpm/libwire_graft-1.1.4.ab9badd-2.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/active_defence/files/rpm/libwire_graft-1.1.7.a119d59-2.el7.x86_64.rpm b/roles/active_defence/files/rpm/libwire_graft-1.1.7.a119d59-2.el7.x86_64.rpm
new file mode 100644
index 0000000..21c6685
--- /dev/null
+++ b/roles/active_defence/files/rpm/libwire_graft-1.1.7.a119d59-2.el7.x86_64.rpm
diff --git a/roles/active_defence/files/rpm/net_flood-2.1.7.c201512-1.el7.x86_64.rpm b/roles/active_defence/files/rpm/net_flood-2.1.7.c201512-1.el7.x86_64.rpm
deleted file mode 100644
index dc676a4..0000000
--- a/roles/active_defence/files/rpm/net_flood-2.1.7.c201512-1.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/active_defence/files/rpm/net_flood-2.1.9.22bb6d5-1.el7.x86_64.rpm b/roles/active_defence/files/rpm/net_flood-2.1.9.22bb6d5-1.el7.x86_64.rpm
new file mode 100644
index 0000000..6903a95
--- /dev/null
+++ b/roles/active_defence/files/rpm/net_flood-2.1.9.22bb6d5-1.el7.x86_64.rpm
diff --git a/xxg_env/group_vars/all.yml b/xxg_env/group_vars/all.yml
index 7bf84e7..40948af 100644
--- a/xxg_env/group_vars/all.yml
+++ b/xxg_env/group_vars/all.yml
@@ -3,34 +3,35 @@ houyi_global:
         install: false
         packet_io:
             inbound_route_dir: 1
-            internal_device: "eth5"
-            external_device: "eth4"
+            internal_device: "enp175s0f1"
+            external_device: "enp175s0f0"
         packet_io_depolyment:
             mode: "transparent"
             
     houyi:
-        redis_server_ip: "192.168.40.120"
-        redis_server_port: 7003
+        redis_server_ip: "192.168.70.125"
+        redis_server_port: 7002
         redis_index: 0
         
     rpm_files:
-        houyi_rpm_file: "houyi-1.3.9.9acc87f-1.el7.x86_64.rpm"    
+        houyi_rpm_file: "net_flood-2.1.9.22bb6d5-1.el7.x86_64.rpm"    
         houyi_common_tools_rpm_file: "houyi-common-tools-1.0.6.4e88b89-1.el7.x86_64.rpm"
         houyi_plug_rpm_file: "houyi-plug-1.3.7.0090f28-1.el7.x86_64.rpm"
-        wire_graft_rpm_file: "libwire_graft-1.1.4.ab9badd-2.el7.x86_64.rpm"
-        net_flood_rpm_file: "net_flood-2.1.7.c201512-1.el7.x86_64.rpm"
+        wire_graft_rpm_file: "libwire_graft-1.1.7.a119d59-2.el7.x86_64.rpm"
+        net_flood_rpm_file: "net_flood-2.1.9.22bb6d5-1.el7.x86_64.rpm"
         sapp_rpm_file: "sapp-4.1.7.4f2839a-2.el7.x86_64.rpm"
         
     kafka:
-        brokers: "192.168.40.224:9092"
+        brokers: "192.168.70.128:9092"
         interval: 30
         topic_name: "ACTIVE-DEFENCE-EVENT-LOG"
         
     log:
-        device_id: "1"
-        
+        device_id: "device_1"
+
     traffic_control:
-        enabled: 0
-        redis_server_ip: "192.168.40.120"
-        redis_server_port: 7003
-        redis_index: 6
+        enabled: 1
+        tc_token_name: "ratelimit"
+        redis_server_ip: "127.0.0.1"
+        redis_server_port: 6379
+        redis_index: 1
\ No newline at end of file