diff --git a/Aktau_install_config/group_vars/adc_global.yml b/Aktau_install_config/group_vars/adc_global.yml index 7c7f5bd..84358ac 100644 --- a/Aktau_install_config/group_vars/adc_global.yml +++ b/Aktau_install_config/group_vars/adc_global.yml @@ -116,7 +116,6 @@ app_sketch_local_log_level: 10 app_control_plug_log_level: 10 -breakpad_upload_url: http://10.4.63.4:9000/api/2/minidump/?sentry_key=3556bac347c74585a994eb6823faf5c6 data_center: Aktau tsg_master_entrance_id: 1 diff --git a/Aktubinsk_install_config/group_vars/adc_global.yml b/Aktubinsk_install_config/group_vars/adc_global.yml index 1db6b07..b76061e 100644 --- a/Aktubinsk_install_config/group_vars/adc_global.yml +++ b/Aktubinsk_install_config/group_vars/adc_global.yml @@ -116,7 +116,6 @@ app_sketch_local_log_level: 10 app_control_plug_log_level: 10 -breakpad_upload_url: http://10.4.63.4:9000/api/2/minidump/?sentry_key=3556bac347c74585a994eb6823faf5c6 data_center: Aktubinsk tsg_master_entrance_id: 2 diff --git a/Almaty_install_config/group_vars/adc_global.yml b/Almaty_install_config/group_vars/adc_global.yml index c0b76f0..4faaf40 100644 --- a/Almaty_install_config/group_vars/adc_global.yml +++ b/Almaty_install_config/group_vars/adc_global.yml @@ -116,7 +116,6 @@ app_sketch_local_log_level: 10 app_control_plug_log_level: 10 -breakpad_upload_url: http://10.4.63.4:9000/api/2/minidump/?sentry_key=3556bac347c74585a994eb6823faf5c6 data_center: Almaty tsg_master_entrance_id: 3 diff --git a/Atyrau_install_config/group_vars/adc_global.yml b/Atyrau_install_config/group_vars/adc_global.yml index 584c204..37c7f55 100644 --- a/Atyrau_install_config/group_vars/adc_global.yml +++ b/Atyrau_install_config/group_vars/adc_global.yml @@ -116,7 +116,6 @@ app_sketch_local_log_level: 10 app_control_plug_log_level: 10 -breakpad_upload_url: http://10.4.63.4:9000/api/2/minidump/?sentry_key=3556bac347c74585a994eb6823faf5c6 data_center: Atyrau tsg_master_entrance_id: 5 diff --git a/Karaganda_install_config/group_vars/adc_global.yml b/Karaganda_install_config/group_vars/adc_global.yml index 5b46829..73952ac 100644 --- a/Karaganda_install_config/group_vars/adc_global.yml +++ b/Karaganda_install_config/group_vars/adc_global.yml @@ -116,7 +116,6 @@ app_sketch_local_log_level: 10 app_control_plug_log_level: 10 -breakpad_upload_url: http://10.4.63.4:9000/api/2/minidump/?sentry_key=3556bac347c74585a994eb6823faf5c6 data_center: Karaganda tsg_master_entrance_id: 6 diff --git a/Kokshetau_install_config/group_vars/adc_global.yml b/Kokshetau_install_config/group_vars/adc_global.yml index ddc326c..0883495 100644 --- a/Kokshetau_install_config/group_vars/adc_global.yml +++ b/Kokshetau_install_config/group_vars/adc_global.yml @@ -116,7 +116,6 @@ app_sketch_local_log_level: 10 app_control_plug_log_level: 10 -breakpad_upload_url: http://10.4.63.4:9000/api/2/minidump/?sentry_key=3556bac347c74585a994eb6823faf5c6 data_center: Kokshetau tsg_master_entrance_id: 7 diff --git a/Kyzylorda_install_config/group_vars/adc_global.yml b/Kyzylorda_install_config/group_vars/adc_global.yml index fab83e0..326f506 100644 --- a/Kyzylorda_install_config/group_vars/adc_global.yml +++ b/Kyzylorda_install_config/group_vars/adc_global.yml @@ -116,7 +116,6 @@ app_sketch_local_log_level: 10 app_control_plug_log_level: 10 -breakpad_upload_url: http://10.4.63.4:9000/api/2/minidump/?sentry_key=3556bac347c74585a994eb6823faf5c6 data_center: Kyzylorda tsg_master_entrance_id: 9 diff --git a/NurSultan_install_config/group_vars/adc_global.yml b/NurSultan_install_config/group_vars/adc_global.yml index e3da52d..714132b 100644 --- a/NurSultan_install_config/group_vars/adc_global.yml +++ b/NurSultan_install_config/group_vars/adc_global.yml @@ -116,7 +116,6 @@ app_sketch_local_log_level: 10 app_control_plug_log_level: 10 -breakpad_upload_url: http://10.4.63.4:9000/api/2/minidump/?sentry_key=3556bac347c74585a994eb6823faf5c6 data_center: Nur-sultan tsg_master_entrance_id: 4 diff --git a/Taldykurgan_install_config/group_vars/adc_global.yml b/Taldykurgan_install_config/group_vars/adc_global.yml index eb91234..6d66515 100644 --- a/Taldykurgan_install_config/group_vars/adc_global.yml +++ b/Taldykurgan_install_config/group_vars/adc_global.yml @@ -116,7 +116,6 @@ app_sketch_local_log_level: 10 app_control_plug_log_level: 10 -breakpad_upload_url: http://10.4.63.4:9000/api/2/minidump/?sentry_key=3556bac347c74585a994eb6823faf5c6 data_center: Taldykurgan tsg_master_entrance_id: 14 diff --git a/Uralsk_install_config/group_vars/adc_global.yml b/Uralsk_install_config/group_vars/adc_global.yml index 2c74ef1..c3f2d08 100644 --- a/Uralsk_install_config/group_vars/adc_global.yml +++ b/Uralsk_install_config/group_vars/adc_global.yml @@ -116,7 +116,6 @@ app_sketch_local_log_level: 10 app_control_plug_log_level: 10 -breakpad_upload_url: http://10.4.63.4:9000/api/2/minidump/?sentry_key=3556bac347c74585a994eb6823faf5c6 data_center: Uralsk tsg_master_entrance_id: 16 diff --git a/UstKamenogorsk_install_config/group_vars/adc_global.yml b/UstKamenogorsk_install_config/group_vars/adc_global.yml index cea1630..45f4dd4 100644 --- a/UstKamenogorsk_install_config/group_vars/adc_global.yml +++ b/UstKamenogorsk_install_config/group_vars/adc_global.yml @@ -116,7 +116,6 @@ app_sketch_local_log_level: 10 app_control_plug_log_level: 10 -breakpad_upload_url: http://10.4.63.4:9000/api/2/minidump/?sentry_key=3556bac347c74585a994eb6823faf5c6 data_center: Ust-Kamenogorsk tsg_master_entrance_id: 17 diff --git a/cmd2.txt b/cmd2.txt new file mode 100644 index 0000000..a1a9e0a --- /dev/null +++ b/cmd2.txt @@ -0,0 +1 @@ +ansible-playbook -i NurSultan_install_config/hosts adc_deploy.yml.with_tags -e "config_path=NurSultan_install_config" -l "10.4.51.*,10.4.55.*" -t "adc_exporter_proxy,redis,maat-redis" -f 78 diff --git a/group_vars/adc_global_general.yml b/group_vars/adc_global_general.yml index b6e4519..deff653 100644 --- a/group_vars/adc_global_general.yml +++ b/group_vars/adc_global_general.yml @@ -94,3 +94,5 @@ mrtunnat: ######################################### #Tsg_app + +breakpad_upload_url: http://10.4.63.4:9000/api/2/minidump/?sentry_key=3203b43fd5384a7dbe6a48ecb1f3c595 diff --git a/roles/firewall/templates/app_l7_proto_id.conf.j2 b/roles/firewall/templates/app_l7_proto_id.conf.j2 index b5041bc..714f943 100644 --- a/roles/firewall/templates/app_l7_proto_id.conf.j2 +++ b/roles/firewall/templates/app_l7_proto_id.conf.j2 @@ -1,7 +1,7 @@ #TYPE:1:UCHAR,2:USHORT,3:USTRING,4:ULOG,5:USTRING,6:FILE,7:UBASE64,8:PACKET #TYPE FIELD VALUE -STRING UNKNOWN_TCP UNCATEGORIZED -STRING UNKNOWN_UDP UNCATEGORIZED +STRING UNCATEGORIZED 100 +STRING UNCATEGORIZED 101 STRING UNKNOWN_OTHER 102 STRING DNS 103 STRING FTP 104 diff --git a/roles/firewall/templates/maat.conf.j2 b/roles/firewall/templates/maat.conf.j2 index df2a607..b7cb7af 100644 --- a/roles/firewall/templates/maat.conf.j2 +++ b/roles/firewall/templates/maat.conf.j2 @@ -24,9 +24,9 @@ TABLE_INFO=tsgconf/tsg_dynamic_tableinfo.conf STAT_FILE=tsg_dynamic_maat.status EFFECT_INTERVAL_S=1 REDIS_IP={{ dynamic_maat_redis_server.address }} -REDIS_PORT_NUM={{ maat_redis_server.port_num }} -REDIS_PORT={{ maat_redis_server.port }} -REDIS_INDEX={{ maat_redis_server.db }} +REDIS_PORT_NUM={{ dynamic_maat_redis_server.port_num }} +REDIS_PORT={{ dynamic_maat_redis_server.port }} +REDIS_INDEX={{ dynamic_maat_redis_server.db }} JSON_CFG_FILE=tsgconf/tsg_maat.json INC_CFG_DIR=tsgrule/inc/index/ FULL_CFG_DIR=tsgrule/full/index/ diff --git a/roles/sapp/files/tcpdump_mesa-1.0.2.0c5a950-2.el7.x86_64.rpm b/roles/sapp/files/tcpdump_mesa-1.0.2.0c5a950-2.el7.x86_64.rpm new file mode 100644 index 0000000..c5cb8cf Binary files /dev/null and b/roles/sapp/files/tcpdump_mesa-1.0.2.0c5a950-2.el7.x86_64.rpm differ diff --git a/roles/sapp/tasks/main.yml b/roles/sapp/tasks/main.yml index ad196dd..70d28a9 100644 --- a/roles/sapp/tasks/main.yml +++ b/roles/sapp/tasks/main.yml @@ -15,8 +15,16 @@ name: - /tmp/ansible_deploy/sapp-4.2.7.5f789f6-2.el7.x86_64.rpm state: present + +- name: "install tcpdump_mesa rpms from localhost" + yum: + name: + - /tmp/ansible_deploy/tcpdump_mesa-1.0.2.0c5a950-2.el7.x86_64.rpm + state: present skip_broken: yes + skip_broken: yes + - name: "mkdir tsgconf" file: path: /home/mesasoft/sapp_run/tsgconf @@ -46,6 +54,12 @@ dest: /home/mesasoft/sapp_run/etc/sapp_log.conf tags: template +- name: Template the sapp_tmpfile.conf + template: + src: "{{ role_path }}/files/sapp_tmpfile.conf.j2" + dest: /etc/tmpfiles.d/sapp_tmpfile.conf + tags: template + - name: Template the gdev.conf template: src: "{{ role_path }}/templates/gdev.conf.j2" diff --git a/roles/sapp/templates/sapp.toml.j2 b/roles/sapp/templates/sapp.toml.j2 index dae751b..75b55b2 100644 --- a/roles/sapp/templates/sapp.toml.j2 +++ b/roles/sapp/templates/sapp.toml.j2 @@ -182,7 +182,7 @@ dictator_enable=0 [TOOLS] [tools.pkt_dump] - enabled=0 + enabled=1 ### note, mode options value:[storage, udp_socket] mode=udp_socket BSD_packet_filter="" @@ -196,7 +196,7 @@ dictator_enable=0 dump_thread_id=[0,1,2,3,4] [tools.pkt_dump.udp] - command_port=12345 + command_port=9345 [tools.pkt_dump.storage] ### note, file path must be double quotation mark extension, for example, path="/dev/shm/pkt_dump" @@ -215,8 +215,8 @@ dictator_enable=0 vxlan_sport_service_map_path="./etc/vxlan_sport_service_map.conf" [breakpad] - disable_coredump=0 - enable_breakpad=0 + disable_coredump=1 + enable_breakpad=1 breakpad_minidump_dir="/tmp/crashreport" - enable_breakpad_upload=0 + enable_breakpad_upload=1 breakpad_upload_url="{{ breakpad_upload_url }}" diff --git a/roles/sapp/templates/sapp_tmpfile.conf.j2 b/roles/sapp/templates/sapp_tmpfile.conf.j2 new file mode 100644 index 0000000..485725b --- /dev/null +++ b/roles/sapp/templates/sapp_tmpfile.conf.j2 @@ -0,0 +1 @@ +d /home/mesasoft/sapp_run/log 0755 - - 2d - diff --git a/tasks/verify_process_md5_hash.yml b/tasks/verify_process_md5_hash.yml new file mode 100644 index 0000000..1163412 --- /dev/null +++ b/tasks/verify_process_md5_hash.yml @@ -0,0 +1,13 @@ +- hosts: adc_mcn0 + remote_user: root + tasks: + - name: "verify sapp md5 in mcn0" + shell: md5sum /home/mesasoft/sapp_run/sapp + register: sapp_md5sum + + - name: assert + assert: + that: + - sapp_md5sum.stdout.find('1ca2eb92e4269066c6a056e41bb394b3') != -1 + fail_msg: "FAIL" + success_msg: "PASS" diff --git a/tasks/verify_tfe_md5_hash.yml b/tasks/verify_tfe_md5_hash.yml new file mode 100644 index 0000000..80e23be --- /dev/null +++ b/tasks/verify_tfe_md5_hash.yml @@ -0,0 +1,16 @@ +- hosts: + - adc_mcn1 + - adc_mcn2 + - adc_mcn3 + remote_user: root + tasks: + - name: "verify tfe md5 in mcn0" + shell: md5sum /opt/tsg/tfe/bin/tfe + register: tfe_md5sum + + - name: assert + assert: + that: + - tfe_md5sum.stdout.find('0f45d2844dbff2edbde44bab0359cead') != -1 + fail_msg: "FAIL" + success_msg: "PASS"