1.更新告警阈值sql; 2.tsg_diagnose告警阈值修改为动态值,从tsg_cli_env.ini文件获取; 3.把tsg_cluster_register轮询调用改为系统服务,启动后只执行一次;

cluster_deploy.yml

@@ -2,7 +2,8 @@
   roles:
     - oam_cluster
     - consul-cluster
-    - mariadb
+    # mariadb复用毕方
+    #- mariadb
     - influxdb
     - ha_master
 
@@ -10,7 +11,8 @@
   roles:
     - oam_cluster
     - consul-cluster
-    - mariadb
+    # mariadb复用毕方
+    #- mariadb
     - influxdb
     - ha_backup
 

install_config/group_vars/all.yml

@@ -28,31 +28,31 @@ consul:
 
 mariadb:
     username: root
-    password: tsg2019
+    password: 111111
     cluster_password: tsg369258
     cluster_ip: "10.4.62.251"
 
 oam:
     cluster_port: 880
-    core_port: 1180
-    cli_agent_port: 1122
+    core_port: 880
+    cli_agent_port: 822
     snmp_port: 1611
     snmptrapd_ip: "127.0.0.1"
     snmptrapd_port: 164
     mcn0_ip: "192.168.100.1"
     alarm_cpu_critical_high: 90
-    alarm_cpu_major_high: 85
+    alarm_cpu_major_high: 80
     alarm_mem_critical_high: 90
-    alarm_mem_major_high: 85
+    alarm_mem_major_high: 80
     alarm_disk_critical_high: 90
-    alarm_disk_major_high: 85
-    alarm_interface_critical_high: "0.0005"
-    alarm_interface_major_high: "0.0001"
-    alarm_app_network_critical_high: "0.0005"
+    alarm_disk_major_high: 80
+    alarm_interface_critical_high: "0.0001"
+    alarm_interface_major_high: "0.00005"
+    alarm_app_network_critical_high: "0.0001"
     alarm_app_network_major_high: "0.0001"    
     
 tsg_cli:
-    rpm_file_name: "tsg-cli-1.1.8.dc13c5d-1.el7.x86_64.rpm"    
+    rpm_file_name: "tsg-cli-1.1.2.93221a7-1.el7.x86_64.rpm"    
 
 ha_master:
     instance_state: MASTER
@@ -67,7 +67,7 @@ ha_backup:
     oam_virtual_router_id: 54
     
 java_version: jdk1.8.0_73
-bifang_api_ip: "192.168.44.71"
+bifang_api_ip: "10.4.62.252"
 bifang_api_port: 8080
 
 tag_location: "Nur-sultan"

roles/mariadb/files/my.cnf

@@ -19,78 +19,45 @@
 [client]
 #password	= your_password
 port		= 3306
-socket		= /var/lib/mysql/mysql.sock
-default-character-set = utf8mb4
+socket		= /tmp/mysql.sock 
 
 # Here follows entries for some specific programs
 
 # The MySQL server
 [mysqld]
-basedir=/home/cries/mysql
-datadir=/home/cries/dbdata
-#timezone test
-#default-time_zone = '+6:00'
-#relay_log=/home/ceiec/mariadb/binlogs/master-bin/relay-log
-#log_bin=/home/ceiec/mariadb/relaylogs/relay-bin/master-log
-binlog_format=mixed
-auto-increment-offset=1
-auto-increment-increment=2
-log_bin_trust_function_creators=1
-log_slave_updates=true
-sync_binlog=0
-binlog-checksum=CRC32
-master-verify-checksum=1
-slave-sql-verify-checksum=1
-slave-skip-errors=all
-relay_log_recovery=1
-port		= 3306
-#datadir         = /home/dbdata
-innodb_file_per_table = on
-skip_name_resolve = on
-lower_case_table_names = 1
-character-set-server = utf8mb4
-character-set-client-handshake = FALSE
-#slow_query_log_file = /home/mariadb/logs/slow_query.log
-#log_error = /home/mariadb/host01.err
-socket		= /var/lib/mysql/mysql.sock
 skip-external-locking
-back_log = 384
-key_buffer_size = 256M
-max_allowed_packet = 4M
-table_open_cache = 512
-thread_stack = 256K
-table_cache = 128K
-sort_buffer_size = 6M
+thread_stack = 256K 
+table_cache = 128K 
+sort_buffer_size = 6M 
 read_buffer_size = 4M
-read_rnd_buffer_size = 8M
-myisam_sort_buffer_size = 64M
-thread_cache_size = 8
-query_cache_size = 32M
+read_rnd_buffer_size = 8M 
+myisam_sort_buffer_size = 64M 
+thread_cache_size = 8 
+query_cache_size = 32M 
 join_buffer_size = 8M
-# Try number of CPU's*2 for thread_concurrency
+# Try number of CPU's*2 for thread_concurrency 
 thread_concurrency = 8
 wait_timeout=2880000
-interactive_timeout = 2880000
+interactive_timeout = 2880000 
 max_allowed_packet = 200M
-
-max_connections = 1500
+max_connections = 1500 
 open-files-limit = 10240
-
-
 key_buffer_size=256M
-back_log = 512
-table_open_cache=2048
-
-innodb_file_per_table= 1
-innodb_buffer_pool_size = 2048M
-
-innodb_log_file_size = 1024M
-innodb_log_buffer_size = 16M
-
-innodb_flush_log_at_trx_commit = 2
-innodb_flush_method = 'O_DIRECT'
-
+back_log = 512 
+table_open_cache=2048 
+innodb_file_per_table= 1 
+innodb_buffer_pool_size = 2048M 
+innodb_log_file_size = 1024M 
+innodb_log_buffer_size = 16M 
+innodb_flush_log_at_trx_commit = 2 
+innodb_flush_method = 'O_DIRECT' 
 innodb_max_dirty_pages_pct = 90
+innodb_log_file_size = 100M 
+innodb_log_buffer_size = 1G 
+innodb_buffer_pool_instances = 1 
+innodb_flush_log_at_trx_commit = 1
+
+# Try number of CPU's*2 for thread_concurrency
 
 # Point the following paths to a dedicated disk
 #tmpdir		= /tmp/
@@ -178,11 +145,10 @@ server-id	= 1
 # of RAM but beware of setting memory usage too high
 #innodb_buffer_pool_size = 384M
 # Set .._log_file_size to 25 % of buffer pool size
-innodb_log_file_size = 100M
-innodb_log_buffer_size = 1G
-innodb_buffer_pool_instances  = 1
-innodb_flush_log_at_trx_commit = 1
-innodb_lock_wait_timeout = 50
+#innodb_log_file_size = 100M
+#innodb_log_buffer_size = 8M
+#innodb_flush_log_at_trx_commit = 1
+#innodb_lock_wait_timeout = 50
 
 [mysqldump]
 quick

roles/mariadb/tasks/main.yml

@@ -114,11 +114,6 @@
   shell: cp -rf /home/database/mysql/bin/mysqladmin /usr/local/bin
   when: return.rc != 0
 
-- name: "copy my.cnf"
-  copy:
-    src: "{{ role_path }}/files/my.cnf"
-    dest: /etc/mysql/my.cnf
-
 - name: "start and enable mariadb"
   systemd:
     name: mariadb

roles/oam_cli_agent/tasks/main.yml

@@ -1,14 +1,40 @@
-- name: "Templates application.properties.j2"
-  template:
-    src: "{{ role_path }}/templates/application.properties.j2"
-    dest: /opt/tsg/cli_agent/application.properties
+- name: "copy oam_cli_agent.rpm to destination server"
+  copy:
+    src: "{{ role_path }}/files/"
+    dest: /tmp
 
+- name: "install oam_cli_agent"
+  yum:
+    name:
+      - /tmp/oam_cli_agent-1.0-1.0.x86_64.rpm
+    state: present
+
+- name: "bak snmpd.conf"
+  shell: cp -rf /usr/share/snmp/snmpd.conf /usr/share/snmp/snmpd.conf_origin
+  ignore_errors: yes
+  
+- name: "Templates snmpd.conf"
+  template:
+    src: "{{role_path}}/templates/snmpd.conf"
+    dest: /usr/share/snmp/snmpd.conf
+  tags: template
 
 - name: "Templates oam_cli_agent.service"
   template:
     src: "{{ role_path }}/templates/oam_cli_agent.service.j2"
     dest: /usr/lib/systemd/system/oam_cli_agent.service
 
+- name: "Templates application.properties.j2"
+  template:
+    src: "{{ role_path }}/templates/application.properties.j2"
+    dest: /opt/tsg/cli_agent/application.properties
+
+- name: "Start snmpd"
+  systemd:
+    name: snmpd
+    state: restarted
+    enabled: yes
+
 - name: "Start oam_cli_agent"
   systemd:
     name: oam_cli_agent

roles/oam_cli_agent/templates/oam_cli_agent.service.j2

@@ -3,7 +3,6 @@ Description=oam_cli_agent daemon
 
 [Service]
 Type=simple
-ExecStartPre=/usr/bin/mkdir -p /tmp/__tsg_monitor_tmp_dir
 Environment=OAM_DIR=/opt/tsg/cli_agent/
 ExecStart=/usr/lib/jvm/{{ java_version }}/bin/java  -jar ${OAM_DIR}oam_cli_agent.jar --spring.config.location=${OAM_DIR}application.properties,${OAM_DIR}application-centos2.properties --logging.file=${OAM_DIR}oam-cli-agent.log
 

roles/oam_cli_agent_mxn/tasks/main.yml

@@ -1,13 +1,27 @@
+- name: "copy oam_cli_agent_mxn.rpm to destination server"
+  copy:
+    src: "{{ role_path }}/files/"
+    dest: /tmp
+
+- name: "install oam_cli_agent_mxn"
+  yum:
+    name:
+      - /tmp/oam_cli_agent_mxn-1.0-1.0.x86_64.rpm
+    state: present
 
 - name: "Templates oam_cli_agent_mxn.service"
   template:
     src: "{{ role_path }}/templates/oam_cli_agent_mxn.service.j2"
     dest: /usr/lib/systemd/system/oam_cli_agent_mxn.service
 
+- name: "Templates application.properties.j2"
+  template:
+    src: "{{ role_path }}/templates/application.properties.j2"
+    dest: /opt/tsg/cli_agent/application.properties
 
-- name: "Start oam_cli_agent_mxn"
-  systemd:
-    name: oam_cli_agent_mxn
-    state: restarted
-    enabled: yes
-    daemon_reload: yes
+#- name: "Start oam_cli_agent_mxn"
+#  systemd:
+#    name: oam_cli_agent_mxn
+#    state: restarted
+#    enabled: yes
+#    daemon_reload: yes

roles/oam_cli_agent_mxn/templates/oam_cli_agent_mxn.service.j2

@@ -4,7 +4,6 @@ Description=oam_cli_agent daemon
 [Service]
 Type=simple
 Environment=OAM_DIR=/opt/tsg/cli_agent/
-ExecStartPre=/usr/bin/mkdir -p /tmp/__tsg_monitor_tmp_dir
 ExecStart=/usr/lib/jvm/{{ java_version }}/bin/java -jar ${OAM_DIR}oam_cli_agent.jar --spring.config.location=${OAM_DIR}application.properties,${OAM_DIR}application-centos2.properties --logging.file=${OAM_DIR}oam-cli-agent.log
 
 [Install]

roles/setup_mariadb/files/my.cnf

@@ -1,203 +0,0 @@
-# Example MariaDB config file for very large systems.
-#
-# This is for a large system with memory of 1G-2G where the system runs mainly
-# MariaDB.
-#
-# MariaDB programs look for option files in a set of
-# locations which depend on the deployment platform.
-# You can copy this option file to one of those
-# locations. For information about these locations, do:
-# 'my_print_defaults --help' and see what is printed under
-# Default options are read from the following files in the given order:
-# More information at: http://dev.mysql.com/doc/mysql/en/option-files.html
-#
-# In this file, you can use all long options that a program supports.
-# If you want to know which options a program supports, run the program
-# with the "--help" option.
-
-# The following options will be passed to all MySQL clients
-[client]
-#password	= your_password
-port		= 3306
-socket		= /var/lib/mysql/mysql.sock
-default-character-set = utf8mb4
-
-# Here follows entries for some specific programs
-
-# The MySQL server
-[mysqld]
-basedir=/home/cries/mysql
-datadir=/home/cries/dbdata
-#timezone test
-#default-time_zone = '+6:00'
-#relay_log=/home/ceiec/mariadb/binlogs/master-bin/relay-log
-#log_bin=/home/ceiec/mariadb/relaylogs/relay-bin/master-log
-binlog_format=mixed
-auto-increment-offset=1
-auto-increment-increment=2
-log_bin_trust_function_creators=1
-log_slave_updates=true
-sync_binlog=0
-binlog-checksum=CRC32
-master-verify-checksum=1
-slave-sql-verify-checksum=1
-slave-skip-errors=all
-relay_log_recovery=1
-port		= 3306
-#datadir         = /home/dbdata
-innodb_file_per_table = on
-skip_name_resolve = on
-lower_case_table_names = 1
-character-set-server = utf8mb4
-character-set-client-handshake = FALSE
-#slow_query_log_file = /home/mariadb/logs/slow_query.log
-#log_error = /home/mariadb/host01.err
-socket		= /var/lib/mysql/mysql.sock
-skip-external-locking
-back_log = 384
-key_buffer_size = 256M
-max_allowed_packet = 4M
-table_open_cache = 512
-thread_stack = 256K
-table_cache = 128K
-sort_buffer_size = 6M
-read_buffer_size = 4M
-read_rnd_buffer_size = 8M
-myisam_sort_buffer_size = 64M
-thread_cache_size = 8
-query_cache_size = 32M
-join_buffer_size = 8M
-# Try number of CPU's*2 for thread_concurrency
-thread_concurrency = 8
-wait_timeout=2880000
-interactive_timeout = 2880000
-max_allowed_packet = 200M
-
-max_connections = 1500
-open-files-limit = 10240
-
-
-key_buffer_size=256M
-back_log = 512
-table_open_cache=2048
-
-innodb_file_per_table= 1
-innodb_buffer_pool_size = 2048M
-
-innodb_log_file_size = 1024M
-innodb_log_buffer_size = 16M
-
-innodb_flush_log_at_trx_commit = 2
-innodb_flush_method = 'O_DIRECT'
-
-innodb_max_dirty_pages_pct = 90
-
-# Point the following paths to a dedicated disk
-#tmpdir		= /tmp/
-
-# Don't listen on a TCP/IP port at all. This can be a security enhancement,
-# if all processes that need to connect to mysqld run on the same host.
-# All interaction with mysqld must be made via Unix sockets or named pipes.
-# Note that using this option without enabling named pipes on Windows
-# (via the "enable-named-pipe" option) will render mysqld useless!
-# 
-#skip-networking
-
-# Replication Master Server (default)
-# binary logging is required for replication
-log-bin=mysql-bin
-
-# required unique id between 1 and 2^32 - 1
-# defaults to 1 if master-host is not set
-# but will not function as a master if omitted
-server-id	= 1
-
-# Replication Slave (comment out master section to use this)
-#
-# To configure this host as a replication slave, you can choose between
-# two methods :
-#
-# 1) Use the CHANGE MASTER TO command (fully described in our manual) -
-#    the syntax is:
-#
-#    CHANGE MASTER TO MASTER_HOST=<host>, MASTER_PORT=<port>,
-#    MASTER_USER=<user>, MASTER_PASSWORD=<password> ;
-#
-#    where you replace <host>, <user>, <password> by quoted strings and
-#    <port> by the master's port number (3306 by default).
-#
-#    Example:
-#
-#    CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306,
-#    MASTER_USER='joe', MASTER_PASSWORD='secret';
-#
-# OR
-#
-# 2) Set the variables below. However, in case you choose this method, then
-#    start replication for the first time (even unsuccessfully, for example
-#    if you mistyped the password in master-password and the slave fails to
-#    connect), the slave will create a master.info file, and any later
-#    change in this file to the variables' values below will be ignored and
-#    overridden by the content of the master.info file, unless you shutdown
-#    the slave server, delete master.info and restart the slaver server.
-#    For that reason, you may want to leave the lines below untouched
-#    (commented) and instead use CHANGE MASTER TO (see above)
-#
-# required unique id between 2 and 2^32 - 1
-# (and different from the master)
-# defaults to 2 if master-host is set
-# but will not function as a slave if omitted
-#server-id       = 2
-#
-# The replication master for this slave - required
-#master-host     =   <hostname>
-#
-# The username the slave will use for authentication when connecting
-# to the master - required
-#master-user     =   <username>
-#
-# The password the slave will authenticate with when connecting to
-# the master - required
-#master-password =   <password>
-#
-# The port the master is listening on.
-# optional - defaults to 3306
-#master-port     =  <port>
-#
-# binary logging - not required for slaves, but recommended
-#log-bin=mysql-bin
-#
-# binary logging format - mixed recommended 
-#binlog_format=mixed
-
-# Uncomment the following if you are using InnoDB tables
-#innodb_data_home_dir = /usr/local/mysql/data
-#innodb_data_file_path = ibdata1:2000M;ibdata2:10M:autoextend
-#innodb_log_group_home_dir = /usr/local/mysql/data
-# You can set .._buffer_pool_size up to 50 - 80 %
-# of RAM but beware of setting memory usage too high
-#innodb_buffer_pool_size = 384M
-# Set .._log_file_size to 25 % of buffer pool size
-innodb_log_file_size = 100M
-innodb_log_buffer_size = 1G
-innodb_buffer_pool_instances  = 1
-innodb_flush_log_at_trx_commit = 1
-innodb_lock_wait_timeout = 50
-
-[mysqldump]
-quick
-max_allowed_packet = 16M
-
-[mysql]
-no-auto-rehash
-# Remove the next comment character if you are not familiar with SQL
-#safe-updates
-
-[myisamchk]
-key_buffer_size = 256M
-sort_buffer_size = 256M
-read_buffer = 2M
-write_buffer = 2M
-
-[mysqlhotcopy]
-interactive-timeout

roles/setup_mariadb/tasks/main.yml

@@ -1,11 +1,11 @@
 - name: "judge tsg_oam"
-  shell: mysql -u {{ mariadb.username }} -p{{ mariadb.password }}  -e "show databases;" |grep tsg_oam
+  shell: mysql -uroot -p111111  -e "show databases;" |grep tsg_oam
   register: return
   ignore_errors: true
 
 - name: "set tsg_oam database"
   shell: mysql -uroot -p{{ mariadb.password }} -e "create database tsg_oam"
-  when: return.rc != 0
+  #when: return.rc != 0
 
 - name: "Templates tsg_threshold.sql"
   template:
@@ -15,14 +15,3 @@
 
 - name: "import the sql after template"
   shell: mysql -s -h 127.0.0.1 -u {{ mariadb.username }} -p{{ mariadb.password }}  < /tmp/tsg-cli-deploy/tsg_threshold.sql
-
-- name: "copy my.cnf"
-  copy:
-    src: "{{ role_path }}/files/my.cnf"
-    dest: /etc/mysql/my.cnf
-
-- name: "restart mariadb.service"
-  systemd:
-    name: mariadb
-    state: restarted
-    enable: yes

roles/tsg-cli-mcn0/files/tsg-monitor.sh

@@ -13,22 +13,31 @@ killall_uncompleted_cmd(){
     killall -9 -q tsg_monit_app
     killall -9 -q tsg_monit_intercept
     killall -9 -q tsg_monit_interface
+    #killall -9 -q tsg_monit_protocol_v3
     killall -9 -q tsg_monit_protocol_v4
+    #killall -9 -q tsg_monit_stream_v3
     killall -9 -q tsg_monit_stream_v4
 
-	/opt/tsg/tsg-monitor/tsg_monitor_cleanup_tmp.sh
+	cmd_run=`ps -ef | grep tsg_ | grep -v grep`
+	if [ ${#cmd_run} -lt 1 ] ; then
+	    #在没有其他tsg_xxx命令正在执行时, 删除执行命令错误被强制kill时, python生成的临时文件
+	    rm -rf /tmp/_MEI*
+    fi	
+
 }
 
 start_background_cmd(){
-	mkdir -p  /tmp/__tsg_monitor_tmp_dir
     #后台并发运行, 保证所有命令的开始运行时间基本一样，
     #且不会因某个命令网络拥塞、执行时间长等问题，阻塞while(1)主循环
     /opt/tsg/tsg-monitor/tsg_diagnose_background > /dev/null &
     #/opt/tsg/tsg-monitor/tsg_update_tags > /dev/null &
+    
     /opt/tsg/tsg-monitor/tsg_monit_app > /dev/null &
     /opt/tsg/tsg-monitor/tsg_monit_intercept > /dev/null &
     /opt/tsg/tsg-monitor/tsg_monit_interface > /dev/null &
+    #/opt/tsg/tsg-monitor/tsg_monit_protocol_v3 > /dev/null &
     /opt/tsg/tsg-monitor/tsg_monit_protocol_v4 > /dev/null &
+    #/opt/tsg/tsg-monitor/tsg_monit_stream_v3 > /dev/null &
     /opt/tsg/tsg-monitor/tsg_monit_stream_v4 > /dev/null &    
 }
 

roles/tsg-cli-mcn0/tasks/main.yml

@@ -57,13 +57,6 @@
     src: "{{ role_path }}/files/rsyslog.conf"
     dest: "/etc/"
 
-- name: "copy tsg_monitor_cleanup_tmp.sh to destination server"
-  synchronize:
-    src: "{{ role_path }}/../tsg-common-files/tsg_monitor_cleanup_tmp.sh"
-    dest: "/opt/tsg/tsg-monitor/"
-    mode: 0755
-    
-
 - name: "restart rsyslog service"
   systemd:
     name: rsyslog

roles/tsg-cli-mcn1/files/tsg-monitor.sh

@@ -12,11 +12,14 @@ killall_uncompleted_cmd(){
     killall -9 -q tsg_monit_interface
     killall -9 -q tsg_monit_intercept
 	
-	/opt/tsg/tsg-monitor/tsg_monitor_cleanup_tmp.sh
+	cmd_run=`ps -ef | grep tsg_ | grep -v grep`
+	if [ ${#cmd_run} -lt 1 ] ; then
+	    #在没有其他tsg_xxx命令正在执行时, 删除执行命令错误被强制kill时, python生成的临时文件
+	    rm -rf /tmp/_MEI*
+    fi
 }
 
 start_background_cmd(){
-	mkdir -p  /tmp/__tsg_monitor_tmp_dir
     #后台并发运行, 保证所有命令的开始运行时间基本一样，
     #且不会因某个命令网络拥塞、执行时间长等问题，阻塞while(1)主循环
     /opt/tsg/tsg-monitor/tsg_diagnose_background > /dev/null &

roles/tsg-cli-mcn1/tasks/main.yml

@@ -57,12 +57,6 @@
     src: "{{ role_path }}/files/rsyslog.conf"
     dest: "/etc/"
 
-- name: "copy tsg_monitor_cleanup_tmp.sh to destination server"
-  synchronize:
-    src: "{{ role_path }}/../tsg-common-files/tsg_monitor_cleanup_tmp.sh"
-    dest: "/opt/tsg/tsg-monitor/"
-    mode: 0755
-    
 - name: "restart rsyslog service"
   systemd:
     name: rsyslog

roles/tsg-cli-mcn2/files/tsg-monitor.sh

@@ -12,11 +12,14 @@ killall_uncompleted_cmd(){
     killall -9 -q tsg_monit_interface
     killall -9 -q tsg_monit_intercept
 	
-	/opt/tsg/tsg-monitor/tsg_monitor_cleanup_tmp.sh
+	cmd_run=`ps -ef | grep tsg_ | grep -v grep`
+	if [ ${#cmd_run} -lt 1 ] ; then
+	    #在没有其他tsg_xxx命令正在执行时, 删除执行命令错误被强制kill时, python生成的临时文件
+	    rm -rf /tmp/_MEI*
+    fi
 }
 
 start_background_cmd(){
-	mkdir -p  /tmp/__tsg_monitor_tmp_dir
     #后台并发运行, 保证所有命令的开始运行时间基本一样，
     #且不会因某个命令网络拥塞、执行时间长等问题，阻塞while(1)主循环
     /opt/tsg/tsg-monitor/tsg_diagnose_background > /dev/null &

roles/tsg-cli-mcn2/tasks/main.yml

@@ -57,12 +57,6 @@
     src: "{{ role_path }}/files/rsyslog.conf"
     dest: "/etc/"
 
-- name: "copy tsg_monitor_cleanup_tmp.sh to destination server"
-  synchronize:
-    src: "{{ role_path }}/../tsg-common-files/tsg_monitor_cleanup_tmp.sh"
-    dest: "/opt/tsg/tsg-monitor/"
-    mode: 0755
-    
 - name: "restart rsyslog service"
   systemd:
     name: rsyslog

roles/tsg-cli-mcn3/files/tsg-monitor.sh

@@ -12,11 +12,14 @@ killall_uncompleted_cmd(){
     killall -9 -q tsg_monit_interface
     killall -9 -q tsg_monit_intercept
 	
-	/opt/tsg/tsg-monitor/tsg_monitor_cleanup_tmp.sh
+	cmd_run=`ps -ef | grep tsg_ | grep -v grep`
+	if [ ${#cmd_run} -lt 1 ] ; then
+	    #在没有其他tsg_xxx命令正在执行时, 删除执行命令错误被强制kill时, python生成的临时文件
+	    rm -rf /tmp/_MEI*
+    fi
 }
 
 start_background_cmd(){
-	mkdir -p  /tmp/__tsg_monitor_tmp_dir
     #后台并发运行, 保证所有命令的开始运行时间基本一样，
     #且不会因某个命令网络拥塞、执行时间长等问题，阻塞while(1)主循环
     /opt/tsg/tsg-monitor/tsg_diagnose_background > /dev/null &

roles/tsg-cli-mcn3/tasks/main.yml

@@ -57,12 +57,6 @@
     src: "{{ role_path }}/files/rsyslog.conf"
     dest: "/etc/"
 
-- name: "copy tsg_monitor_cleanup_tmp.sh to destination server"
-  synchronize:
-    src: "{{ role_path }}/../tsg-common-files/tsg_monitor_cleanup_tmp.sh"
-    dest: "/opt/tsg/tsg-monitor/"
-    mode: 0755
-    
 - name: "restart rsyslog service"
   systemd:
     name: rsyslog

roles/tsg-cli-mxn/files/tsg-monitor.sh.bak

@@ -8,17 +8,21 @@
 #导致10秒内还不结束, 要强行杀掉,
 #否则长时间运行后, 会有大量后台进程运行!
 killall_uncompleted_cmd(){
-    #killall -9 -q tsg_cluster_register
+    killall -9 -q tsg_cluster_register
     #killall -9 -q tsg_diagnose_background
     #killall -9 -q tsg_update_tags
-	/opt/tsg/tsg-monitor/tsg_monitor_cleanup_tmp.sh
+	
+	cmd_run=`ps -ef | grep tsg_ | grep -v grep`
+	if [ ${#cmd_run} -lt 1 ] ; then
+	    #在没有其他tsg_xxx命令正在执行时, 删除执行命令错误被强制kill时, python生成的临时文件
+	    rm -rf /tmp/_MEI*
+    fi
 } 
 
 start_background_cmd(){
-	mkdir -p  /tmp/__tsg_monitor_tmp_dir
     #后台并发运行, 保证所有命令的开始运行时间基本一样，
     #且不会因某个命令网络拥塞、执行时间长等问题，阻塞while(1)主循环
-    #/opt/tsg/tsg-monitor/tsg_cluster_register > /dev/null &
+    /opt/tsg/tsg-monitor/tsg_cluster_register > /dev/null &
     
     #mxn板只检测cpu, mem, disk等, 前台cli命令启用diagnose,
     #后台服务依靠oam snmp模块, 无需运行tsg_diagnose_background

roles/tsg-cli-mxn/files/tsg_cluster_register.service

@@ -4,7 +4,6 @@ Requires=consul-client.service
 After=consul-client.service
 
 [Service]
-ExecStartPre=/usr/bin/mkdir -p /tmp/__tsg_monitor_tmp_dir
 ExecStart=/opt/tsg/tsg-monitor/tsg_cluster_register
 Type=oneshot
 RemainAfterExit=yes

roles/tsg-cli-mxn/tasks/main.yml

@@ -74,44 +74,29 @@
     dest: "/opt/tsg/etc/tsg_series.json"
   tags: template
 
-- name: "copy tsg-monitor.service to destination server"
-  synchronize:
-    src: "{{ role_path }}/files/tsg-monitor.service"
-    dest: "/usr/lib/systemd/system"
-    
+#2020-11-13 lijia modify
 - name: "copy tsg_cluster_register.service to destination server"
   synchronize:
     src: "{{ role_path }}/files/tsg_cluster_register.service"
     dest: "/usr/lib/systemd/system"
 
-- name: "copy tsg-monitor.sh to destination server"
-  copy:
-    src: "{{ role_path }}/files/tsg-monitor.sh"
-    dest: "/opt/tsg/tsg-monitor/"    
-    mode: 0755  
+# 2020-11-13 lijia close
+#- name: "copy tsg-monitor.sh to destination server"
+#  copy:
+#    src: "{{ role_path }}/files/tsg-monitor.sh"
+#    dest: "/opt/tsg/tsg-monitor/"    
+#    mode: 0755  
 
 - name: "copy rsyslog.conf to destination server"
   synchronize:
     src: "{{ role_path }}/files/rsyslog.conf"
     dest: "/etc/"    
 
-- name: "copy tsg_monitor_cleanup_tmp.sh to destination server"
-  synchronize:
-    src: "{{ role_path }}/../tsg-common-files/tsg_monitor_cleanup_tmp.sh"
-    dest: "/opt/tsg/tsg-monitor/"
-    mode: 0755
-    
 - name: "restart rsyslog service"
   systemd:
     name: rsyslog
     state: restarted
 
-- name: "enable tsg-monitor service"
-  systemd:
-    name: tsg-monitor
-    enabled: yes
-    daemon_reload: yes
-    state: restarted
  
 - name: "enable tsg_cluster_register.service"
   systemd:

roles/tsg-common-files/tsg_monitor_cleanup_tmp.sh

@@ -1,13 +0,0 @@
-#!/bin/sh
-cd /tmp/__tsg_monitor_tmp_dir
-
-if [ $? != 0 ]; then
-    #echo "cd to dir error!"
-    exit 1
-fi
-
-#cur_dir=`pwd`
-#echo "cur dir is: $cur_dir"
-
-find . -ctime +1 -type d -name "_MEI*" | xargs rm -rf
-