合并提交分支

15 files changed, 48 insertions, 54 deletions

diff --git a/deploy.yml b/deploy.yml
index 13d3f1c..e8dd304 100644
--- a/deploy.yml
+++ b/deploy.yml
@@ -29,7 +29,7 @@
     - firewall
     - tsg_app
     - http_healthcheck
-    - clotho
+    - packet_dump
     - certstore
     - cert-redis
     - telegraf_statistic
@@ -109,7 +109,7 @@
     - firewall
     - tsg_app
     - http_healthcheck
-    - clotho
+    - packet_dump
     - certstore
     - cert-redis
     - tfe
diff --git a/install_config/group_vars/adc_global.yml b/install_config/group_vars/adc_global.yml
index 8b88c49..abef9f5 100644
--- a/install_config/group_vars/adc_global.yml
+++ b/install_config/group_vars/adc_global.yml
@@ -54,7 +54,7 @@ pangu_log_level: DEBUG
 doh_log_level: DEBUG
 
 certstore_log_level: 10
-clotho_log_level: 10
+packet_dump_log_level: 10
 
 #######################################
 #Sapp Performance Config
diff --git a/roles/clotho/files/clotho-debug-1.0.0.-1.el7.x86_64.rpm b/roles/clotho/files/clotho-debug-1.0.0.-1.el7.x86_64.rpm
deleted file mode 100644
index 6601627..0000000
--- a/roles/clotho/files/clotho-debug-1.0.0.-1.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/clotho/files/clotho.service b/roles/clotho/files/clotho.service
deleted file mode 100644
index 860fe46..0000000
--- a/roles/clotho/files/clotho.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=clotho
-After=network.target
-After=network-online.target
-Wants=network-online.target
-
-[Service]
-ExecStart=/home/mesasoft/clotho/clotho
-ExecStop=killall clotho
-Type=forking
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/clotho/tasks/main.yml b/roles/clotho/tasks/main.yml
deleted file mode 100644
index 4cbe691..0000000
--- a/roles/clotho/tasks/main.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-- name: "copy clotho rpm to destination server"
-  copy:
-    src: "{{ role_path }}/files/clotho-debug-1.0.0.-1.el7.x86_64.rpm"
-    dest: /tmp/ansible_deploy/
-
-- name: "copy  clotho.service to destination server"
-  copy:
-    src: "{{ role_path }}/files/clotho.service"
-    dest: /usr/lib/systemd/system
-    mode: 0755
-
-- name: "install clotho rpm from localhost"
-  yum:
-    name:
-      - /tmp/ansible_deploy/clotho-debug-1.0.0.-1.el7.x86_64.rpm
-    state: present
-
-- name: "Template the clotho.conf"
-  template:
-    src: "{{ role_path }}/templates/clotho.conf.j2"
-    dest: /home/mesasoft/clotho/conf/clotho.conf 
-  tags: template
- 
-- name: "start clotho"
-  systemd:
-    name: clotho.service
-    enabled: yes
-    daemon_reload: yes
-
diff --git a/roles/clotho/templates/clotho.conf.j2 b/roles/clotho/templates/clotho.conf.j2
deleted file mode 100644
index 95c5ca2..0000000
--- a/roles/clotho/templates/clotho.conf.j2
+++ /dev/null
@@ -1,7 +0,0 @@
-[KAFKA]
-BROKER_LIST={{ log_kafkabrokers.address }}
-
-[SYSTEM]
-NIC_NAME={{ nic_mgr.name }}
-LOG_LEVEL={{ clotho_log_level }}
-LOG_PATH=log/clotho
diff --git a/roles/firewall/files/fw_ssl_plug-3.0.3.71f6bff-2.el7.x86_64.rpm b/roles/firewall/files/fw_ssl_plug-3.0.3.71f6bff-2.el7.x86_64.rpm
deleted file mode 100644
index b10ecaf..0000000
--- a/roles/firewall/files/fw_ssl_plug-3.0.3.71f6bff-2.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/firewall/files/fw_ssl_plug-3.0.4.a0b19ee-2.el7.x86_64.rpm b/roles/firewall/files/fw_ssl_plug-3.0.4.a0b19ee-2.el7.x86_64.rpm
new file mode 100644
index 0000000..0ebd79a
--- /dev/null
+++ b/roles/firewall/files/fw_ssl_plug-3.0.4.a0b19ee-2.el7.x86_64.rpm
diff --git a/roles/firewall/tasks/main.yml b/roles/firewall/tasks/main.yml
index 07597fe..36fdd9e 100644
--- a/roles/firewall/tasks/main.yml
+++ b/roles/firewall/tasks/main.yml
@@ -20,7 +20,7 @@
       - /tmp/ansible_deploy/fw_http_plug-3.0.1.0c7e082-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/fw_mail_plug-3.0.1.02465eb-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/fw_quic_plug-3.0.1.b790ee1-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/fw_ssl_plug-3.0.3.71f6bff-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/fw_ssl_plug-3.0.4.a0b19ee-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/http-2.0.5.c61ad9a-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/mail-1.0.9.c1d3bde-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/quic-1.1.10.c2b90a0-2.el7.x86_64.rpm
diff --git a/roles/packet_dump/files/packet_dump-1.0.2.90c24cb-2.el7.x86_64.rpm b/roles/packet_dump/files/packet_dump-1.0.2.90c24cb-2.el7.x86_64.rpm
new file mode 100644
index 0000000..e29602f
--- /dev/null
+++ b/roles/packet_dump/files/packet_dump-1.0.2.90c24cb-2.el7.x86_64.rpm
diff --git a/roles/packet_dump/tasks/main.yml b/roles/packet_dump/tasks/main.yml
new file mode 100644
index 0000000..89b5289
--- /dev/null
+++ b/roles/packet_dump/tasks/main.yml
@@ -0,0 +1,29 @@
+- name: "copy packet_dump rpm to destination server"
+  copy:
+    src: "{{ role_path }}/files/packet_dump-1.0.2.90c24cb-2.el7.x86_64.rpm"
+    dest: /tmp/ansible_deploy/
+
+- name: "copy  packet_dump.service to destination server"
+  copy:
+    src: "{{ role_path }}/files/packet_dump.service"
+    dest: /usr/lib/systemd/system
+    mode: 0755
+
+- name: "install packet_dump rpm from localhost"
+  yum:
+    name:
+      - /tmp/ansible_deploy/packet_dump-1.0.2.90c24cb-2.el7.x86_64.rpm
+    state: present
+
+- name: "Template the packet_dump.conf"
+  template:
+    src: "{{ role_path }}/templates/packet_dump.conf.j2"
+    dest: /home/mesasoft/packet_dump/conf/packet_dump.conf 
+  tags: template
+ 
+- name: "start packet_dump"
+  systemd:
+    name: packet_dump.service
+    enabled: yes
+    daemon_reload: yes
+
diff --git a/roles/packet_dump/templates/packet_dump.conf.j2 b/roles/packet_dump/templates/packet_dump.conf.j2
new file mode 100644
index 0000000..755417c
--- /dev/null
+++ b/roles/packet_dump/templates/packet_dump.conf.j2
@@ -0,0 +1,14 @@
+[KAFKA]
+BROKER_LIST={{ log_kafkabrokers.address }}
+
+[SYSTEM]
+NIC_NAME={{ nic_mgr.name }}
+LOG_LEVEL={{ packet_dump_log_level }}
+LOG_PATH=log/packet_dump
+
+[breakpad]
+disable_coredump=0
+enable_breakpad=1
+breakpad_minidump_dir=/tmp/packet_dump/crashreport
+enable_breakpad_upload=0
+breakpad_upload_url={{ breakpad_upload }}
diff --git a/roles/tfe/files/tfe-4.3.11.90ac86a-1.el7.x86_64.rpm b/roles/tfe/files/tfe-4.3.11.90ac86a-1.el7.x86_64.rpm
deleted file mode 100644
index ea69aca..0000000
--- a/roles/tfe/files/tfe-4.3.11.90ac86a-1.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/tfe/files/tfe-4.3.12.be94218-1.el7.x86_64.rpm b/roles/tfe/files/tfe-4.3.12.be94218-1.el7.x86_64.rpm
new file mode 100644
index 0000000..6c40b3c
--- /dev/null
+++ b/roles/tfe/files/tfe-4.3.12.be94218-1.el7.x86_64.rpm
diff --git a/roles/tfe/tasks/main.yml b/roles/tfe/tasks/main.yml
index 2dd609d..bb7918d 100644
--- a/roles/tfe/tasks/main.yml
+++ b/roles/tfe/tasks/main.yml
@@ -14,7 +14,7 @@
   yum:
     name:
       - /tmp/ansible_deploy/tfe-kmod-v1.0.5.20200408-1dkms.noarch.rpm
-      - /tmp/ansible_deploy/tfe-4.3.10.fb02543-1.el7.x86_64.rpm
+      - /tmp/ansible_deploy/tfe-4.3.12.be94218-1.el7.x86_64.rpm
     state: present
 
 - name: "template tfe-env config"