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 01f3eab..756437c 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 Binary files a/roles/clotho/files/clotho-debug-1.0.0.-1.el7.x86_64.rpm and /dev/null differ 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/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 Binary files /dev/null and b/roles/packet_dump/files/packet_dump-1.0.2.90c24cb-2.el7.x86_64.rpm differ 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/sapp/templates/sapp.toml.j2 b/roles/sapp/templates/sapp.toml.j2 index d763260..cd5f342 100644 --- a/roles/sapp/templates/sapp.toml.j2 +++ b/roles/sapp/templates/sapp.toml.j2 @@ -103,6 +103,7 @@ BSD_packet_filter="" ### note, if "file_truncate_open_enabled=1", file will be truncated, otherwise open the file for appending. file_truncate_enabled = 1 log_file_name = "fs2_sysinfo.log" + log_conf_name = "etc/sapp_log.conf" [profiling.log.remote] enabled=1